r12717 - /branches/relax_data/specific_fns/model_free/main.py -- March 02, 2011 - 15:11

Author: bugman
Date: Wed Mar  2 15:11:06 2011
New Revision: 12717

URL: http://svn.gna.org/viewcvs/relax?rev=12717&view=rev
Log:
Updated the model-free back_calc_ri() method for the new relax data ID string 
design.


Modified:
    branches/relax_data/specific_fns/model_free/main.py

Modified: branches/relax_data/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/specific_fns/model_free/main.py?rev=12717&r1=12716&r2=12717&view=diff
==============================================================================
--- branches/relax_data/specific_fns/model_free/main.py (original)
+++ branches/relax_data/specific_fns/model_free/main.py Wed Mar  2 15:11:06 
2011
@@ -430,15 +430,15 @@
         return scaling_matrix
 
 
-    def back_calc_ri(self, spin_index=None, ri_label=None, frq_label=None, 
frq=None):
+    def back_calc_ri(self, spin_index=None, ri_id=None, frq_label=None, 
frq=None):
         """Back-calculation of relaxation data from the model-free parameter 
values.
 
         @keyword spin_index:    The global spin index.
         @type spin_index:       int
-        @keyword ri_label:      The relaxation data type, i.e. 'R1', 'R2', 
or 'NOE'.
-        @type ri_label:         str
-        @keyword frq_label:     The field strength label.
-        @type frq_label:        str
+        @keyword ri_id:         The relaxation data ID string.
+        @type ri_id:            str
+        @keyword ri_type:       The relaxation data type.
+        @type ri_type:          str
         @keyword frq:           The field strength.
         @type frq:              float
         @return:                The back calculated relaxation data value 
corresponding to the index.
@@ -454,7 +454,7 @@
             return
 
         # Get the relaxation value from the minimise function.
-        value = self.minimise(min_algor='back_calc', 
min_options=(spin_index, ri_label, frq_label, frq))
+        value = self.minimise(min_algor='back_calc', 
min_options=(spin_index, ri_id, ri_type, frq))
 
         # Return the relaxation value.
         return value