Author: tlinnet
Date: Fri Jul 25 20:56:40 2014
New Revision: 24766
URL: http://svn.gna.org/viewcvs/relax?rev=24766&view=rev
Log:
Inverted the input to atan2() function in
specific_analyses/relax_disp/data.py.
This has no influence on the system tests.
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=24766&r1=24765&r2=24766&view=diff
==============================================================================
--- branches/r1rho_plotting/specific_analyses/relax_disp/data.py
(original)
+++ branches/r1rho_plotting/specific_analyses/relax_disp/data.py
Fri Jul 25 20:56:40 2014
@@ -2135,7 +2135,7 @@
if Delta_omega == 0.0:
theta = pi / 2.0
else:
- theta = atan2(omega1, Delta_omega)
+ theta = atan2(Delta_omega, omega1)
# Calculate effective field in rotating frame
w_eff = sqrt( Delta_omega*Delta_omega + omega1*omega1 )
@@ -2207,7 +2207,7 @@
if Delta_omega == 0.0:
theta = pi / 2.0
else:
- theta = atan2(omega1, Delta_omega)
+ theta = atan2(Delta_omega, omega1)
# Calculate effective field in rotating frame
w_eff = sqrt( Delta_omega*Delta_omega + omega1*omega1 )
@@ -2330,7 +2330,7 @@
if Delta_omega == 0.0:
theta = pi / 2.0
else:
- theta = atan2(omega1, Delta_omega)
+ theta = atan2(Delta_omega, omega1)
# Calculate effective field in rotating frame
w_eff = sqrt( Delta_omega*Delta_omega + omega1*omega1 )
@@ -3610,7 +3610,7 @@
# Then it should be: theta = pi + atan(-x) = pi -
atan(x) = pi - abs(atan( +/- x)).
# This is taken care of with the atan2(y, x)
function, which return atan(y / x), in radians, and the result is between
-pi and pi.
else:
- theta[ei][si][mi][oi].append(atan2(omega1,
Delta_omega))
+
theta[ei][si][mi][oi].append(atan2(Delta_omega, omega1))
# Calculate effective field in rotating frame
w_eff = sqrt( Delta_omega*Delta_omega +
omega1*omega1 )
@@ -3683,7 +3683,7 @@
# Then it should be: theta = pi + atan(-x) = pi -
atan(x) = pi - abs(atan( +/- x)).
# This is taken care of with the atan2(y, x)
function, which return atan(y / x), in radians, and the result is between
-pi and pi.
else:
- theta[ei][si][mi][oi].append(atan2(omega1,
Delta_omega))
+
theta[ei][si][mi][oi].append(atan2(Delta_omega, omega1))
# Calculate effective field in rotating frame
w_eff = sqrt( Delta_omega*Delta_omega +
omega1*omega1 )
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits