Changeset 1134 for trunk/python/scantable.py

Timestamp:

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

Author:

mar637

Message:

added numpy/numarray detection

File:

• trunk/python/scantable.py (modified) (4 diffs)

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()