r24763 - /branches/r1rho_plotting/specific_analyses/relax_disp/data.py -- July 25, 2014 - 18:23

Author: tlinnet
Date: Fri Jul 25 18:23:24 2014
New Revision: 24763

URL: http://svn.gna.org/viewcvs/relax?rev=24763&view=rev
Log:
Moved the file_name creation out of the interpolate function, to make it a 
general function for interpolating.

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=24763&r1=24762&r2=24763&view=diff
==============================================================================
--- branches/r1rho_plotting/specific_analyses/relax_disp/data.py        
(original)
+++ branches/r1rho_plotting/specific_analyses/relax_disp/data.py        Fri 
Jul 25 18:23:24 2014
@@ -1623,15 +1623,16 @@
         linetype = []
         linestyle = []
 
+        # The unique file name.
+        file_name = "disp%s.agr" % spin_id.replace('#', '_').replace(':', 
'_').replace('@', '_')
+
         # Set up the interpolated curve data structures.
         interpolated_flag = False
         if not spin.model in [MODEL_R2EFF]:
             # Interpolate through disp points.
-            file_name, interpolated_flag, back_calc, cpmg_frqs_new, 
spin_lock_nu1_new = plot_disp_curves_interpolate_disp(spin=spin, 
spin_id=spin_id, num_points=num_points, extend=extend)
+            interpolated_flag, back_calc, cpmg_frqs_new, spin_lock_nu1_new = 
plot_disp_curves_interpolate_disp(spin=spin, spin_id=spin_id, 
num_points=num_points, extend=extend)
 
         else:
-            # The unique file name.
-            file_name = "disp%s.agr" % spin_id.replace('#', 
'_').replace(':', '_').replace('@', '_')
             back_calc = None
             cpmg_frqs_new = None
             spin_lock_nu1_new = None
@@ -1836,9 +1837,6 @@
     @rtype:                 string, boolean, numpy rank-1 float64 array, 
numpy rank-1 float64 array, numpy rank-1 float64 array
     """
 
-    # The unique file name.
-    file_name = "disp%s.agr" % spin_id.replace('#', '_').replace(':', 
'_').replace('@', '_')
-
     # Set the flag.
     interpolated_flag = True
 
@@ -1947,7 +1945,7 @@
     # Back calculate R2eff data for the second sets of plots.
     back_calc = 
specific_analyses.relax_disp.optimisation.back_calc_r2eff(spin=spin, 
spin_id=spin_id, cpmg_frqs=cpmg_frqs_new, spin_lock_nu1=spin_lock_nu1_new)
 
-    return file_name, interpolated_flag, back_calc, cpmg_frqs_new, 
spin_lock_nu1_new
+    return interpolated_flag, back_calc, cpmg_frqs_new, spin_lock_nu1_new
 
 
 def plot_disp_curves_interpolate_sl_offset(spin=None, spin_id=None, si=None, 
num_points=None, extend=None):