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

Author: tlinnet
Date: Wed Jul 30 20:11:57 2014
New Revision: 24854

URL: http://svn.gna.org/viewcvs/relax?rev=24854&view=rev
Log:
Modified systemtest to use the new function to return initial part of file 
name for grace plotting.

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=24854&r1=24853&r2=24854&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:57 2014
@@ -33,7 +33,7 @@
 import dep_check
 from lib.io import get_file_path
 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 generate_r20_key, 
get_curve_type, has_r1rho_exp_type, loop_exp_frq, loop_exp_frq_offset_point, 
return_grace_file_name_ini, 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_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()
@@ -4763,13 +4763,7 @@
             # Loop over graphs.
             for y_axis, x_axis, interpolate in graph_comb:
                 # Determine file name:
-                if y_axis == Y_AXIS_R2_EFF and x_axis == X_AXIS_DISP and 
interpolate == INTERPOLATE_DISP:
-                    file_name_ini = "disp"
-                # Special file name for R2_R1RHO data.
-                elif has_r1rho_exp_type and y_axis == Y_AXIS_R2_EFF and 
x_axis != X_AXIS_DISP:
-                    file_name_ini = "%s_vs_%s_inter_%s"%("r1rho", x_axis, 
interpolate)
-                else:
-                    file_name_ini = "%s_vs_%s_inter_%s"%(y_axis, x_axis, 
interpolate)
+                file_name_ini = return_grace_file_name_ini(y_axis=y_axis, 
x_axis=x_axis, interpolate=interpolate)
 
                 # Make the file name.
                 file_name = "%s%s.agr" % (file_name_ini, 
spin_id.replace('#', '_').replace(':', '_').replace('@', '_'))