Changeset 1134

Timestamp:

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

Author:

mar637

Message:

added numpy/numarray detection

Location:

trunk/python

Files:

• __init__.py (modified) (3 diffs)
• asapfitter.py (modified) (4 diffs)
• scantable.py (modified) (4 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]

trunk/python/asapfitter.py

@@ -2 +2 @@
 from asap import rcParams
 from asap import print_log
+from asap import NUM
 
 class fitter:
@@ -41 +42 @@
         self.y = ydat
         if mask == None:
-            from numarray import ones
-            self.mask = ones(len(xdat))
+            self.mask = NUM.ones(len(xdat))
         else:
             self.mask = mask
@@ -65 +65 @@
         self.mask = None
         if mask is None:
-            from numarray import ones
-            self.mask = ones(self.data.nchan())
+            self.mask = NUM.ones(self.data.nchan())
         else:
             self.mask = mask
@@ -202 +201 @@
         if self.fitfunc == "gauss" and component is not None:
             if not self.fitted and sum(self.fitter.getparameters()) == 0:
-                from numarray import zeros
-                pars = list(zeros(len(self.components)*3))
-                fxd = list(zeros(len(pars)))
+                pars = list(NUM.zeros(len(self.components)*3))
+                fxd = list(NUM.zeros(len(pars)))
             else:
                 pars = list(self.fitter.getparameters())

trunk/python/scantable.py

@@ -4 +4 @@
 from asap import asaplog
 from asap import selector
-from numarray import ones
-from numarray import zeros
+from asap import NUM
 
 class scantable(Scantable):
@@ -666 +665 @@
             asaplog.push(msg)
         n = self.nchan()
-        msk = zeros(n)
+        msk = NUM.zeros(n)
         # test if args is a 'list' or a 'normal *args - UGLY!!!
 
@@ -679 +678 @@
         if kwargs.has_key('invert'):
             if kwargs.get('invert'):
-                from numarray import logical_not
-                msk = logical_not(msk)
+                msk = NUM.logical_not(msk)
         print_log()
         return msk
@@ -1093 +1091 @@
         varlist = vars()
         if mask is None:
-            mask = list(ones(self.nchan(-1)))
+            mask = list(NUM.ones(self.nchan(-1)))
         from asap.asapfitter import fitter
         f = fitter()