r19390 - /trunk/specific_analyses/relax_fit.py -- April 05, 2013 - 18:08

Author: bugman
Date: Fri Apr  5 18:08:42 2013
New Revision: 19390

URL: http://svn.gna.org/viewcvs/relax?rev=19390&view=rev
Log:
Fix for the relaxation curve-fitting _assemble_scaling_matrix() method.

The intensity scaling was never activated before due to a lower vs. uppercase 
parameter name
mismatch.  This scaling is now correctly set up as the previous code assumed 
cdp.relax_times was a
list whereas it has been a dictionary since the early 1.3 releases.


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=19390&r1=19389&r2=19390&view=diff
==============================================================================
--- trunk/specific_analyses/relax_fit.py (original)
+++ trunk/specific_analyses/relax_fit.py Fri Apr  5 18:08:42 2013
@@ -153,11 +153,7 @@
 
             # Intensity scaling.
             elif search('^i', spin.params[i]):
-                # Find the position of the first time point.
-                pos = cdp.relax_times.index(min(cdp.relax_times))
-
-                # Scaling.
-                scaling_matrix[i, i] = 1.0 / average(spin.intensities[pos])
+                scaling_matrix[i, i] = max(spin.intensities.values())
 
             # Increment i.
             i = i + 1