Author: bugman Date: Tue May 22 09:58:45 2012 New Revision: 16363 URL: http://svn.gna.org/viewcvs/relax?rev=16363&view=rev Log: The specific_fns get_specific_fn() function now determines the data pipe type, if not supplied. Modified: branches/uf_redesign/specific_fns/setup.py Modified: branches/uf_redesign/specific_fns/setup.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/specific_fns/setup.py?rev=16363&r1=16362&r2=16363&view=diff ============================================================================== --- branches/uf_redesign/specific_fns/setup.py (original) +++ branches/uf_redesign/specific_fns/setup.py Tue May 22 09:58:45 2012 @@ -21,6 +21,7 @@ ############################################################################### # relax module imports. +from generic_fns import pipes from specific_fns.consistency_tests import Consistency_tests from specific_fns.frame_order import Frame_order from specific_fns.hybrid import Hybrid @@ -44,11 +45,13 @@ # The function for returning the requested specific function. -def get_specific_fn(eqi, function_type, raise_error=True): +def get_specific_fn(eqi, function_type=None, raise_error=True): """The function for returning the requested specific function.""" # Initialise. function = None + if function_type == None: + function_type = pipes.get_type() # Get the class instance corresponding to function_type. inst = get_instance(function_type)