r19394 - /trunk/specific_analyses/relax_fit.py -- April 05, 2013 - 18:45

Author: bugman
Date: Fri Apr  5 18:45:34 2013
New Revision: 19394

URL: http://svn.gna.org/viewcvs/relax?rev=19394&view=rev
Log:
The scaling matrix is now converted into a usable list of diagonal elements 
for the relax_fit C module.


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=19394&r1=19393&r2=19394&view=diff
==============================================================================
--- trunk/specific_analyses/relax_fit.py (original)
+++ trunk/specific_analyses/relax_fit.py Fri Apr  5 18:45:34 2013
@@ -702,7 +702,12 @@
                 # The relaxation times.
                 times.append(cdp.relax_times[key])
 
-            setup(num_params=len(spin.params), num_times=len(values), 
values=values, sd=errors, relax_times=times, 
scaling_matrix=scaling_matrix.tolist())
+            # The scaling matrix in a diagonalised list form.
+            scaling_list = []
+            for i in range(len(scaling_matrix)):
+                scaling_list.append(scaling_matrix[i, i])
+
+            setup(num_params=len(spin.params), num_times=len(values), 
values=values, sd=errors, relax_times=times, scaling_matrix=scaling_list)
 
 
             # Setup the minimisation algorithm when constraints are present.