r19397 - /trunk/specific_analyses/relax_fit.py -- April 05, 2013 - 19:28

Author: bugman
Date: Fri Apr  5 19:28:34 2013
New Revision: 19397

URL: http://svn.gna.org/viewcvs/relax?rev=19397&view=rev
Log:
Fix for the relaxation curve-fitting _back_calc() method for the changes to 
the C module.

The setup() method requires that the scaling matrix is converted to a list of 
the diagonal elements.


Modified:
    trunk/specific_analyses/relax_fit.py

Modified: trunk/specific_analyses/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit.py?rev=19397&r1=19396&r2=19397&view=diff
==============================================================================
--- trunk/specific_analyses/relax_fit.py (original)
+++ trunk/specific_analyses/relax_fit.py Fri Apr  5 19:28:34 2013
@@ -188,8 +188,13 @@
             errors.append(spin.intensity_err[key])
             times.append(cdp.relax_times[key])
 
+        # The scaling matrix in a diagonalised list form.
+        scaling_list = []
+        for i in range(len(scaling_matrix)):
+            scaling_list.append(scaling_matrix[i, i])
+
         # Initialise the relaxation fit functions.
-        setup(num_params=len(spin.params), num_times=len(cdp.relax_times), 
values=values, sd=errors, relax_times=times, scaling_matrix=scaling_matrix)
+        setup(num_params=len(spin.params), num_times=len(cdp.relax_times), 
values=values, sd=errors, relax_times=times, scaling_matrix=scaling_list)
 
         # Make a single function call.  This will cause back calculation and 
the data will be stored in the C module.
         self._func(param_vector)