Changeset 1283 for tags/Release2.1.1b/python/scantable.py

Timestamp:

11/06/06 12:10:26 (18 years ago)

Author:

mar637

Message:

Fix for Ticket #88 - removed use of numpy/numarray except for plotting where it is used via matplotlib.numerix

File:

• tags/Release2.1.1b/python/scantable.py (modified) (4 diffs)

tags/Release2.1.1b/python/scantable.py

@@ -4 +4 @@
 from asap import asaplog
 from asap import selector
-from asap import NUM
 from asap import linecatalog
+from asap import _n_bools, mask_not, mask_and, mask_or
 
 class scantable(Scantable):
@@ -721 +721 @@
             asaplog.push(msg)
         n = self.nchan()
-        msk = NUM.zeros(n)
+        msk = _n_bools(n, False)
         # test if args is a 'list' or a 'normal *args - UGLY!!!
 
@@ -731 +731 @@
             for i in range(n):
                 if data[i] >= window[0] and data[i] <= window[1]:
-                    msk[i] = 1
+                    msk[i] = True
         if kwargs.has_key('invert'):
             if kwargs.get('invert'):
-                msk = NUM.logical_not(msk)
+                msk = mask_not(msk)
         print_log()
         return msk
@@ -1202 +1202 @@
         varlist = vars()
         if mask is None:
-            mask = list(NUM.ones(self.nchan(-1)))
+            mask = [True for i in xrange(self.nchan(-1))]
         from asap.asapfitter import fitter
         try: