Author: tlinnet
Date: Tue Jul 29 16:33:37 2014
New Revision: 24812
URL: http://svn.gna.org/viewcvs/relax?rev=24812&view=rev
Log:
Renamed return grace data function, to a better shorter name.
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=24812&r1=24811&r2=24812&view=diff
==============================================================================
--- branches/r1rho_plotting/specific_analyses/relax_disp/data.py
(original)
+++ branches/r1rho_plotting/specific_analyses/relax_disp/data.py Tue
Jul 29 16:33:37 2014
@@ -2057,7 +2057,7 @@
# Loop over the spectrometer frequencies and offsets.
if interpolate == INTERPOLATE_DISP:
- err, data, set_labels, set_colours, x_axis_type_zero,
symbols, symbol_sizes, linetype, linestyle, axis_labels =
return_grace_data_r1rho_r2_as_func_of_rot_param(y_axis=y_axis, x_axis=x_axis,
exp_type=exp_type, ei=ei, current_spin=current_spin, spin_id=spin_id, si=si,
back_calc=back_calc, cpmg_frqs_new=cpmg_frqs_new,
spin_lock_nu1_new=spin_lock_nu1_new, chemical_shifts=chemical_shifts,
offsets_inter=offsets_inter, tilt_angles_inter=tilt_angles_inter,
Delta_omega_inter=Delta_omega_inter, w_eff_inter=w_eff_inter,
interpolated_flag=interpolated_flag, graph_index=graph_index,
colour_order=colour_order, data=data, set_labels=set_labels,
set_colours=set_colours, x_axis_type_zero=x_axis_type_zero, symbols=symbols,
symbol_sizes=symbol_sizes, linetype=linetype, linestyle=linestyle,
axis_labels=axis_labels)
+ err, data, set_labels, set_colours, x_axis_type_zero,
symbols, symbol_sizes, linetype, linestyle, axis_labels =
return_grace_data_vs_disp(y_axis=y_axis, x_axis=x_axis, exp_type=exp_type,
ei=ei, current_spin=current_spin, spin_id=spin_id, si=si,
back_calc=back_calc, cpmg_frqs_new=cpmg_frqs_new,
spin_lock_nu1_new=spin_lock_nu1_new, chemical_shifts=chemical_shifts,
offsets_inter=offsets_inter, tilt_angles_inter=tilt_angles_inter,
Delta_omega_inter=Delta_omega_inter, w_eff_inter=w_eff_inter,
interpolated_flag=interpolated_flag, graph_index=graph_index,
colour_order=colour_order, data=data, set_labels=set_labels,
set_colours=set_colours, x_axis_type_zero=x_axis_type_zero, symbols=symbols,
symbol_sizes=symbol_sizes, linetype=linetype, linestyle=linestyle,
axis_labels=axis_labels)
elif interpolate == INTERPOLATE_OFFSET:
err, data, set_labels, set_colours, x_axis_type_zero,
symbols, symbol_sizes, linetype, linestyle, axis_labels =
return_grace_data_r1rho_r2_as_func_of_rot_param_inter_offset(y_axis=y_axis,
x_axis=x_axis, exp_type=exp_type, ei=ei, current_spin=current_spin,
spin_id=spin_id, si=si, back_calc=back_calc,
spin_lock_nu1_new=spin_lock_nu1_new, chemical_shifts=chemical_shifts,
offsets_inter=offsets_inter, tilt_angles_inter=tilt_angles_inter,
Delta_omega_inter=Delta_omega_inter, w_eff_inter=w_eff_inter,
interpolated_flag=interpolated_flag, graph_index=graph_index,
colour_order=colour_order, data=data, set_labels=set_labels,
set_colours=set_colours, x_axis_type_zero=x_axis_type_zero, symbols=symbols,
symbol_sizes=symbol_sizes, linetype=linetype, linestyle=linestyle,
axis_labels=axis_labels)
@@ -2785,7 +2785,7 @@
return array(cpmg_frqs, float64)
-def return_grace_data_r1rho_r2_as_func_of_rot_param(y_axis=None,
x_axis=None, exp_type=None, ei=None, current_spin=None, spin_id=None,
si=None, back_calc=None, cpmg_frqs_new=None, spin_lock_nu1_new=None,
chemical_shifts=None, offsets_inter=None, tilt_angles_inter=None,
Delta_omega_inter=None, w_eff_inter=None, interpolated_flag=None,
graph_index=None, colour_order=None, data=None, set_labels=None,
set_colours=None, x_axis_type_zero=None, symbols=None, symbol_sizes=None,
linetype=None, linestyle=None, axis_labels=None):
+def return_grace_data_vs_disp(y_axis=None, x_axis=None, exp_type=None,
ei=None, current_spin=None, spin_id=None, si=None, back_calc=None,
cpmg_frqs_new=None, spin_lock_nu1_new=None, chemical_shifts=None,
offsets_inter=None, tilt_angles_inter=None, Delta_omega_inter=None,
w_eff_inter=None, interpolated_flag=None, graph_index=None,
colour_order=None, data=None, set_labels=None, set_colours=None,
x_axis_type_zero=None, symbols=None, symbol_sizes=None, linetype=None,
linestyle=None, axis_labels=None):
"""Return data in lists for 2D Grace plotting function, to prepate
plotting R1rho R2 as function of effective field in rotating frame w_eff.
@keyword y_axis: String flag to tell which data on Y
axis to plot for. Option can be either "%s" which plot 'r2eff' for CPMG
experiments or 'r1rho' for R1rho experiments or option can be "%s", which for
R1rho experiments plot R2 = R1rho / sin^2(theta) - R_1 / tan^2(theta) =
(R1rho - R_1 * cos^2(theta) ) / sin^2(theta).
r24812 - /branches/r1rho_plotting/specific_analyses/relax_disp/data.py