Author: bugman
Date: Thu Nov 21 17:50:31 2013
New Revision: 21587
URL: http://svn.gna.org/viewcvs/relax?rev=21587&view=rev
Log:
Bug fix for the 'MMQ 2-site' dispersion model target function.
The relaxation time was being taken as that of the first experiment for all
experiments. This is a
relic from the code being copied from a single experiment type model.
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=21587&r1=21586&r2=21587&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_disp.py (original)
+++ branches/relax_disp/target_functions/relax_disp.py Thu Nov 21 17:50:31
2013
@@ -969,7 +969,7 @@
aliased_dwH = dw_frq
# Back calculate the R2eff values for each experiment
type.
- self.r2eff_mmq[exp_index](M0=self.M0, m1=self.m1,
m2=self.m2, R20A=R20[r20_index], R20B=R20[r20_index], pA=pA, pB=pB,
dw=aliased_dw, dwH=aliased_dwH, k_AB=k_AB, k_BA=k_BA,
inv_tcpmg=self.inv_relax_times[0][frq_index],
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], n=self.n[exp_index][frq_index])
+ self.r2eff_mmq[exp_index](M0=self.M0, m1=self.m1,
m2=self.m2, R20A=R20[r20_index], R20B=R20[r20_index], pA=pA, pB=pB,
dw=aliased_dw, dwH=aliased_dwH, k_AB=k_AB, k_BA=k_BA,
inv_tcpmg=self.inv_relax_times[exp_index][frq_index],
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], 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]):
r21587 - /branches/relax_disp/target_functions/relax_disp.py