Changeset 1295 for trunk/python/scantable.py

Timestamp:

11/06/06 22:22:03 (18 years ago)

Author:

mar637

Message:

merge form Release2.1.1 branch

File:

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

trunk/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):
@@ -345 +345 @@
             print "--------------------------------------------------"
             print out
-            return
-        else:
-            retval = { 'axesnames': ['scanno', 'beamno', 'ifno', 'polno', 'cycleno'],
-                       'axes' : axes,
-                       'data': statvals}
-            return retval
+        #else:
+            #retval = { 'axesnames': ['scanno', 'beamno', 'ifno', 'polno', 'cycleno'],
+            #           'axes' : axes,
+            #           'data': statvals}
+        return statvals
 
     def stddev(self, mask=None):
@@ -721 +720 @@
             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 +730 @@
             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 +1201 @@
         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: