Author: bugman Date: Wed Mar 2 20:29:52 2011 New Revision: 12745 URL: http://svn.gna.org/viewcvs/relax?rev=12745&view=rev Log: Fixes for the model-free minimise() method when using Levenberg-Marquardt optimisation. Modified: branches/relax_data/specific_fns/model_free/mf_minimise.py Modified: branches/relax_data/specific_fns/model_free/mf_minimise.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_data/specific_fns/model_free/mf_minimise.py?rev=12745&r1=12744&r2=12745&view=diff ============================================================================== --- branches/relax_data/specific_fns/model_free/mf_minimise.py (original) +++ branches/relax_data/specific_fns/model_free/mf_minimise.py Wed Mar 2 20:29:52 2011 @@ -1495,15 +1495,15 @@ if match('[Ll][Mm]$', algor) or match('[Ll]evenburg-[Mm]arquardt$', algor): # Total number of ri. number_ri = 0 - for k in xrange(len(relax_error)): - number_ri = number_ri + len(relax_error[k]) + for k in xrange(len(ri_data_err)): + number_ri = number_ri + len(ri_data_err[k]) # Reconstruct the error data structure. lm_error = zeros(number_ri, float64) index = 0 - for k in xrange(len(relax_error)): - lm_error[index:index+len(relax_error[k])] = relax_error[k] - index = index + len(relax_error[k]) + for k in xrange(len(ri_data_err)): + lm_error[index:index+len(ri_data_err[k])] = ri_data_err[k] + index = index + len(ri_data_err[k]) min_options = min_options + (self.mf.lm_dri, lm_error)