Author: bugman Date: Sun Dec 9 19:08:17 2007 New Revision: 4155 URL: http://svn.gna.org/viewcvs/relax?rev=4155&view=rev Log: Added a stub of the function get_specific_fn() to specific_fns/__init__.py. The function generic_fns.value.set() now calls this instead. Modified: 1.3/generic_fns/value.py 1.3/specific_fns/__init__.py Modified: 1.3/generic_fns/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=4155&r1=4154&r2=4155&view=diff ============================================================================== --- 1.3/generic_fns/value.py (original) +++ 1.3/generic_fns/value.py Sun Dec 9 19:08:17 2007 @@ -28,6 +28,7 @@ # relax module imports. from data import Data as relax_data_store from relax_errors import RelaxError, RelaxFileEmptyError, RelaxNoResError, RelaxNoPipeError, RelaxNoSequenceError, RelaxRegExpError, RelaxUnknownParamError, RelaxValueError +from specific_fns import get_specific_fn def set(val=None, param=None, spin_id=None, force=0): @@ -41,9 +42,9 @@ cdp = relax_data_store[relax_data_store.current_pipe] # Specific functions. - return_data_name = relax.specific_setup.setup('return_data_name', cdp.pipe_type) - return_value = relax.specific_setup.setup('return_value', cdp.pipe_type) - set = relax.specific_setup.setup('set', cdp.pipe_type) + return_data_name = get_specific_fn('return_data_name', cdp.pipe_type) + return_value = get_specific_fn('return_value', cdp.pipe_type) + set = get_specific_fn('set', cdp.pipe_type) # Sort the parameters and their values. sort_params() Modified: 1.3/specific_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/__init__.py?rev=4155&r1=4154&r2=4155&view=diff ============================================================================== --- 1.3/specific_fns/__init__.py (original) +++ 1.3/specific_fns/__init__.py Sun Dec 9 19:08:17 2007 @@ -46,6 +46,10 @@ relax_fit = Relax_fit() +# The function for returning the requested specific function. +def get_specific_fn(eqi, function_type, raise_error=1): + """The function for returning the requested specific function.""" + class Specific_setup: def __init__(self, relax):