r7828 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- October 19, 2008 - 17:29

Author: bugman
Date: Sun Oct 19 17:29:03 2008
New Revision: 7828

URL: http://svn.gna.org/viewcvs/relax?rev=7828&view=rev
Log:
Sent the spin_id and sim_index into set_minimise().

These were missing from the maps!


Modified:
    branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py

Modified: 
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=7828&r1=7827&r2=7828&view=diff
==============================================================================
--- branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py 
(original)
+++ branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py Sun 
Oct 19 17:29:03 2008
@@ -1158,11 +1158,11 @@
 
                 # Constrained optimisation.
                 if constraints:
-                    command.set_minimise(args=(), x0=param_vector, 
min_algor=min_algor, min_options=min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, full_output=True, 
verbosity=verbosity)
+                    command.set_minimise(args=(), x0=param_vector, 
min_algor=min_algor, min_options=min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, spin_id=spin_id, 
sim_index=sim_index, full_output=True, verbosity=verbosity)
 
                 # Unconstrained optimisation.
                 else:
-                    command.set_minimise(args=(), x0=param_vector, 
min_algor=min_algor, min_options=min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, full_output=True, 
verbosity=verbosity)
+                    command.set_minimise(args=(), x0=param_vector, 
min_algor=min_algor, min_options=min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, spin_id=spin_id, 
sim_index=sim_index, full_output=True, verbosity=verbosity)
 
                 # Set up the model-free memo and add it to the processor 
queue.
                 memo = MF_memo(model_free=self, spin=spin, 
sim_index=sim_index, model_type=model_type, scaling=scaling, 
scaling_matrix=scaling_matrix)