r5194 - /1.3/specific_fns/model_free/mf_minimise.py -- March 23, 2008 - 15:44

Author: bugman
Date: Sun Mar 23 15:35:21 2008
New Revision: 5194

URL: http://svn.gna.org/viewcvs/relax?rev=5194&view=rev
Log:
minimise_data_setup() is now called and the data stored.

The self arg has also been added.


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=5194&r1=5193&r2=5194&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Mar 23 15:35:21 2008
@@ -909,6 +909,9 @@
             g_count = 0
             h_count = 0
 
+            # Get the data for minimisation.
+            relax_data, relax_error, equations, param_types, param_values, 
r, csa, num_frq, frq, num_ri, remap_table, noe_r1_table, ri_labels, 
num_params, xh_unit_vectors, diff_type, diff_params = 
self.minimise_data_setup()
+
 
             # Initialise the function to minimise.
             ######################################
@@ -1066,7 +1069,7 @@
                     cdp.warning = warning
 
 
-    def minimise_data_setup():
+    def minimise_data_setup(self):
         """Set up all the data required for minimisation.
 
         @return:        An insane tuple.  The full tuple is (relax_data, 
relax_error, equations,