r23877 - /branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py -- June 12, 2014 - 13:19

Author: tlinnet
Date: Thu Jun 12 13:19:04 2014
New Revision: 23877

URL: http://svn.gna.org/viewcvs/relax?rev=23877&view=rev
Log:
Made unit tests for model TSMFK01 send in R20A and dw as a numpy array.

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_tsmfk01.py

Modified: 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py?rev=23877&r1=23876&r2=23877&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py
     (original)
+++ 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py
     Thu Jun 12 13:19:04 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.
@@ -57,8 +57,10 @@
         # Parameter conversions.
         k_AB, k_BA, pB, 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_TSMFK01(r20a=self.r20a, dw=dw_frq, k_AB=k_AB, 
tcp=self.cpmg_frqs, back_calc=self.R2eff, num_points=self.num_points)
+        r2eff_TSMFK01(r20a=self.r20a*a, dw=dw_frq*a, dw_orig=dw_frq, 
k_AB=k_AB, tcp=self.cpmg_frqs, back_calc=self.R2eff, 
num_points=self.num_points)
 
         # Check all R2eff values.
         for i in range(self.num_points):