r23420 - /branches/disp_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py -- May 26, 2014 - 14:41

Author: tlinnet
Date: Mon May 26 14:41:52 2014
New Revision: 23420

URL: http://svn.gna.org/viewcvs/relax?rev=23420&view=rev
Log:
Small fix for 8 unit tests demonstrating edge case 'no Rex' failures of the 
model 'ns cpmg_2site_expanded'.

The comparison of R2eff is now divided into a special case for kex having 
large values.

Modified:
    
branches/disp_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py

Modified: 
branches/disp_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py?rev=23420&r1=23419&r2=23420&view=diff
==============================================================================
--- 
branches/disp_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
   (original)
+++ 
branches/disp_speed/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
   Mon May 26 14:41:52 2014
@@ -42,7 +42,6 @@
         # Required data structures.
         self.num_points = 3
         self.tcp = array([0.1, 0.2, 0.3], float64)
-        self.R2eff = zeros(3, float64)
         self.num_cpmg = array([1, 2, 3], int16)
 
 
@@ -53,11 +52,14 @@
         k_AB, k_BA = self.param_conversion(pA=self.pA, kex=self.kex)
 
         # Calculate the R2eff values.
-        self.R2eff = r2eff_ns_cpmg_2site_expanded(r20=self.r20, pA=self.pA, 
dw=self.dw, k_AB=k_AB, k_BA=k_BA, relax_time=0.3, inv_relax_time=1/0.3, 
tcp=self.tcp, num_points=self.num_points, num_cpmg=self.num_cpmg)
+        R2eff = r2eff_ns_cpmg_2site_expanded(r20=self.r20, pA=self.pA, 
dw=self.dw, k_AB=k_AB, k_BA=k_BA, relax_time=0.3, inv_relax_time=1/0.3, 
tcp=self.tcp, num_points=self.num_points, num_cpmg=self.num_cpmg)
 
-        # Check all R2eff values.
-        for i in range(self.num_points):
-            self.assertAlmostEqual(self.R2eff[i], 2.0, 5)
+        if self.kex >= 1.e5:
+            for i in range(self.num_points):
+                self.assertAlmostEqual(R2eff[i], self.r20, 5)
+        else:
+            for i in range(self.num_points):
+                self.assertAlmostEqual(R2eff[i], self.r20)
 
 
     def param_conversion(self, pA=None, kex=None):