r20270 - /branches/relax_disp/lib/dispersion/ns_2site_star.py -- July 11, 2013 - 15:49

Author: bugman
Date: Thu Jul 11 15:49:21 2013
New Revision: 20270

URL: http://svn.gna.org/viewcvs/relax?rev=20270&view=rev
Log:
Made the lib.dispersion.ns_2site_star module importable in the absence of 
Scipy.


Modified:
    branches/relax_disp/lib/dispersion/ns_2site_star.py

Modified: branches/relax_disp/lib/dispersion/ns_2site_star.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/ns_2site_star.py?rev=20270&r1=20269&r2=20270&view=diff
==============================================================================
--- branches/relax_disp/lib/dispersion/ns_2site_star.py (original)
+++ branches/relax_disp/lib/dispersion/ns_2site_star.py Thu Jul 11 15:49:21 
2013
@@ -28,10 +28,14 @@
 The code was submitted at 
http://thread.gmane.org/gmane.science.nmr.relax.devel/4132 by Paul Schanda.
 """
 
+# Dependency check module.
+import dep_check
+
 # Python module imports.
 from math import log
 from numpy import conj, dot, matrix
-from scipy.linalg import expm
+if dep_check.scipy_module:
+    from scipy.linalg import expm
 
 
 def r2eff_ns_2site_star(R2E=None, R2G=None, fg=None, kge=None, keg=None, 
tcpmg=None, cpmg_frqs=None, back_calc=None, num_points=None):