r7373 - /1.3/specific_fns/model_free/mf_minimise.py -- September 26, 2008 - 21:46

Author: bugman
Date: Fri Sep 26 21:46:19 2008
New Revision: 7373

URL: http://svn.gna.org/viewcvs/relax?rev=7373&view=rev
Log:
The min_options list is now passed into minimise_data_setup().


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=7373&r1=7372&r2=7373&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Fri Sep 26 21:46:19 2008
@@ -936,7 +936,7 @@
             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, gx, gh, 
num_params, xh_unit_vectors, diff_type, diff_params = 
self.minimise_data_setup(model_type, min_algor, num_data_sets, spin=spin, 
sim_index=sim_index)
+            relax_data, relax_error, equations, param_types, param_values, 
r, csa, num_frq, frq, num_ri, remap_table, noe_r1_table, ri_labels, gx, gh, 
num_params, xh_unit_vectors, diff_type, diff_params = 
self.minimise_data_setup(model_type, min_algor, num_data_sets, min_options, 
spin=spin, sim_index=sim_index)
 
 
             # Initialise the function to minimise.
@@ -1100,7 +1100,7 @@
                     cdp.warning = warning
 
 
-    def minimise_data_setup(self, model_type, min_algor, num_data_sets, 
spin=None, sim_index=None):
+    def minimise_data_setup(self, model_type, min_algor, num_data_sets, 
min_options, spin=None, sim_index=None):
         """Set up all the data required for minimisation.
 
         @param model_type:      The model type, one of 'all', 'diff', 'mf', 
or 'local_tm'.
@@ -1109,6 +1109,8 @@
         @type min_algor:        str
         @param num_data_sets:   The number of data sets.
         @type num_data_sets:    int
+        @param min_options:     The minimisation options array.
+        @type min_options:      list
         @keyword spin:          The spin data container.
         @type spin:             SpinContainer instance
         @keyword sim_index:     The optional MC simulation index.