Author: tlinnet
Date: Mon May 19 03:20:54 2014
New Revision: 23228
URL: http://svn.gna.org/viewcvs/relax?rev=23228&view=rev
Log:
Added missing imports of "numpy.array".
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
Modified:
branches/disp_speed/lib/dispersion/lm63.py
branches/disp_speed/lib/dispersion/m61.py
branches/disp_speed/lib/dispersion/mmq_cr72.py
branches/disp_speed/lib/dispersion/mp05.py
branches/disp_speed/lib/dispersion/tap03.py
branches/disp_speed/lib/dispersion/tp02.py
branches/disp_speed/lib/dispersion/tsmfk01.py
Modified: branches/disp_speed/lib/dispersion/lm63.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/lm63.py?rev=23228&r1=23227&r2=23228&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/lm63.py (original)
+++ branches/disp_speed/lib/dispersion/lm63.py Mon May 19 03:20:54 2014
@@ -64,7 +64,7 @@
"""
# Python module imports.
-from numpy import isfinite, sum, tanh
+from numpy import array, isfinite, sum, tanh
def r2eff_LM63(r20=None, phi_ex=None, kex=None, cpmg_frqs=None,
back_calc=None, num_points=None):
Modified: branches/disp_speed/lib/dispersion/m61.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/m61.py?rev=23228&r1=23227&r2=23228&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/m61.py (original)
+++ branches/disp_speed/lib/dispersion/m61.py Mon May 19 03:20:54 2014
@@ -64,7 +64,7 @@
"""
# Python module imports.
-from numpy import isfinite, sum
+from numpy import array, isfinite, sum
def r1rho_M61(r1rho_prime=None, phi_ex=None, kex=None,
spin_lock_fields2=None, back_calc=None, num_points=None):
Modified: branches/disp_speed/lib/dispersion/mmq_cr72.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/mmq_cr72.py?rev=23228&r1=23227&r2=23228&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/mmq_cr72.py (original)
+++ branches/disp_speed/lib/dispersion/mmq_cr72.py Mon May 19 03:20:54
2014
@@ -47,7 +47,7 @@
"""
# Python module imports.
-from numpy import arccosh, cos, cosh, isfinite, log, sin, sqrt, sum
+from numpy import arccosh, array, cos, cosh, isfinite, log, sin, sqrt, sum
def r2eff_mmq_cr72(r20=None, pA=None, pB=None, dw=None, dwH=None, kex=None,
k_AB=None, k_BA=None, cpmg_frqs=None, inv_tcpmg=None, tcp=None,
back_calc=None, num_points=None, power=None):
Modified: branches/disp_speed/lib/dispersion/mp05.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/mp05.py?rev=23228&r1=23227&r2=23228&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/mp05.py (original)
+++ branches/disp_speed/lib/dispersion/mp05.py Mon May 19 03:20:54 2014
@@ -60,7 +60,7 @@
"""
# Python module imports.
-from numpy import arctan2, isfinite, sin, sum
+from numpy import arctan2, array, isfinite, sin, sum
def r1rho_MP05(r1rho_prime=None, omega=None, offset=None, pA=None, pB=None,
dw=None, kex=None, R1=0.0, spin_lock_fields=None, spin_lock_fields2=None,
back_calc=None, num_points=None):
Modified: branches/disp_speed/lib/dispersion/tap03.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/tap03.py?rev=23228&r1=23227&r2=23228&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/tap03.py (original)
+++ branches/disp_speed/lib/dispersion/tap03.py Mon May 19 03:20:54 2014
@@ -60,7 +60,7 @@
"""
# Python module imports.
-from numpy import arctan2, isfinite, sin, sqrt, sum
+from numpy import arctan2, array, isfinite, sin, sqrt, sum
def r1rho_TAP03(r1rho_prime=None, omega=None, offset=None, pA=None, pB=None,
dw=None, kex=None, R1=0.0, spin_lock_fields=None, spin_lock_fields2=None,
back_calc=None, num_points=None):
Modified: branches/disp_speed/lib/dispersion/tp02.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/tp02.py?rev=23228&r1=23227&r2=23228&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/tp02.py (original)
+++ branches/disp_speed/lib/dispersion/tp02.py Mon May 19 03:20:54 2014
@@ -60,7 +60,7 @@
"""
# Python module imports.
-from numpy import arctan2, isfinite, sin, sum
+from numpy import arctan2, array, isfinite, sin, sum
def r1rho_TP02(r1rho_prime=None, omega=None, offset=None, pA=None, pB=None,
dw=None, kex=None, R1=0.0, spin_lock_fields=None, spin_lock_fields2=None,
back_calc=None, num_points=None):
Modified: branches/disp_speed/lib/dispersion/tsmfk01.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/tsmfk01.py?rev=23228&r1=23227&r2=23228&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/tsmfk01.py (original)
+++ branches/disp_speed/lib/dispersion/tsmfk01.py Mon May 19 03:20:54
2014
@@ -67,7 +67,7 @@
"""
# Python module imports.
-from numpy import sin, isfinite, sum
+from numpy import array, sin, isfinite, sum
def r2eff_TSMFK01(r20a=None, dw=None, k_AB=None, tcp=None, back_calc=None,
num_points=None):
r23228 - in /branches/disp_speed/lib/dispersion: lm63.py m61.py mmq_cr72.py mp05.py tap03.py tp02.py tsmfk01.py