Author: bugman
Date: Thu Apr 10 17:47:33 2014
New Revision: 22688
URL: http://svn.gna.org/viewcvs/relax?rev=22688&view=rev
Log:
The specific API PARAMS object is now private.
Apart from fixing a number of unit tests, these aliased singletons should not
be accessed by the
rest of relax.
Modified:
trunk/specific_analyses/api_base.py
trunk/specific_analyses/api_common.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=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/api_base.py (original)
+++ trunk/specific_analyses/api_base.py Thu Apr 10 17:47:33 2014
@@ -182,7 +182,7 @@
names = []
# Loop over the parameters.
- for name in self.PARAMS.loop(set=set, scope=scope,
error_names=error_names, sim_names=sim_names):
+ for name in self._PARAMS.loop(set=set, scope=scope,
error_names=error_names, sim_names=sim_names):
names.append(name)
# Return the names.
@@ -201,7 +201,7 @@
"""
# Return the type.
- return self.PARAMS.get_type(param)
+ return self._PARAMS.get_type(param)
def default_value(self, param):
@@ -217,7 +217,7 @@
"""
# Return the value.
- return self.PARAMS.get_default(param)
+ return self._PARAMS.get_default(param)
def deselect(self, model_info, sim_index=None):
@@ -527,7 +527,7 @@
"""
# Return the factor.
- return self.PARAMS.get_conv_factor(param)
+ return self._PARAMS.get_conv_factor(param)
def return_data(self, data_id=None):
@@ -556,7 +556,7 @@
"""
# Return the description.
- return self.PARAMS.get_desc(name)
+ return self._PARAMS.get_desc(name)
def return_data_name(self, param):
@@ -569,7 +569,7 @@
"""
# No parameter.
- if not self.PARAMS.contains(param):
+ if not self._PARAMS.contains(param):
return None
# Return the name.
@@ -602,7 +602,7 @@
"""
# The string.
- return self.PARAMS.get_grace_string(param)
+ return self._PARAMS.get_grace_string(param)
def return_units(self, param):
@@ -615,7 +615,7 @@
"""
# Return the name.
- return self.PARAMS.get_units(param)
+ return self._PARAMS.get_units(param)
def return_value(self, spin, param, sim=None, bc=False):
Modified: trunk/specific_analyses/api_common.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/api_common.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/api_common.py (original)
+++ trunk/specific_analyses/api_common.py Thu Apr 10 17:47:33 2014
@@ -98,7 +98,7 @@
"""
# Loop over the parameters.
- for name in self.PARAMS.loop(set='params', scope='spin',
error_names=False, sim_names=sim):
+ for name in self._PARAMS.loop(set='params', scope='spin',
error_names=False, sim_names=sim):
# Not a parameter of the model.
if name not in data_cont.params:
continue
@@ -108,7 +108,7 @@
continue
# The default value.
- param_type = self.PARAMS.get_type(name)
+ param_type = self._PARAMS.get_type(name)
if param_type == dict:
value = {}
elif param_type == list:
@@ -541,7 +541,7 @@
# Loop over the parameters.
for i in range(len(param)):
# Is the parameter is valid?
- if not self.PARAMS.contains(param[i]):
+ if not self._PARAMS.contains(param[i]):
raise RelaxError("The parameter '%s' is not valid for this
data pipe type." % param[i])
# Spin loop.
Modified: trunk/specific_analyses/consistency_tests/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/consistency_tests/api.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/consistency_tests/api.py (original)
+++ trunk/specific_analyses/consistency_tests/api.py Thu Apr 10 17:47:33
2014
@@ -60,7 +60,7 @@
self.sim_pack_data = self._sim_pack_relax_data
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = Consistency_tests_params()
+ self._PARAMS = Consistency_tests_params()
def calculate(self, spin_id=None, verbosity=1, sim_index=None):
Modified: trunk/specific_analyses/frame_order/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/api.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/api.py (original)
+++ trunk/specific_analyses/frame_order/api.py Thu Apr 10 17:47:33 2014
@@ -62,7 +62,7 @@
self.set_param_values = self._set_param_values_global
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = Frame_order_params()
+ self._PARAMS = Frame_order_params()
def base_data_loop(self):
Modified: trunk/specific_analyses/jw_mapping/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/jw_mapping/api.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/jw_mapping/api.py (original)
+++ trunk/specific_analyses/jw_mapping/api.py Thu Apr 10 17:47:33 2014
@@ -59,7 +59,7 @@
self.sim_pack_data = self._sim_pack_relax_data
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = Jw_mapping_params()
+ self._PARAMS = Jw_mapping_params()
def calculate(self, spin_id=None, verbosity=1, sim_index=None):
Modified: trunk/specific_analyses/model_free/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/api.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/model_free/api.py (original)
+++ trunk/specific_analyses/model_free/api.py Thu Apr 10 17:47:33 2014
@@ -85,7 +85,7 @@
self.molmol_macro = self._molmol_macros.create_macro
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = Model_free_params()
+ self._PARAMS = Model_free_params()
def back_calc_ri(self, spin_index=None, ri_id=None, ri_type=None,
frq=None):
@@ -636,7 +636,7 @@
"""
# Loop over the data structure names.
- for name in self.PARAMS.loop(scope='spin'):
+ for name in self._PARAMS.loop(scope='spin'):
# Blacklisted data structures.
if name in ['ri_data', 'ri_data_bc', 'ri_data_err']:
continue
@@ -648,7 +648,7 @@
# Set everything else initially to None or False.
init_data = None
- if self.PARAMS.get_type(name) == bool:
+ if self._PARAMS.get_type(name) == bool:
init_data = False
if name == 'select':
init_data = True
@@ -712,7 +712,7 @@
return diff_val
# Model-free parameter.
- return self.PARAMS.get_default(param)
+ return self._PARAMS.get_default(param)
def deselect(self, model_info, sim_index=None):
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=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/n_state_model/api.py (original)
+++ trunk/specific_analyses/n_state_model/api.py Thu Apr 10 17:47:33
2014
@@ -67,7 +67,7 @@
self.sim_return_selected = self._sim_return_selected_global
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = N_state_params()
+ self._PARAMS = N_state_params()
def base_data_loop(self):
Modified: trunk/specific_analyses/noe/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/noe/api.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/noe/api.py (original)
+++ trunk/specific_analyses/noe/api.py Thu Apr 10 17:47:33 2014
@@ -50,7 +50,7 @@
self.return_value = self._return_value_general
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = Noe_params()
+ self._PARAMS = Noe_params()
def calculate(self, spin_id=None, verbosity=1, sim_index=None):
Modified: trunk/specific_analyses/relax_disp/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/api.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/api.py (original)
+++ trunk/specific_analyses/relax_disp/api.py Thu Apr 10 17:47:33 2014
@@ -62,7 +62,7 @@
self.set_param_values = self._set_param_values_spin
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = Relax_disp_params()
+ self._PARAMS = Relax_disp_params()
def base_data_loop(self):
Modified: trunk/specific_analyses/relax_fit/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit/api.py?rev=22688&r1=22687&r2=22688&view=diff
==============================================================================
--- trunk/specific_analyses/relax_fit/api.py (original)
+++ trunk/specific_analyses/relax_fit/api.py Thu Apr 10 17:47:33 2014
@@ -68,7 +68,7 @@
self.sim_return_selected = self._sim_return_selected_spin
# Place a copy of the parameter list object in the instance
namespace.
- self.PARAMS = Relax_fit_params()
+ self._PARAMS = Relax_fit_params()
def create_mc_data(self, data_id=None):
r22688 - in /trunk/specific_analyses: ./ consistency_tests/ frame_order/ jw_mapping/ model_free/ n_state_model/ noe/ relax_d...