r23312 - /trunk/test_suite/system_tests/relax_disp.py -- May 21, 2014 - 18:00

Author: tlinnet
Date: Wed May 21 18:00:19 2014
New Revision: 23312

URL: http://svn.gna.org/viewcvs/relax?rev=23312&view=rev
Log:
Renamed systemtest to test_cpmg_synthetic_ns3d_to_cr72_noise_cluster.

The model that creates the data has been changed to numerical model.

bug #22017: (https://gna.org/bugs/index.php?22017) LinAlgError, for all 
numerical CPMG models.

Modified:
    trunk/test_suite/system_tests/relax_disp.py

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=23312&r1=23311&r2=23312&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Wed May 21 18:00:19 2014
@@ -1093,7 +1093,7 @@
                         self.assertAlmostEqual(set_val, min_val, 3)
 
 
-    def test_cpmg_synthetic_cr72_full_noise_cluster(self):
+    def test_cpmg_synthetic_ns3d_to_cr72_noise_cluster(self):
         """Test synthetic cpmg data. For CR72 with small noise and cluster.
 
         This script will produce synthetic CPMG R2eff values according to 
the selected model, and the fit the selected model.
@@ -1103,7 +1103,8 @@
         #self.interpreter.reset()
 
         ## Set Experiments.
-        model_create = 'CR72'
+        model_create = 'NS CPMG 2-site 3D'
+        #model_create = 'NS CPMG 2-site expanded'
         model_analyse = 'CR72'
 
         # Exp 1
@@ -1127,8 +1128,8 @@
         exps = [exp_1, exp_2]
 
         spins = [
-            ['Ala', 1, 'N', {'r2': {r20_key_1:10, r20_key_2:11.5}, 'r2a': 
{r20_key_1:10, r20_key_2:11.5}, 'r2b': {r20_key_1:10, r20_key_2:11.5}, 'kex': 
1000, 'pA': 0.99, 'dw': 2} ],
-            ['Ala', 2, 'N', {'r2': {r20_key_1:13, r20_key_2:14.5}, 'r2a': 
{r20_key_1:13, r20_key_2:14.5}, 'r2b': {r20_key_1:13, r20_key_2:14.5}, 'kex': 
1000, 'pA': 0.99, 'dw': 1} ]
+            ['Ala', 1, 'N', {'r2': {r20_key_1:10., r20_key_2:11.5}, 'r2a': 
{r20_key_1:10., r20_key_2:11.5}, 'r2b': {r20_key_1:10., r20_key_2:11.5}, 
'kex': 1000., 'pA': 0.99, 'dw': 2.} ],
+            ['Ala', 2, 'N', {'r2': {r20_key_1:13., r20_key_2:14.5}, 'r2a': 
{r20_key_1:13., r20_key_2:14.5}, 'r2b': {r20_key_1:13., r20_key_2:14.5}, 
'kex': 1000., 'pA': 0.99, 'dw': 1.} ]
             ]
 
         # Collect the data to be used.
@@ -1227,8 +1228,13 @@
                         print("WARNING: rel change level is above %.2f, and 
is %.4f."%(ds.rel_change, rel_change))
                         print("###################################")
 
-                        ## Make test on parameters. Only if breaking the 
relative change.
-                        self.assertAlmostEqual(set_val, min_val, 1)
+                    ## Make test on parameters.
+                    if mo_param == 'dw':
+                        self.assertAlmostEqual(set_val/10, min_val/10, 1)
+                    elif mo_param == 'kex':
+                        self.assertAlmostEqual(set_val/1000, min_val/1000, 1)
+                    elif mo_param == 'pA':
+                        self.assertAlmostEqual(set_val, min_val, 2)
 
 
     def test_cpmg_synthetic_dx_map_points(self):