Author: bugman
Date: Fri Jun 27 18:32:30 2014
New Revision: 24357
URL: http://svn.gna.org/viewcvs/relax?rev=24357&view=rev
Log:
Removal of a tonne of unused imports in the lib.dispersion package.
These were identified using the command "pylint * --disable=all
--enable=unused-import".
Modified:
branches/disp_spin_speed/lib/dispersion/b14.py
branches/disp_spin_speed/lib/dispersion/cr72.py
branches/disp_spin_speed/lib/dispersion/dpl94.py
branches/disp_spin_speed/lib/dispersion/it99.py
branches/disp_spin_speed/lib/dispersion/lm63.py
branches/disp_spin_speed/lib/dispersion/lm63_3site.py
branches/disp_spin_speed/lib/dispersion/m61.py
branches/disp_spin_speed/lib/dispersion/m61b.py
branches/disp_spin_speed/lib/dispersion/matrix_exponential.py
branches/disp_spin_speed/lib/dispersion/matrix_power.py
branches/disp_spin_speed/lib/dispersion/mp05.py
branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py
branches/disp_spin_speed/lib/dispersion/ns_matrices.py
branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py
branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py
branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py
branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py
branches/disp_spin_speed/lib/dispersion/tap03.py
branches/disp_spin_speed/lib/dispersion/tp02.py
branches/disp_spin_speed/lib/dispersion/tsmfk01.py
Modified: branches/disp_spin_speed/lib/dispersion/b14.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/b14.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/b14.py (original)
+++ branches/disp_spin_speed/lib/dispersion/b14.py Fri Jun 27 18:32:30
2014
@@ -110,7 +110,7 @@
"""
# Python module imports.
-from numpy import any, arccosh, arctan2, array, cos, cosh, fabs, isfinite,
log, max, min, power, sin, sinh, sqrt, sum
+from numpy import any, arccosh, arctan2, cos, cosh, fabs, isfinite, log,
max, min, power, sin, sinh, sqrt, sum
from numpy.ma import fix_invalid, masked_greater_equal, masked_where
# Repetitive calculations (to speed up calculations).
Modified: branches/disp_spin_speed/lib/dispersion/cr72.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/cr72.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/cr72.py (original)
+++ branches/disp_spin_speed/lib/dispersion/cr72.py Fri Jun 27 18:32:30
2014
@@ -93,8 +93,8 @@
"""
# Python module imports.
-from numpy import arccosh, array, cos, cosh, isfinite, fabs, min, max,
multiply, sqrt, subtract, sum
-from numpy.ma import fix_invalid, masked_greater_equal, masked_less,
masked_where
+from numpy import arccosh, cos, cosh, isfinite, fabs, min, max, multiply,
sqrt, subtract, sum
+from numpy.ma import fix_invalid, masked_greater_equal, masked_where
# Repetitive calculations (to speed up calculations).
eta_scale = 2.0**(-3.0/2.0)
Modified: branches/disp_spin_speed/lib/dispersion/dpl94.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/dpl94.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/dpl94.py (original)
+++ branches/disp_spin_speed/lib/dispersion/dpl94.py Fri Jun 27 18:32:30
2014
@@ -64,7 +64,7 @@
"""
# Python module imports.
-from numpy import abs, any, array, cos, isfinite, min, sin, sum
+from numpy import any, cos, isfinite, min, sin, sum
from numpy.ma import fix_invalid, masked_where
def r1rho_DPL94(r1rho_prime=None, phi_ex=None, kex=None, theta=None, R1=0.0,
spin_lock_fields2=None, back_calc=None):
Modified: branches/disp_spin_speed/lib/dispersion/it99.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/it99.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/it99.py (original)
+++ branches/disp_spin_speed/lib/dispersion/it99.py Fri Jun 27 18:32:30
2014
@@ -74,7 +74,7 @@
"""
# Python module imports.
-from numpy import array, isfinite, fabs, sqrt, sum
+from numpy import isfinite, fabs, sqrt, sum
from numpy.ma import fix_invalid, masked_where
@@ -117,9 +117,7 @@
pB = 1.0 - pA
# Repetitive calculations (to speed up calculations).
- dw2 = dw**2
- tex2 = tex**2
- padw2 = pA * dw2
+ padw2 = pA * dw**2
pa2dw4 = padw2**2
# The numerator.
@@ -130,7 +128,7 @@
# Denominator.
omega_a2 = sqrt(omega_1eff4 + pa2dw4)
- denom = 1.0 + omega_a2 * tex2
+ denom = 1.0 + omega_a2 * tex**2
# R2eff calculation.
back_calc[:] = r20 + numer / denom
@@ -144,4 +142,4 @@
# +/- inf (infinity) and nan (not a number).
if not isfinite(sum(back_calc)):
# Replaces nan, inf, etc. with fill value.
- fix_invalid(back_calc, copy=False, fill_value=1e100)
+ fix_invalid(back_calc, copy=False, fill_value=1e100)
Modified: branches/disp_spin_speed/lib/dispersion/lm63.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/lm63.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/lm63.py (original)
+++ branches/disp_spin_speed/lib/dispersion/lm63.py Fri Jun 27 18:32:30
2014
@@ -65,7 +65,7 @@
"""
# Python module imports.
-from numpy import any, array, isfinite, min, sum, tanh
+from numpy import isfinite, min, sum, tanh
from numpy.ma import fix_invalid, masked_where
def r2eff_LM63(r20=None, phi_ex=None, kex=None, cpmg_frqs=None,
back_calc=None):
@@ -116,4 +116,4 @@
# +/- inf (infinity) and nan (not a number).
if not isfinite(sum(back_calc)):
# Replaces nan, inf, etc. with fill value.
- fix_invalid(back_calc, copy=False, fill_value=1e100)
+ fix_invalid(back_calc, copy=False, fill_value=1e100)
Modified: branches/disp_spin_speed/lib/dispersion/lm63_3site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/lm63_3site.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/lm63_3site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/lm63_3site.py Fri Jun 27
18:32:30 2014
@@ -65,7 +65,7 @@
"""
# Python module imports.
-from numpy import any, fabs, min, tanh, isfinite, sum
+from numpy import fabs, min, tanh, isfinite, sum
from numpy.ma import fix_invalid, masked_where
@@ -145,4 +145,4 @@
# +/- inf (infinity) and nan (not a number).
if not isfinite(sum(back_calc)):
# Replaces nan, inf, etc. with fill value.
- fix_invalid(back_calc, copy=False, fill_value=1e100)
+ fix_invalid(back_calc, copy=False, fill_value=1e100)
Modified: branches/disp_spin_speed/lib/dispersion/m61.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/m61.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/m61.py (original)
+++ branches/disp_spin_speed/lib/dispersion/m61.py Fri Jun 27 18:32:30
2014
@@ -65,7 +65,7 @@
"""
# Python module imports.
-from numpy import abs, any, array, isfinite, min, sum
+from numpy import any, isfinite, min, sum
from numpy.ma import fix_invalid, masked_where
def r1rho_M61(r1rho_prime=None, phi_ex=None, kex=None,
spin_lock_fields2=None, back_calc=None):
@@ -128,4 +128,4 @@
# +/- inf (infinity) and nan (not a number).
if not isfinite(sum(back_calc)):
# Replaces nan, inf, etc. with fill value.
- fix_invalid(back_calc, copy=False, fill_value=1e100)
+ fix_invalid(back_calc, copy=False, fill_value=1e100)
Modified: branches/disp_spin_speed/lib/dispersion/m61b.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/m61b.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/m61b.py (original)
+++ branches/disp_spin_speed/lib/dispersion/m61b.py Fri Jun 27 18:32:30
2014
@@ -61,7 +61,7 @@
"""
# Python module imports.
-from numpy import abs, any, array, isfinite, min, sum
+from numpy import any, isfinite, min, sum
from numpy.ma import fix_invalid, masked_where
def r1rho_M61b(r1rho_prime=None, pA=None, dw=None, kex=None,
spin_lock_fields2=None, back_calc=None):
@@ -130,4 +130,4 @@
# +/- inf (infinity) and nan (not a number).
if not isfinite(sum(back_calc)):
# Replaces nan, inf, etc. with fill value.
- fix_invalid(back_calc, copy=False, fill_value=1e100)
+ fix_invalid(back_calc, copy=False, fill_value=1e100)
Modified: branches/disp_spin_speed/lib/dispersion/matrix_exponential.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/matrix_exponential.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/matrix_exponential.py
(original)
+++ branches/disp_spin_speed/lib/dispersion/matrix_exponential.py Fri
Jun 27 18:32:30 2014
@@ -23,12 +23,9 @@
"""Module for the calculation of the matrix exponential, for higher
dimensional data."""
# Python module imports.
-from numpy import array, any, dot, einsum, eye, exp, iscomplex, int16,
float64, newaxis, multiply, tile, sqrt, zeros
+from numpy import array, any, dot, einsum, eye, exp, iscomplex, int16,
newaxis, multiply, tile, sqrt, zeros
from numpy.lib.stride_tricks import as_strided
from numpy.linalg import eig, inv
-
-# relax module imports.
-from lib.check_types import is_complex
def create_index_rank_NS_NM_NO_ND_x_x(data):
Modified: branches/disp_spin_speed/lib/dispersion/matrix_power.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/matrix_power.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/matrix_power.py (original)
+++ branches/disp_spin_speed/lib/dispersion/matrix_power.py Fri Jun 27
18:32:30 2014
@@ -24,7 +24,7 @@
# Python module imports.
from numpy.lib.stride_tricks import as_strided
-from numpy import arange, array, asarray, float64, int16, sum, zeros
+from numpy import float64, int16, zeros
from numpy.linalg import matrix_power
Modified: branches/disp_spin_speed/lib/dispersion/mp05.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/mp05.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/mp05.py (original)
+++ branches/disp_spin_speed/lib/dispersion/mp05.py Fri Jun 27 18:32:30
2014
@@ -61,7 +61,7 @@
"""
# Python module imports.
-from numpy import abs, arctan2, array, isfinite, min, sin, sum
+from numpy import arctan2, isfinite, min, sin, sum
from numpy.ma import fix_invalid, masked_where
Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py Fri Jun 27
18:32:30 2014
@@ -55,7 +55,7 @@
"""
# Python module imports.
-from numpy import array, dot, fabs, float64, einsum, isfinite, log, min,
multiply, rollaxis, sum, tile
+from numpy import array, dot, fabs, float64, einsum, isfinite, log, min,
multiply, rollaxis, sum
from numpy.linalg import matrix_power
from numpy.ma import fix_invalid, masked_where
Modified: branches/disp_spin_speed/lib/dispersion/ns_matrices.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_matrices.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_matrices.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_matrices.py Fri Jun 27
18:32:30 2014
@@ -32,7 +32,7 @@
# Python module imports.
from math import cos, sin, pi
-from numpy import add, array, conj, complex64, float64, matrix, multiply
+from numpy import array, float64, matrix
def r180x_2d(flip=pi):
Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py Fri Jun 27
18:32:30 2014
@@ -51,7 +51,7 @@
# Python module imports.
from math import floor
-from numpy import array, conj, complex64, dot, einsum, float64, log,
multiply, sum
+from numpy import array, conj, complex64, dot, einsum, float64, log, multiply
from numpy.linalg import matrix_power
# relax module imports.
Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py Fri Jun 27
18:32:30 2014
@@ -57,7 +57,7 @@
# Python module imports.
from math import floor
-from numpy import array, conj, dot, einsum, float64, log, multiply, sum
+from numpy import array, conj, dot, einsum, float64, log, multiply
from numpy.linalg import matrix_power
# relax module imports.
Modified: branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py Fri Jun 27
18:32:30 2014
@@ -50,7 +50,7 @@
"""
# Python module imports.
-from numpy import array, einsum, float64, isfinite, log, min, multiply, sin,
sum
+from numpy import array, einsum, float64, isfinite, log, min, multiply, sum
from numpy.ma import fix_invalid, masked_less
# relax module imports.
Modified: branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py Fri Jun 27
18:32:30 2014
@@ -56,7 +56,7 @@
"""
# Python module imports.
-from numpy import array, einsum, float64, isfinite, log, min, multiply, sin,
sum
+from numpy import array, einsum, float64, isfinite, log, min, multiply, sum
from numpy.ma import fix_invalid, masked_less
# relax module imports.
Modified: branches/disp_spin_speed/lib/dispersion/tap03.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/tap03.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/tap03.py (original)
+++ branches/disp_spin_speed/lib/dispersion/tap03.py Fri Jun 27 18:32:30
2014
@@ -61,7 +61,7 @@
"""
# Python module imports.
-from numpy import any, arctan2, array, isfinite, min, sin, sqrt, sum
+from numpy import any, arctan2, isfinite, min, sin, sqrt, sum
from numpy.ma import fix_invalid, masked_where
Modified: branches/disp_spin_speed/lib/dispersion/tp02.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/tp02.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/tp02.py (original)
+++ branches/disp_spin_speed/lib/dispersion/tp02.py Fri Jun 27 18:32:30
2014
@@ -61,7 +61,7 @@
"""
# Python module imports.
-from numpy import abs, arctan2, array, isfinite, min, sin, sum
+from numpy import arctan2, isfinite, min, sin, sum
from numpy.ma import fix_invalid, masked_where
Modified: branches/disp_spin_speed/lib/dispersion/tsmfk01.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/tsmfk01.py?rev=24357&r1=24356&r2=24357&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/tsmfk01.py (original)
+++ branches/disp_spin_speed/lib/dispersion/tsmfk01.py Fri Jun 27 18:32:30
2014
@@ -66,7 +66,7 @@
"""
# Python module imports.
-from numpy import array, fabs, min, sin, isfinite, sum
+from numpy import fabs, min, sin, isfinite, sum
from numpy.ma import fix_invalid, masked_where
r24357 - /branches/disp_spin_speed/lib/dispersion/