Author: bugman Date: Thu Apr 10 17:33:25 2014 New Revision: 22686 URL: http://svn.gna.org/viewcvs/relax?rev=22686&view=rev Log: Eliminated the specific analysis API object base __init__() method. This is no longer needed as the parameter list object is now analysis specific and set up by each analysis type separately. The calls to this method from the derived classes have therefore also been deleted. Modified: trunk/specific_analyses/api_base.py trunk/specific_analyses/consistency_tests/api.py trunk/specific_analyses/frame_order/api.py trunk/specific_analyses/jw_mapping/api.py trunk/specific_analyses/model_free/api.py trunk/specific_analyses/n_state_model/api.py trunk/specific_analyses/noe/api.py trunk/specific_analyses/relax_disp/api.py trunk/specific_analyses/relax_fit/api.py Modified: trunk/specific_analyses/api_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/api_base.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/api_base.py (original) +++ trunk/specific_analyses/api_base.py Thu Apr 10 17:33:25 2014 @@ -35,13 +35,6 @@ # Class variable for storing the class instance (for the singleton design pattern). instance = None - - def __init__(self): - """Set up the specific objects.""" - - # Class variables. - self.PARAMS = Param_list() - def __new__(self, *args, **kargs): """Replacement function for implementing the singleton design pattern.""" Modified: trunk/specific_analyses/consistency_tests/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/consistency_tests/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/consistency_tests/api.py (original) +++ trunk/specific_analyses/consistency_tests/api.py Thu Apr 10 17:33:25 2014 @@ -48,9 +48,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - # Execute the base class __init__ method. - super(Consistency_tests, self).__init__() - # Place methods into the API. self.base_data_loop = self._base_data_loop_spin self.create_mc_data = self._create_mc_relax_data Modified: trunk/specific_analyses/frame_order/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/frame_order/api.py (original) +++ trunk/specific_analyses/frame_order/api.py Thu Apr 10 17:33:25 2014 @@ -54,9 +54,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - - # Execute the base class __init__ method. - super(Frame_order, self).__init__() # Place methods into the API. self.overfit_deselect = self._overfit_deselect_dummy Modified: trunk/specific_analyses/jw_mapping/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/jw_mapping/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/jw_mapping/api.py (original) +++ trunk/specific_analyses/jw_mapping/api.py Thu Apr 10 17:33:25 2014 @@ -47,9 +47,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - # Execute the base class __init__ method. - super(Jw_mapping, self).__init__() - # Place methods into the API. self.base_data_loop = self._base_data_loop_spin self.create_mc_data = self._create_mc_relax_data Modified: trunk/specific_analyses/model_free/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/model_free/api.py (original) +++ trunk/specific_analyses/model_free/api.py Thu Apr 10 17:33:25 2014 @@ -69,9 +69,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - - # Execute the base class __init__ method. - super(Model_free, self).__init__() # Place methods into the API. self.base_data_loop = self._base_data_loop_spin Modified: trunk/specific_analyses/n_state_model/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/n_state_model/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/n_state_model/api.py (original) +++ trunk/specific_analyses/n_state_model/api.py Thu Apr 10 17:33:25 2014 @@ -58,9 +58,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - - # Execute the base class __init__ method. - super(N_state_model, self).__init__() # Place methods into the API. self.model_loop = self._model_loop_single_global Modified: trunk/specific_analyses/noe/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/noe/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/noe/api.py (original) +++ trunk/specific_analyses/noe/api.py Thu Apr 10 17:33:25 2014 @@ -44,9 +44,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - - # Execute the base class __init__ method. - super(Noe, self).__init__() # Place methods into the API. self.return_conversion_factor = self._return_no_conversion_factor Modified: trunk/specific_analyses/relax_disp/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/relax_disp/api.py (original) +++ trunk/specific_analyses/relax_disp/api.py Thu Apr 10 17:33:25 2014 @@ -53,9 +53,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - - # Execute the base class __init__ method. - super(Relax_disp, self).__init__() # Place methods into the API. self.data_init = self._data_init_spin Modified: trunk/specific_analyses/relax_fit/api.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit/api.py?rev=22686&r1=22685&r2=22686&view=diff ============================================================================== --- trunk/specific_analyses/relax_fit/api.py (original) +++ trunk/specific_analyses/relax_fit/api.py Thu Apr 10 17:33:25 2014 @@ -54,9 +54,6 @@ def __init__(self): """Initialise the class by placing API_common methods into the API.""" - - # Execute the base class __init__ method. - super(Relax_fit, self).__init__() # Place methods into the API. self.base_data_loop = self._base_data_loop_spin