r19972 - in /branches/relax_disp: lib/dispersion/m61.py target_functions/relax_disp.py -- June 08, 2013 - 23:16

Author: bugman
Date: Sat Jun  8 23:16:29 2013
New Revision: 19972

URL: http://svn.gna.org/viewcvs/relax?rev=19972&view=rev
Log:
Renamed the lib.dispersion.m61.r2eff_M61() function to r1rho_M61().


Modified:
    branches/relax_disp/lib/dispersion/m61.py
    branches/relax_disp/target_functions/relax_disp.py

Modified: branches/relax_disp/lib/dispersion/m61.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/m61.py?rev=19972&r1=19971&r2=19972&view=diff
==============================================================================
--- branches/relax_disp/lib/dispersion/m61.py (original)
+++ branches/relax_disp/lib/dispersion/m61.py Sat Jun  8 23:16:29 2013
@@ -44,7 +44,7 @@
 from math import pi, sin
 
 
-def r2eff_M61(r1rho_prime=None, phi_ex=None, kex=None, theta=pi/2, 
spin_lock_fields=None, back_calc=None, num_points=None):
+def r1rho_M61(r1rho_prime=None, phi_ex=None, kex=None, theta=pi/2, 
spin_lock_fields=None, back_calc=None, num_points=None):
     """Calculate the R2eff values for the M61 model.
 
     See the module docstring for details.

Modified: branches/relax_disp/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=19972&r1=19971&r2=19972&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_disp.py (original)
+++ branches/relax_disp/target_functions/relax_disp.py Sat Jun  8 23:16:29 
2013
@@ -29,7 +29,7 @@
 # relax module imports.
 from lib.dispersion.cr72 import r2eff_CR72
 from lib.dispersion.lm63 import r2eff_LM63
-from lib.dispersion.m61 import r2eff_M61
+from lib.dispersion.m61 import r1rho_M61
 from lib.errors import RelaxError
 from target_functions.chi2 import chi2
 from specific_analyses.relax_disp.variables import MODEL_CR72, 
MODEL_LIST_FULL, MODEL_LM63, MODEL_M61, MODEL_NOREX, MODEL_R2EFF
@@ -251,7 +251,7 @@
                 phi_ex_scaled = phi_ex[spin_index] * self.frqs[spin_index, 
frq_index]**2
 
                 # Back calculate the R2eff values.
-                r2eff_M61(r1rho_prime=R20[r20_index], phi_ex=phi_ex_scaled, 
kex=kex, spin_lock_fields=self.spin_lock_nu1, 
back_calc=self.back_calc[spin_index, frq_index], 
num_points=self.num_disp_points)
+                r1rho_M61(r1rho_prime=R20[r20_index], phi_ex=phi_ex_scaled, 
kex=kex, spin_lock_fields=self.spin_lock_nu1, 
back_calc=self.back_calc[spin_index, frq_index], 
num_points=self.num_disp_points)
 
                 # For all missing data points, set the back-calculated value 
to the measured values so that it has no effect on the chi-squared value.
                 for point_index in range(self.num_disp_points):