mailr5635 - /1.3/specific_fns/model_free/mf_minimise.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on April 13, 2008 - 19:26:
Author: bugman
Date: Sun Apr 13 19:26:05 2008
New Revision: 5635

URL: http://svn.gna.org/viewcvs/relax?rev=5635&view=rev
Log:
Converted the model-free back_calc() method to the new relax design.


Modified:
    1.3/specific_fns/model_free/mf_minimise.py

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=5635&r1=5634&r2=5635&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Apr 13 19:26:05 2008
@@ -42,14 +42,23 @@
     """Class containing functions specific to model-free optimisation."""
 
 
-    def back_calc(self, run=None, index=None, ri_label=None, frq_label=None, 
frq=None):
-        """Back-calculation of relaxation data from the model-free parameter 
values."""
-
-        # Run argument.
-        self.run = run
+    def back_calc(self, index=None, ri_label=None, frq_label=None, frq=None):
+        """Back-calculation of relaxation data from the model-free parameter 
values.
+
+        @keyword index:     The relaxation data index.
+        @type 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 frq:       The field strength.
+        @type frq:          float
+        @return:            The back calculated relaxation data value 
corresponding to the index.
+        @rtype:             float
+        """
 
         # Get the relaxation value from the minimise function.
-        value = self.minimise(run=self.run, min_algor='back_calc', 
min_options=(index, ri_label, frq_label, frq))
+        value = self.minimise(min_algor='back_calc', min_options=(index, 
ri_label, frq_label, frq))
 
         # Return the relaxation value.
         return value




Related Messages


Powered by MHonArc, Updated Sun Apr 13 20:00:16 2008