r21499 - /branches/relax_disp/target_functions/relax_disp.py -- November 18, 2013 - 13:17

Author: bugman
Date: Mon Nov 18 13:17:12 2013
New Revision: 21499

URL: http://svn.gna.org/viewcvs/relax?rev=21499&view=rev
Log:
Bug fixes for the previous commit (r21498).


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=21499&r1=21498&r2=21499&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_disp.py (original)
+++ branches/relax_disp/target_functions/relax_disp.py Mon Nov 18 13:17:12 
2013
@@ -268,8 +268,6 @@
         if model == MODEL_MMQ_2SITE:
             self.m1 = zeros((2, 2), complex64)
             self.m2 = zeros((2, 2), complex64)
-            self.m3 = zeros((2, 2), complex64)
-            self.m4 = zeros((2, 2), complex64)
 
         # Set up the model.
         if model == MODEL_NOREX:
@@ -950,9 +948,9 @@
                     elif self.exp_types[exp_index] == EXP_TYPE_ZQ_CPMG:
                         r2eff_mmq_2site_sq_dq_zq(M0=self.M0, m1=self.m1, 
m2=self.m2, r20=R20[r20_index], pA=pA, pB=pB, dwX=dwH_frq-dw_frq, k_AB=k_AB, 
k_BA=k_BA, inv_tcpmg=self.inv_relax_time, 
tcp=self.tau_cpmg[exp_index][frq_index], 
back_calc=self.back_calc[exp_index][spin_index][frq_index], 
num_points=self.num_disp_points[exp_index][frq_index], 
power=self.power[exp_index][frq_index])
                     elif self.exp_types[exp_index] == EXP_TYPE_MQ_CPMG:
-                        r2eff_mmq_2site_mq(M0=self.M0, m1=self.m1, 
m2=self.m2, m3=self.m3, m4=self.m4, r20=R20[r20_index], pA=pA, pB=pB, 
dw=dw_frq, dwH=dwH_frq, k_AB=k_AB, k_BA=k_BA, inv_tcpmg=self.inv_relax_time, 
tcp=self.tau_cpmg[exp_index][frq_index], 
back_calc=self.back_calc[exp_index][spin_index][frq_index], 
num_points=self.num_disp_points[exp_index][frq_index], 
power=self.power[exp_index][frq_index])
+                        r2eff_mmq_2site_mq(M0=self.M0, m1=self.m1, 
m2=self.m2, r20=R20[r20_index], pA=pA, pB=pB, dw=dw_frq, dwH=dwH_frq, 
k_AB=k_AB, k_BA=k_BA, inv_tcpmg=self.inv_relax_time, 
tcp=self.tau_cpmg[exp_index][frq_index], 
back_calc=self.back_calc[exp_index][spin_index][frq_index], 
num_points=self.num_disp_points[exp_index][frq_index], 
n=self.n[exp_index][frq_index])
                     elif self.exp_types[exp_index] == 
EXP_TYPE_PROTON_MQ_CPMG:
-                        r2eff_mmq_2site_mq(M0=self.M0, m1=self.m1, 
m2=self.m2, m3=self.m3, m4=self.m4, r20=R20[r20_index], pA=pA, pB=pB, 
dw=dwH_frq, dwH=dw_frq, k_AB=k_AB, k_BA=k_BA, inv_tcpmg=self.inv_relax_time, 
tcp=self.tau_cpmg[exp_index][frq_index], 
back_calc=self.back_calc[exp_index][spin_index][frq_index], 
num_points=self.num_disp_points[exp_index][frq_index], 
power=self.power[exp_index][frq_index])
+                        r2eff_mmq_2site_mq(M0=self.M0, m1=self.m1, 
m2=self.m2, r20=R20[r20_index], pA=pA, pB=pB, dw=dwH_frq, dwH=dw_frq, 
k_AB=k_AB, k_BA=k_BA, inv_tcpmg=self.inv_relax_time, 
tcp=self.tau_cpmg[exp_index][frq_index], 
back_calc=self.back_calc[exp_index][spin_index][frq_index], 
num_points=self.num_disp_points[exp_index][frq_index], 
n=self.n[exp_index][frq_index])
 
                     # For all missing data points, set the back-calculated 
value to the measured values so that it has no effect on the chi-squared 
value.
                     for point_index in 
range(self.num_disp_points[exp_index][frq_index]):