r12256 - in /1.3/test_suite/system_tests: model_free.py scripts/model_free/opt_tm2_grid.py -- January 12, 2011 - 17:08

Author: bugman
Date: Wed Jan 12 17:08:01 2011
New Revision: 12256

URL: http://svn.gna.org/viewcvs/relax?rev=12256&view=rev
Log:
The test_m2_grid_vs_m3() system test should really have been against model m4!

Model m3 has no te parameter, so the model does not fit perfectly.


Modified:
    1.3/test_suite/system_tests/model_free.py
    1.3/test_suite/system_tests/scripts/model_free/opt_tm2_grid.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=12256&r1=12255&r2=12256&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Wed Jan 12 17:08:01 2011
@@ -348,11 +348,11 @@
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'opt_tm2_grid.py')
 
 
-    def test_m2_grid_vs_m3(self):
-        """Test the optimisation of the m3 model-free model against the tm2 
parameter grid."""
+    def test_m2_grid_vs_m4(self):
+        """Test the optimisation of the m4 model-free model against the tm2 
parameter grid."""
 
         # Initialise.
-        cdp._model = 'm3'
+        cdp._model = 'm4'
         cdp._value_test = self.value_test
 
         # Setup the data pipe for optimisation.

Modified: 1.3/test_suite/system_tests/scripts/model_free/opt_tm2_grid.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/model_free/opt_tm2_grid.py?rev=12256&r1=12255&r2=12256&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/model_free/opt_tm2_grid.py (original)
+++ 1.3/test_suite/system_tests/scripts/model_free/opt_tm2_grid.py Wed Jan 12 
17:08:01 2011
@@ -57,7 +57,7 @@
             spin.select = True
 
             # Set up the diffusion tensor.
-            if cdp._model in ['m2', 'm3']:
+            if cdp._model in ['m2', 'm4']:
                 if res_index:
                     diffusion_tensor.delete()
                 diffusion_tensor.init(tm[tm_index])
@@ -65,11 +65,11 @@
             # Set up the initial model-free parameter values (bypass the 
grid search for speed).
             if cdp._model in ['tm2']:
                 spin.local_tm = tm[tm_index]
-            if cdp._model in ['m2', 'm3']:
+            if cdp._model in ['m2', 'm4']:
                 spin.s2 = s2[s2_index]
-            if cdp._model in ['m2', 'm3']:
+            if cdp._model in ['m2', 'm4']:
                 spin.te = te[te_index]
-            if cdp._model in ['m3']:
+            if cdp._model in ['m4']:
                 spin.rex = 0.0
 
             # Minimise.
@@ -78,7 +78,7 @@
             # Check the values.
             if cdp._model == 'm2':
                 cdp._value_test(spin, s2=s2[s2_index], te=te[te_index]*1e12, 
chi2=0.0)
-            elif cdp._model == 'm3':
+            elif cdp._model == 'm4':
                 cdp._value_test(spin, s2=s2[s2_index], te=te[te_index]*1e12, 
rex=0.0, chi2=0.0)
             elif cdp._model == 'tm2':
                 cdp._value_test(spin, local_tm=tm[tm_index]*1e9, 
s2=s2[s2_index], te=te[te_index]*1e12, chi2=0.0)