r24852 - /branches/r1rho_plotting/test_suite/system_tests/relax_disp.py -- July 30, 2014 - 20:11

Author: tlinnet
Date: Wed Jul 30 20:11:52 2014
New Revision: 24852

URL: http://svn.gna.org/viewcvs/relax?rev=24852&view=rev
Log:
Added model 'No Rex' to systemtest Relax_disp.test_r1rho_kjaergaard_auto(), 
to check all graphs are produced.

sr #3124(https://gna.org/support/?3124): Grace graphs production for R1rho 
analysis with R2_eff as function of Omega_eff.
sr #3138(https://gna.org/support/?3138): Interpolating theta through 
spin-lock offset [Omega], rather than spin-lock field strength [w1].

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

Modified: branches/r1rho_plotting/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/r1rho_plotting/test_suite/system_tests/relax_disp.py?rev=24852&r1=24851&r2=24852&view=diff
==============================================================================
--- branches/r1rho_plotting/test_suite/system_tests/relax_disp.py       
(original)
+++ branches/r1rho_plotting/test_suite/system_tests/relax_disp.py       Wed 
Jul 30 20:11:52 2014
@@ -35,7 +35,7 @@
 from pipe_control.mol_res_spin import return_spin, spin_loop
 from specific_analyses.relax_disp.data import generate_r20_key, 
get_curve_type, has_r1rho_exp_type, loop_exp_frq, loop_exp_frq_offset_point, 
return_param_key_from_data
 from specific_analyses.relax_disp.data import INTERPOLATE_DISP, 
INTERPOLATE_OFFSET, X_AXIS_DISP, X_AXIS_W_EFF, X_AXIS_THETA, Y_AXIS_R2_R1RHO, 
Y_AXIS_R2_EFF
-from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_DQ, 
EXP_TYPE_CPMG_MQ, EXP_TYPE_CPMG_PROTON_MQ, EXP_TYPE_CPMG_PROTON_SQ, 
EXP_TYPE_CPMG_SQ, EXP_TYPE_CPMG_ZQ, EXP_TYPE_R1RHO, MODEL_B14_FULL, 
MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_LM63, MODEL_M61B, MODEL_NOREX, 
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_PARAMS, MODEL_R2EFF
+from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_DQ, 
EXP_TYPE_CPMG_MQ, EXP_TYPE_CPMG_PROTON_MQ, EXP_TYPE_CPMG_PROTON_SQ, 
EXP_TYPE_CPMG_SQ, EXP_TYPE_CPMG_ZQ, EXP_TYPE_R1RHO, MODEL_B14_FULL, 
MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, MODEL_LM63, MODEL_M61B, 
MODEL_NOREX, MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_PARAMS, MODEL_R2EFF
 from status import Status; status = Status()
 from test_suite.system_tests.base_classes import SystemTestCase
 
@@ -4703,7 +4703,7 @@
         self.assert_(hasattr(cdp.mol[0].res[42].spin[0], 'ri_data'))
 
         # The dispersion models.
-        MODELS = ['R2eff', 'DPL94']
+        MODELS = [MODEL_R2EFF, MODEL_NOREX, MODEL_DPL94]
 
         # The grid search size (the number of increments per dimension).
         GRID_INC = 4