r21114 - in /branches/relax_disp/test_suite/system_tests: relax_disp.py scripts/relax_disp/sprangers_data.py -- October 15, 2013 - 16:13

Author: bugman
Date: Tue Oct 15 16:13:24 2013
New Revision: 21114

URL: http://svn.gna.org/viewcvs/relax?rev=21114&view=rev
Log:
Modified the Relax_disp.test_sprangers_cpmg_data_auto_analysis system test so 
the models are programatically changed.


Modified:
    branches/relax_disp/test_suite/system_tests/relax_disp.py
    
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/sprangers_data.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=21114&r1=21113&r2=21114&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Tue Oct 15 
16:13:24 2013
@@ -1497,6 +1497,9 @@
         This uses the data from Remco Sprangers' paper at 
http://dx.doi.org/10.1073/pnas.0507370102.  This is MQ CPMG data with a fixed 
relaxation time period.
         """
 
+        # The models to optimise.
+        ds.models = ['R2eff', 'No Rex', 'MQ NS CPMG 2-site']
+
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp'+sep+'sprangers_data.py')
 

Modified: 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/sprangers_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp/sprangers_data.py?rev=21114&r1=21113&r2=21114&view=diff
==============================================================================
--- 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/sprangers_data.py
 (original)
+++ 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/sprangers_data.py
 Tue Oct 15 16:13:24 2013
@@ -18,7 +18,8 @@
 #####################
 
 # The dispersion models.
-MODELS = ['R2eff', 'No Rex', 'MQ NS CPMG 2-site']
+if not hasattr(ds, 'models'):
+    ds.models = ['R2eff', 'No Rex', 'MQ NS CPMG 2-site']
 
 # The grid search size (the number of increments per dimension).
 GRID_INC = 4
@@ -122,4 +123,4 @@
 Relax_disp.opt_max_iterations = 10000
 
 # Do not change!
-Relax_disp(pipe_name=pipe_name, pipe_bundle=pipe_bundle, 
results_dir=ds.tmpdir, models=MODELS, grid_inc=GRID_INC, mc_sim_num=MC_NUM)
+Relax_disp(pipe_name=pipe_name, pipe_bundle=pipe_bundle, 
results_dir=ds.tmpdir, models=ds.models, grid_inc=GRID_INC, mc_sim_num=MC_NUM)