Changeset 1134 for trunk/python/__init__.py

Timestamp:

08/14/06 14:13:10 (18 years ago)

Author:

mar637

Message:

added numpy/numarray detection

File:

• trunk/python/__init__.py (modified) (3 diffs)

trunk/python/__init__.py

@@ -319 +319 @@
     return
 
+try:
+    import numpy.core as NUM
+except ImportError:
+    try:
+        import numarray as NUM
+    except ImportError:
+        raise ImportError("You need to have numpy or numarray installed")
+
 from asapfitter import fitter
 from asapreader import reader
@@ -326 +334 @@
 from scantable import scantable
 from asaplinefind import linefinder
-#from asapfit import *
-
-from numarray import logical_and as mask_and
-from numarray import logical_or as mask_or
-from numarray import logical_not as mask_not
+from linecatalog import linecatalog
+
+mask_and = NUM.logical_and
+mask_or = NUM.logical_or
+mask_not = NUM.logical_not
 
 if rcParams['useplotter']:
@@ -337 +345 @@
     plotter = asapplotter(gui)
     del gui
-
 
 __date__ = '$Date$'.split()[1]