r24637 - /branches/disp_spin_speed/target_functions/relax_disp.py -- July 22, 2014 - 16:51

Author: tlinnet
Date: Tue Jul 22 16:51:59 2014
New Revision: 24637

URL: http://svn.gna.org/viewcvs/relax?rev=24637&view=rev
Log:
Code validation of target_functions/relax_disp.py.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    branches/disp_spin_speed/target_functions/relax_disp.py

Modified: branches/disp_spin_speed/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/target_functions/relax_disp.py?rev=24637&r1=24636&r2=24637&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Tue Jul 22 
16:51:59 2014
@@ -412,7 +412,7 @@
         if model in [MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]:
             self.M0 = zeros(3, float64)
         if model in [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL]:
-            M0_0 = zeros( [self.NE, self.NS, self.NM, self.NO, self.ND,7, 
1], float64)
+            M0_0 = zeros( [self.NE, self.NS, self.NM, self.NO, self.ND, 7, 
1], float64)
             M0_0[:, :, :, :, :, 0, 0] = 0.5
             self.M0 = M0_0
             # Transpose M0, to prepare for dot operation. Roll the last axis 
one back, corresponds to a transpose for the outer two axis.
@@ -1069,6 +1069,7 @@
         # Return the total chi-squared value.
         return chi2_rankN(self.values, self.back_calc, self.errors)
 
+
     def func_LM63(self, params):
         """Target function for the Luz and Meiboom (1963) fast 2-site 
exchange model.
 
@@ -1799,6 +1800,7 @@
         # Return the total chi-squared value.
         return chi2_rankN(self.values, self.back_calc, self.errors)
 
+
     def get_back_calc(self):
         """Class function to return back_calc as lists of lists.  Number of 
values in should match number of dispersion points or spin_lock.