r12147 - /1.3/generic_fns/pipes.py -- January 04, 2011 - 14:45

Author: bugman
Date: Tue Jan  4 14:45:49 2011
New Revision: 12147

URL: http://svn.gna.org/viewcvs/relax?rev=12147&view=rev
Log:
The frame order analysis is disabled if scipy is not installed.


Modified:
    1.3/generic_fns/pipes.py

Modified: 1.3/generic_fns/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pipes.py?rev=12147&r1=12146&r2=12147&view=diff
==============================================================================
--- 1.3/generic_fns/pipes.py (original)
+++ 1.3/generic_fns/pipes.py Tue Jan  4 14:45:49 2011
@@ -29,7 +29,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
-from dep_check import C_module_exp_fn
+from dep_check import C_module_exp_fn, scipy_module
 from relax_errors import RelaxError, RelaxNoPipeError, RelaxPipeError
 
 
@@ -94,6 +94,10 @@
     if pipe_type == 'relax_fit' and not C_module_exp_fn:
         raise RelaxError("Relaxation curve fitting is not available.  Try 
compiling the C modules on your platform.")
 
+    # Test that the scipy is installed for the frame order analysis.
+    if pipe_type == 'frame order' and not scipy_module:
+        raise RelaxError("The frame order analysis is not available.  Please 
install the scipy Python package.")
+
     # Add the data pipe.
     ds.add(pipe_name=pipe_name, pipe_type=pipe_type)