r24001 - /branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mmq_cr72.py -- June 16, 2014 - 22:11

Author: tlinnet
Date: Mon Jun 16 22:11:33 2014
New Revision: 24001

URL: http://svn.gna.org/viewcvs/relax?rev=24001&view=rev
Log:
Changed unit test of MMQ CR72 to pass.

dw needs to be of numpy structure.

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

Modified: 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mmq_cr72.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mmq_cr72.py?rev=24001&r1=24000&r2=24001&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mmq_cr72.py
    (original)
+++ 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mmq_cr72.py
    Mon Jun 16 22:11:33 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.
@@ -41,7 +41,7 @@
         self.kex = 1000.0
 
         # Required data structures.
-        self.num_points = 7
+        self.num_points = 6
         self.ncyc = array([2, 4, 8, 10, 20, 40])
         relax_times = 0.04
         self.cpmg_frqs = self.ncyc / relax_times
@@ -59,8 +59,10 @@
         # Parameter conversions.
         k_AB, k_BA, pB, dw_frq, dwH_frq = self.param_conversion(pA=self.pA, 
kex=self.kex, dw=self.dw, dwH=self.dwH, sfrq=self.sfrq)
 
+        a = ones(self.ncyc.shape)
+
         # Calculate the R2eff values.
-        r2eff_mmq_cr72(r20=self.r20, pA=self.pA, pB=pB, dw=dw_frq, 
dwH=dwH_frq, kex=self.kex, k_AB=k_AB, k_BA=k_BA, cpmg_frqs=self.cpmg_frqs, 
inv_tcpmg=self.inv_relax_times, tcp=self.tau_cpmg, back_calc=self.R2eff, 
num_points=self.num_points, power=self.ncyc)
+        r2eff_mmq_cr72(r20=self.r20*a, pA=self.pA, pB=pB, dw=dw_frq*a, 
dwH=dwH_frq*a, kex=self.kex, k_AB=k_AB, k_BA=k_BA, cpmg_frqs=self.cpmg_frqs, 
inv_tcpmg=self.inv_relax_times, tcp=self.tau_cpmg, back_calc=self.R2eff)
 
         # Check all R2eff values.
         for i in range(self.num_points):
@@ -184,10 +186,10 @@
 
 
     def test_mmq_cr72_no_rex8(self):
-        """Test the r2eff_mmq_cr72() function for no exchange when kex = 
1e5."""
+        """Test the r2eff_mmq_cr72() function for no exchange when kex = 
1e8."""
 
         # Parameter reset.
-        self.kex = 1e5
+        self.kex = 1e8
 
         # Calculate and check the R2eff values.
         self.calc_r2eff()