Author: bugman
Date: Wed Apr 16 11:45:17 2014
New Revision: 22786
URL: http://svn.gna.org/viewcvs/relax?rev=22786&view=rev
Log:
Removed the dependence on the relax 'dep_check' module from the
lib.frame_order package.
This is for more independence of the relax library.
Modified:
trunk/lib/frame_order/double_rotor.py
trunk/lib/frame_order/iso_cone.py
trunk/lib/frame_order/iso_cone_torsionless.py
trunk/lib/frame_order/pseudo_ellipse.py
trunk/lib/frame_order/pseudo_ellipse_free_rotor.py
trunk/lib/frame_order/pseudo_ellipse_torsionless.py
trunk/lib/frame_order/rotor.py
Modified: trunk/lib/frame_order/double_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/double_rotor.py?rev=22786&r1=22785&r2=22786&view=diff
==============================================================================
--- trunk/lib/frame_order/double_rotor.py (original)
+++ trunk/lib/frame_order/double_rotor.py Wed Apr 16 11:45:17 2014
@@ -21,9 +21,6 @@
# Module docstring.
"""Module for the double rotor frame order model."""
-
-# Dependency check module.
-import dep_check
# Python module imports.
from math import cos, pi, sin, sqrt
Modified: trunk/lib/frame_order/iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/iso_cone.py?rev=22786&r1=22785&r2=22786&view=diff
==============================================================================
--- trunk/lib/frame_order/iso_cone.py (original)
+++ trunk/lib/frame_order/iso_cone.py Wed Apr 16 11:45:17 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2013 Edward d'Auvergne
#
+# Copyright (C) 2009-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -22,14 +22,13 @@
# Module docstring.
"""Module for the handling of Frame Order."""
-# Dependency check module.
-import dep_check
-
# Python module imports.
from math import cos, pi, sqrt
from numpy import sinc
-if dep_check.scipy_module:
+try:
from scipy.integrate import tplquad
+except ImportError:
+ pass
# relax module imports.
from lib.frame_order.matrix_ops import pcs_pivot_motion_full,
pcs_pivot_motion_full_qrint, rotate_daeg
Modified: trunk/lib/frame_order/iso_cone_torsionless.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/iso_cone_torsionless.py?rev=22786&r1=22785&r2=22786&view=diff
==============================================================================
--- trunk/lib/frame_order/iso_cone_torsionless.py (original)
+++ trunk/lib/frame_order/iso_cone_torsionless.py Wed Apr 16 11:45:17
2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2013 Edward d'Auvergne
#
+# Copyright (C) 2009-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -22,13 +22,12 @@
# Module docstring.
"""Module for the handling of Frame Order."""
-# Dependency check module.
-import dep_check
-
# Python module imports.
from math import cos, pi, sqrt
-if dep_check.scipy_module:
+try:
from scipy.integrate import dblquad
+except ImportError:
+ pass
# relax module imports.
from lib.frame_order.matrix_ops import pcs_pivot_motion_torsionless,
pcs_pivot_motion_torsionless_qrint, rotate_daeg
Modified: trunk/lib/frame_order/pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/pseudo_ellipse.py?rev=22786&r1=22785&r2=22786&view=diff
==============================================================================
--- trunk/lib/frame_order/pseudo_ellipse.py (original)
+++ trunk/lib/frame_order/pseudo_ellipse.py Wed Apr 16 11:45:17 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2013 Edward d'Auvergne
#
+# Copyright (C) 2009-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -22,14 +22,13 @@
# Module docstring.
"""Module for the pseudo-ellipse frame order model."""
-# Dependency check module.
-import dep_check
-
# Python module imports.
from math import cos, pi, sin, sqrt
from numpy import sinc
-if dep_check.scipy_module:
+try:
from scipy.integrate import quad, tplquad
+except ImportError:
+ pass
# relax module imports.
from lib.geometry.pec import pec
Modified: trunk/lib/frame_order/pseudo_ellipse_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/pseudo_ellipse_free_rotor.py?rev=22786&r1=22785&r2=22786&view=diff
==============================================================================
--- trunk/lib/frame_order/pseudo_ellipse_free_rotor.py (original)
+++ trunk/lib/frame_order/pseudo_ellipse_free_rotor.py Wed Apr 16 11:45:17
2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2013 Edward d'Auvergne
#
+# Copyright (C) 2009-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -22,13 +22,12 @@
# Module docstring.
"""Module for the handling of Frame Order."""
-# Dependency check module.
-import dep_check
-
# Python module imports.
from math import cos, pi, sin
-if dep_check.scipy_module:
+try:
from scipy.integrate import quad
+except ImportError:
+ pass
# relax module imports.
from lib.geometry.pec import pec
Modified: trunk/lib/frame_order/pseudo_ellipse_torsionless.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/pseudo_ellipse_torsionless.py?rev=22786&r1=22785&r2=22786&view=diff
==============================================================================
--- trunk/lib/frame_order/pseudo_ellipse_torsionless.py (original)
+++ trunk/lib/frame_order/pseudo_ellipse_torsionless.py Wed Apr 16 11:45:17
2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2013 Edward d'Auvergne
#
+# Copyright (C) 2009-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -22,13 +22,12 @@
# Module docstring.
"""Module for the handling of Frame Order."""
-# Dependency check module.
-import dep_check
-
# Python module imports.
from math import cos, pi, sin, sqrt
-if dep_check.scipy_module:
+try:
from scipy.integrate import dblquad, quad
+except ImportError:
+ pass
# relax module imports.
from lib.geometry.pec import pec
Modified: trunk/lib/frame_order/rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/rotor.py?rev=22786&r1=22785&r2=22786&view=diff
==============================================================================
--- trunk/lib/frame_order/rotor.py (original)
+++ trunk/lib/frame_order/rotor.py Wed Apr 16 11:45:17 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2013 Edward d'Auvergne
#
+# Copyright (C) 2009-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -22,15 +22,14 @@
# Module docstring.
"""Module for the handling of Frame Order."""
-# Dependency check module.
-import dep_check
-
# Python module imports.
from math import cos, pi, sin, sqrt
from numpy import dot, inner, sinc, transpose
from numpy.linalg import norm
-if dep_check.scipy_module:
+try:
from scipy.integrate import quad
+except ImportError:
+ pass
# relax module imports.
from lib.frame_order.matrix_ops import rotate_daeg
r22786 - /trunk/lib/frame_order/