Author: bugman Date: Thu Jan 17 16:56:35 2008 New Revision: 4829 URL: http://svn.gna.org/viewcvs/relax?rev=4829&view=rev Log: Removed the cdp aliases as they are not used very often. Modified: 1.3/generic_fns/value.py Modified: 1.3/generic_fns/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=4829&r1=4828&r2=4829&view=diff ============================================================================== --- 1.3/generic_fns/value.py (original) +++ 1.3/generic_fns/value.py Thu Jan 17 16:56:35 2008 @@ -49,11 +49,8 @@ @return type: tuple of 4 lists """ - # Alias the current data pipe. - cdp = relax_data_store[relax_data_store.current_pipe] - # Specific functions. - return_data_name = get_specific_fn('return_data_name', cdp.pipe_type) + return_data_name = get_specific_fn('return_data_name', relax_data_store[relax_data_store.current_pipe].pipe_type) # Initialise. spin_params = [] @@ -156,11 +153,8 @@ if not relax_data_store.current_pipe: raise RelaxNoPipeError - # Alias the current data pipe. - cdp = relax_data_store[relax_data_store.current_pipe] - # Specific functions. - return_value = get_specific_fn('return_value', cdp.pipe_type) + return_value = get_specific_fn('return_value', relax_data_store[relax_data_store.current_pipe].pipe_type) # Partition the parameters into those which are spin specific and those which are not. spin_params, spin_values, other_params, other_values = partition_params(val, param) @@ -229,14 +223,11 @@ @type spin: SpinContainer """ - # Alias the current data pipe. - cdp = relax_data_store[relax_data_store.current_pipe] - # Specific functions. - data_init = get_specific_fn('data_init', cdp.pipe_type) - default_value = get_specific_fn('default_value', cdp.pipe_type) - return_data_name = get_specific_fn('return_data_name', cdp.pipe_type) - set_update = get_specific_fn('set_update', cdp.pipe_type) + data_init = get_specific_fn('data_init', relax_data_store[relax_data_store.current_pipe].pipe_type) + default_value = get_specific_fn('default_value', relax_data_store[relax_data_store.current_pipe].pipe_type) + return_data_name = get_specific_fn('return_data_name', relax_data_store[relax_data_store.current_pipe].pipe_type) + set_update = get_specific_fn('set_update', relax_data_store[relax_data_store.current_pipe].pipe_type) # Setting the model parameters prior to minimisation.