r24609 - /branches/zooming_grid_search/specific_analyses/noe/api.py -- July 22, 2014 - 15:02

Author: bugman
Date: Tue Jul 22 15:02:58 2014
New Revision: 24609

URL: http://svn.gna.org/viewcvs/relax?rev=24609&view=rev
Log:
Updated the NOE analysis to handle the changes for the minimise.calculate 
user function.

This now requires the model_loop() and get_param_names() API methods to be 
implemented.  The first
is provided by the API common _model_loop_spin() method and the second simply 
returns a list of the
single 'noe' parameter.


Modified:
    branches/zooming_grid_search/specific_analyses/noe/api.py

Modified: branches/zooming_grid_search/specific_analyses/noe/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/specific_analyses/noe/api.py?rev=24609&r1=24608&r2=24609&view=diff
==============================================================================
--- branches/zooming_grid_search/specific_analyses/noe/api.py   (original)
+++ branches/zooming_grid_search/specific_analyses/noe/api.py   Tue Jul 22 
15:02:58 2014
@@ -46,6 +46,7 @@
         """Initialise the class by placing API_common methods into the 
API."""
 
         # Place methods into the API.
+        self.model_loop = self._model_loop_spin
         self.return_conversion_factor = self._return_no_conversion_factor
         self.return_value = self._return_value_general
 
@@ -122,6 +123,19 @@
             spin.noe_err = sqrt(sat_err2 * ref**2 + ref_err2 * sat**2) / 
ref**2
 
 
+    def get_param_names(self, model_info=None):
+        """Return a vector of parameter names.
+
+        @keyword model_info:    The spin container and the spin ID string 
from the _model_loop_spin() method.
+        @type model_info:       SpinContainer instance, str
+        @return:                The vector of parameter names.
+        @rtype:                 list of str
+        """
+
+        # Simply return the two parameter names.
+        return ['noe']
+
+
     def overfit_deselect(self, data_check=True, verbose=True):
         """Deselect spins which have insufficient data to support 
calculation.