r6203 - /1.3/specific_fns/relax_fit.py -- May 21, 2008 - 22:45

Author: bugman
Date: Wed May 21 22:45:03 2008
New Revision: 6203

URL: http://svn.gna.org/viewcvs/relax?rev=6203&view=rev
Log:
Fix for the minimise() method - the func function is no longer overwritten by 
the chi2 value.


Modified:
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=6203&r1=6202&r2=6203&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Wed May 21 22:45:03 2008
@@ -834,7 +834,7 @@
                 results = generic_minimise(func=func, dfunc=dfunc, 
d2func=d2func, 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, print_flag=verbosity)
             if results == None:
                 return
-            param_vector, func, iter_count, f_count, g_count, h_count, 
warning = results
+            param_vector, chi2, iter_count, f_count, g_count, h_count, 
warning = results
 
             # Scaling.
             if scaling:
@@ -846,7 +846,7 @@
             # Monte Carlo minimisation statistics.
             if sim_index != None:
                 # Chi-squared statistic.
-                spin.chi2_sim[sim_index] = func
+                spin.chi2_sim[sim_index] = chi2
 
                 # Iterations.
                 spin.iter_sim[sim_index] = iter_count
@@ -867,7 +867,7 @@
             # Normal statistics.
             else:
                 # Chi-squared statistic.
-                spin.chi2 = func
+                spin.chi2 = chi2
 
                 # Iterations.
                 spin.iter = iter_count