r24825 - /branches/r1rho_plotting/specific_analyses/relax_disp/data.py -- July 30, 2014 - 12:53

Author: tlinnet
Date: Wed Jul 30 12:53:00 2014
New Revision: 24825

URL: http://svn.gna.org/viewcvs/relax?rev=24825&view=rev
Log:
Renamed plotting function to represent the function of writing to file.

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/specific_analyses/relax_disp/data.py

Modified: branches/r1rho_plotting/specific_analyses/relax_disp/data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/r1rho_plotting/specific_analyses/relax_disp/data.py?rev=24825&r1=24824&r2=24825&view=diff
==============================================================================
--- branches/r1rho_plotting/specific_analyses/relax_disp/data.py        
(original)
+++ branches/r1rho_plotting/specific_analyses/relax_disp/data.py        Wed 
Jul 30 12:53:00 2014
@@ -1798,25 +1798,25 @@
 
     # Plot dispersion curves, extending over number of dispersion points.
     file_name_ini = "disp"
-    
plot_disp_curves_r1rho_r2_as_func_of_rot_param(file_name_ini=file_name_ini, 
dir=dir, y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, 
num_points=num_points, extend_hz=extend_hz, extend_ppm=extend_ppm, 
force=force, proton_mmq_flag=proton_mmq_flag)
+    plot_disp_curves_to_file(file_name_ini=file_name_ini, dir=dir, 
y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, num_points=num_points, 
extend_hz=extend_hz, extend_ppm=extend_ppm, force=force, 
proton_mmq_flag=proton_mmq_flag)
 
     # For R1rho models, interpolate through spin-lock field strength, and 
plot R1rho R2 as function of effective field in rotating frame w_eff.
     if cdp.exp_type_list == [EXP_TYPE_R1RHO]:
         y_axis = Y_AXIS_R2_R1RHO
         x_axis = X_AXIS_W_EFF
         file_name_ini = "%s_vs_%s_inter_%s"%(y_axis, x_axis, interpolate)
-        
plot_disp_curves_r1rho_r2_as_func_of_rot_param(file_name_ini=file_name_ini, 
dir=dir, y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, 
num_points=num_points, extend_hz=extend_hz, extend_ppm=extend_ppm, 
force=force, proton_mmq_flag=proton_mmq_flag)
+        plot_disp_curves_to_file(file_name_ini=file_name_ini, dir=dir, 
y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, num_points=num_points, 
extend_hz=extend_hz, extend_ppm=extend_ppm, force=force, 
proton_mmq_flag=proton_mmq_flag)
 
         y_axis = Y_AXIS_R2_EFF
         x_axis = X_AXIS_THETA
         file_name_ini = "%s_vs_%s_inter_%s"%("r1rho", x_axis, interpolate)
-        
plot_disp_curves_r1rho_r2_as_func_of_rot_param(file_name_ini=file_name_ini, 
dir=dir, y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, 
num_points=num_points, extend_hz=extend_hz, extend_ppm=extend_ppm, 
force=force, proton_mmq_flag=proton_mmq_flag)
+        plot_disp_curves_to_file(file_name_ini=file_name_ini, dir=dir, 
y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, num_points=num_points, 
extend_hz=extend_hz, extend_ppm=extend_ppm, force=force, 
proton_mmq_flag=proton_mmq_flag)
 
         y_axis = Y_AXIS_R2_EFF
         x_axis = X_AXIS_THETA
         interpolate = INTERPOLATE_OFFSET
         file_name_ini = "%s_vs_%s_inter_%s"%("r1rho", x_axis, interpolate)
-        
plot_disp_curves_r1rho_r2_as_func_of_rot_param(file_name_ini=file_name_ini, 
dir=dir, y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, 
num_points=num_points, extend_hz=extend_hz, extend_ppm=extend_ppm, 
force=force, proton_mmq_flag=proton_mmq_flag)
+        plot_disp_curves_to_file(file_name_ini=file_name_ini, dir=dir, 
y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, num_points=num_points, 
extend_hz=extend_hz, extend_ppm=extend_ppm, force=force, 
proton_mmq_flag=proton_mmq_flag)
 
     # Write a python "grace to PNG/EPS/SVG..." conversion script.
     # Open the file for writing.
@@ -1955,7 +1955,7 @@
         add_result_file(type='grace', label='Grace', file=file_path)
 
 
-def plot_disp_curves_r1rho_r2_as_func_of_rot_param(file_name_ini=None, 
dir=None, y_axis=None, x_axis=None, interpolate=None, num_points=None, 
extend_hz=None, extend_ppm=None, force=None, proton_mmq_flag=None):
+def plot_disp_curves_to_file(file_name_ini=None, dir=None, y_axis=None, 
x_axis=None, interpolate=None, num_points=None, extend_hz=None, 
extend_ppm=None, force=None, proton_mmq_flag=None):
     """Custom 2D Grace plotting function for the dispersion curves, 
interpolating theta through spin-lock offset rather than spin-lock field 
strength.
 
     One file will be created per spin system.