r12145 - /1.3/maths_fns/frame_order_matrix_ops.py -- January 04, 2011 - 14:35

Author: bugman
Date: Tue Jan  4 14:35:29 2011
New Revision: 12145

URL: http://svn.gna.org/viewcvs/relax?rev=12145&view=rev
Log:
relax will now run without the scipy module installed, however the frame 
order analysis is not usable.


Modified:
    1.3/maths_fns/frame_order_matrix_ops.py

Modified: 1.3/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/frame_order_matrix_ops.py?rev=12145&r1=12144&r2=12145&view=diff
==============================================================================
--- 1.3/maths_fns/frame_order_matrix_ops.py (original)
+++ 1.3/maths_fns/frame_order_matrix_ops.py Tue Jan  4 14:35:29 2011
@@ -23,11 +23,15 @@
 # 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 cross, dot, sinc, transpose
 from numpy.linalg import norm
-from scipy.integrate import quad
+if dep_check.scipy_module:
+    from scipy.integrate import quad
 
 # relax module imports.
 from float import isNaN