r21503 - /branches/relax_disp/target_functions/relax_disp.py -- November 18, 2013 - 17:11

Author: bugman
Date: Mon Nov 18 17:11:44 2013
New Revision: 21503

URL: http://svn.gna.org/viewcvs/relax?rev=21503&view=rev
Log:
The R20 values are now correctly handled in the dispersion target function 
for MMQ-type data.


Modified:
    branches/relax_disp/target_functions/relax_disp.py

Modified: branches/relax_disp/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=21503&r1=21502&r2=21503&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_disp.py (original)
+++ branches/relax_disp/target_functions/relax_disp.py Mon Nov 18 17:11:44 
2013
@@ -181,9 +181,9 @@
         self.end_index = []
 
         # The spin and frequency dependent R2 parameters.
-        self.end_index.append(self.num_spins * self.num_frq)
+        self.end_index.append(self.num_exp * self.num_spins * self.num_frq)
         if model in [MODEL_CR72_FULL, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR_FULL]:
-            self.end_index.append(2 * self.num_spins * self.num_frq)
+            self.end_index.append(2 * self.num_exp * self.num_spins * 
self.num_frq)
 
         # The spin and dependent parameters (phi_ex, dw, padw2).
         self.end_index.append(self.end_index[-1] + self.num_spins)
@@ -932,7 +932,7 @@
                 # Loop over the spectrometer frequencies.
                 for frq_index in range(self.num_frq):
                     # The R20 index.
-                    r20_index = frq_index + spin_index*self.num_frq
+                    r20_index = frq_index + exp_index*self.num_frq + 
spin_index*self.num_frq*self.num_exp
 
                     # Convert dw from ppm to rad/s.
                     dw_frq = dw[spin_index] * 
self.frqs[exp_index][spin_index][frq_index]