Author: tlinnet
Date: Fri Jun 13 17:31:38 2014
New Revision: 23941
URL: http://svn.gna.org/viewcvs/relax?rev=23941&view=rev
Log:
Fix for sending in r20 and dw as numpy array in unit tests of
ns_cpmg_2site_expanded.
This is after using masks as replacement.
Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion
models for Clustered analysis.
Modified:
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
Modified:
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py?rev=23941&r1=23940&r2=23941&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
(original)
+++
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
Fri Jun 13 17:31:38 2014
@@ -20,7 +20,7 @@
###############################################################################
# Python module imports.
-from numpy import array, float64, int16, pi, zeros
+from numpy import array, float64, int16, ones, pi, zeros
from unittest import TestCase
# relax module imports.
@@ -55,8 +55,10 @@
# Parameter conversions.
k_AB, k_BA, dw_frq = self.param_conversion(pA=self.pA, kex=self.kex,
dw=self.dw, sfrq=self.sfrq)
+ a = ones([self.num_points])
+
# Calculate the R2eff values.
- r2eff_ns_cpmg_2site_expanded(r20=self.r20, pA=self.pA, dw=dw_frq,
k_AB=k_AB, k_BA=k_BA, relax_time=0.3, inv_relax_time=1/0.3, tcp=self.tcp,
back_calc=self.R2eff, num_points=self.num_points, num_cpmg=self.num_cpmg)
+ r2eff_ns_cpmg_2site_expanded(r20=self.r20*a, pA=self.pA,
dw=dw_frq*a, dw_orig=dw_frq*a, kex=self.kex, relax_time=0.3,
inv_relax_time=1/0.3, tcp=self.tcp, back_calc=self.R2eff,
num_cpmg=self.num_cpmg)
# Check all R2eff values.
if self.kex >= 1.e5:
r23941 - /branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py