r20379 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- July 17, 2013 - 20:16

Author: bugman
Date: Wed Jul 17 20:16:47 2013
New Revision: 20379

URL: http://svn.gna.org/viewcvs/relax?rev=20379&view=rev
Log:
Fixes for the Relax_disp.test_hansen_cpmg_data_auto_analysis system test.

The checks for the 'CR72 red' model are now against the 'CR72' model.  And 
the models optimised only
now include 'No Rex', 'LM63', 'CR72', and 'IT99', massively speeding up the 
test.


Modified:
    branches/relax_disp/test_suite/system_tests/relax_disp.py

Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=20379&r1=20378&r2=20379&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed Jul 17 
20:16:47 2013
@@ -29,7 +29,7 @@
 from auto_analyses import relax_disp
 from data_store import Relax_data_store; ds = Relax_data_store()
 from pipe_control.mol_res_spin import spin_loop
-from specific_analyses.relax_disp.variables import MODEL_LIST_CPMG, 
MODEL_M61B, MODEL_R2EFF
+from specific_analyses.relax_disp.variables import MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_LIST_CPMG, MODEL_LM63, MODEL_M61B, 
MODEL_NOREX, MODEL_R2EFF
 from status import Status; status = Status()
 from test_suite.system_tests.base_classes import SystemTestCase
 
@@ -96,7 +96,12 @@
         """
 
         # Set the model.
-        ds.models = MODEL_LIST_CPMG
+        ds.models = [
+            MODEL_NOREX,
+            MODEL_LM63,
+            MODEL_CR72,
+            MODEL_IT99
+        ]
 
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp'+sep+'hansen_data.py')
@@ -137,8 +142,8 @@
         self.assertAlmostEqual(spin71.kex/10000, 2543.899105435682/10000, 4)
         self.assertAlmostEqual(spin71.chi2, 1.4423991744690439, 4)
 
-        # The 'CR72 red' model checks.  These models have not reached the 
minima due to the low quality optimisation!
-        self.interpreter.pipe.switch(pipe_name='CR72 red')
+        # The 'CR72' model checks.  These models have not reached the minima 
due to the low quality optimisation!
+        self.interpreter.pipe.switch(pipe_name='CR72')
         spin70 = cdp.mol[0].res[0].spin[0]
         spin71 = cdp.mol[0].res[1].spin[0]
         print("\n\nOptimised parameters:\n")