r19221 - /branches/relax_disp/specific_analyses/relax_disp.py -- March 27, 2013 - 14:42

Author: bugman
Date: Wed Mar 27 14:42:05 2013
New Revision: 19221

URL: http://svn.gna.org/viewcvs/relax?rev=19221&view=rev
Log:
Ported r8429 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8428:8429 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses

.....
  r8429 | semor | 2009-01-13 04:24:37 +0100 (Tue, 13 Jan 2009) | 6 lines
  Changed paths:
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Started to implement the scaling matrix for scaling the 'R2eff' values.
  
  This might change in the future as other possible curve fitting parameters 
('R2', 'Rex', 'kex',
  'R2A', 'kA', 'dw') might need some scaling.
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19221&r1=19220&r2=19221&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:42:05 
2013
@@ -143,17 +143,17 @@
 
         # Loop over the parameters.
         for i in xrange(len(spin.params)):
-            # Relaxation rate.
-            if spin.params[i] == 'Rx':
-                pass
-
-            # Intensity scaling.
-            elif search('^i', spin.params[i]):
+            # Effective transversal relaxation rate scaling.
+            if spin.params[i] == 'R2eff':
                 # Find the position of the first CPMG pulse train frequency 
point.
                 pos = cdp.cpmg_frqs.index(min(cdp.cpmg_frqs))
 
                 # Scaling.
-                scaling_matrix[i, i] = 1.0 / average(spin.intensities[pos])
+                scaling_matrix[i, i] = 1.0 / average(spin.r2effs[pos])
+
+            # No scaling for other parameters.
+            else:
+                pass
 
             # Increment i.
             i = i + 1