r25967 - /trunk/auto_analyses/relax_disp_repeat_cpmg.py -- September 23, 2014 - 13:59

Author: bugman
Date: Tue Sep 23 13:59:05 2014
New Revision: 25967

URL: http://svn.gna.org/viewcvs/relax?rev=25967&view=rev
Log:
Dependency fix for the auto_analyses.relax_disp_repeat_cpmg module.

This was causing relax to fail.  SciPy is an optional dependence for relax, 
but this module caused
relax to not start if scipy was not installed.  This was detected by testing 
relax with PyPy.


Modified:
    trunk/auto_analyses/relax_disp_repeat_cpmg.py

Modified: trunk/auto_analyses/relax_disp_repeat_cpmg.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp_repeat_cpmg.py?rev=25967&r1=25966&r2=25967&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp_repeat_cpmg.py       (original)
+++ trunk/auto_analyses/relax_disp_repeat_cpmg.py       Tue Sep 23 13:59:05 
2014
@@ -25,6 +25,9 @@
 U{task #7826<https://gna.org/task/index.php?78266>}, Write an python class 
for the repeated analysis of dispersion data.
 """
 
+# Dependencies.
+import dep_check
+
 # Python module imports.
 from copy import deepcopy
 from collections import OrderedDict
@@ -32,7 +35,8 @@
 from glob import glob
 from os import F_OK, access, getcwd, sep
 from numpy import asarray, arange, concatenate, max, mean, min, sqrt, std, 
sum
-from scipy.stats import pearsonr
+if dep_check.scipy_module:
+    from scipy.stats import pearsonr
 import sys
 from warnings import warn