r15199 - in /branches/spec_api/specific_fns: ./ model_free/ -- January 20, 2012 - 11:45

Author: bugman
Date: Fri Jan 20 11:45:13 2012
New Revision: 15199

URL: http://svn.gna.org/viewcvs/relax?rev=15199&view=rev
Log:
Reintroduced the specific API default_value() method to most of the analyses.


Modified:
    branches/spec_api/specific_fns/api_common.py
    branches/spec_api/specific_fns/api_objects.py
    branches/spec_api/specific_fns/consistency_tests.py
    branches/spec_api/specific_fns/jw_mapping.py
    branches/spec_api/specific_fns/model_free/main.py
    branches/spec_api/specific_fns/relax_fit.py

Modified: branches/spec_api/specific_fns/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spec_api/specific_fns/api_common.py?rev=15199&r1=15198&r2=15199&view=diff
==============================================================================
--- branches/spec_api/specific_fns/api_common.py (original)
+++ branches/spec_api/specific_fns/api_common.py Fri Jan 20 11:45:13 2012
@@ -89,6 +89,19 @@
         """
 
 
+    def _default_value_spin(self, param):
+        """The default spin parameter values.
+
+        @param param:   The spin parameter.
+        @type param:    str
+        @return:        The default value.
+        @rtype:         float
+        """
+
+        # The default value.
+        self.SPIN_PARAMS.get_default(param)
+
+
     def _eliminate_false(self, name, value, model_info, args, sim=None):
         """Dummy method for model elimination.
 

Modified: branches/spec_api/specific_fns/api_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spec_api/specific_fns/api_objects.py?rev=15199&r1=15198&r2=15199&view=diff
==============================================================================
--- branches/spec_api/specific_fns/api_objects.py (original)
+++ branches/spec_api/specific_fns/api_objects.py Fri Jan 20 11:45:13 2012
@@ -127,6 +127,23 @@
         return self._conv_factor[name]
 
 
+    def get_default(self, name):
+        """Return the default value of the parameter.
+
+        @param name:    The name of the parameter.
+        @type name:     str
+        @return:        The default value.
+        @rtype:         None or str
+        """
+
+        # Check.
+        if name not in self._names:
+            return None
+
+        # Return the default value.
+        return self._defaults[name]
+
+
     def get_desc(self, name):
         """Return the description of the parameter.
 

Modified: branches/spec_api/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spec_api/specific_fns/consistency_tests.py?rev=15199&r1=15198&r2=15199&view=diff
==============================================================================
--- branches/spec_api/specific_fns/consistency_tests.py (original)
+++ branches/spec_api/specific_fns/consistency_tests.py Fri Jan 20 11:45:13 
2012
@@ -45,6 +45,7 @@
         # Place methods into the API.
         self.base_data_loop = self._base_data_loop_spin
         self.create_mc_data = self._create_mc_relax_data
+        self.default_value = self._default_value_spin
         self.model_loop = self._model_loop_spin
         self.return_conversion_factor = self._return_no_conversion_factor
         self.return_data_name = self._return_data_name_spin

Modified: branches/spec_api/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spec_api/specific_fns/jw_mapping.py?rev=15199&r1=15198&r2=15199&view=diff
==============================================================================
--- branches/spec_api/specific_fns/jw_mapping.py (original)
+++ branches/spec_api/specific_fns/jw_mapping.py Fri Jan 20 11:45:13 2012
@@ -44,6 +44,7 @@
         # Place methods into the API.
         self.base_data_loop = self._base_data_loop_spin
         self.create_mc_data = self._create_mc_relax_data
+        self.default_value = self._default_value_spin
         self.model_loop = self._model_loop_spin
         self.return_conversion_factor = self._return_no_conversion_factor
         self.return_data_name = self._return_data_name_spin

Modified: branches/spec_api/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spec_api/specific_fns/model_free/main.py?rev=15199&r1=15198&r2=15199&view=diff
==============================================================================
--- branches/spec_api/specific_fns/model_free/main.py (original)
+++ branches/spec_api/specific_fns/model_free/main.py Fri Jan 20 11:45:13 2012
@@ -1431,6 +1431,23 @@
         
|_______________________________________|____________________|________________________|
 
         """]
+
+    def default_value(self, param):
+        """The default model-free parameter values.
+
+        @param param:   The model-free parameter.
+        @type param:    str
+        @return:        The default value.
+        @rtype:         float
+        """
+
+        # Diffusion tensor parameter.
+        diff_val = diffusion_tensor.default_value(param)
+        if diff_val != None:
+            return diff_val
+
+        # Model-free parameter.
+        self.SPIN_PARAMS.get_default(param)
 
 
     def deselect(self, model_info, sim_index=None):

Modified: branches/spec_api/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spec_api/specific_fns/relax_fit.py?rev=15199&r1=15198&r2=15199&view=diff
==============================================================================
--- branches/spec_api/specific_fns/relax_fit.py (original)
+++ branches/spec_api/specific_fns/relax_fit.py Fri Jan 20 11:45:13 2012
@@ -53,6 +53,7 @@
 
         # Place methods into the API.
         self.base_data_loop = self._base_data_loop_spin
+        self.default_value = self._default_value_spin
         self.model_loop = self._model_loop_spin
         self.return_conversion_factor = self._return_no_conversion_factor
         self.return_data_name = self._return_data_name_spin