Changeset 189

Timestamp:

01/11/05 12:32:02 (19 years ago)

Author:

mar637

Message:

* empty log message *

File:

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

trunk/python/scantable.py

@@ -1 +1 @@
 from asap._asap import sdtable
-from numarray import ones
+from numarray import ones,zeros
 import sys
 
@@ -386 +386 @@
         """
         Compute and return a mask based on [min,max] windows.
-        The specified windows are to be EXCLUDED, when the mask is
+        The specified windows are to be INCLUDED, when the mask is
         applied.
         Parameters:
@@ -392 +392 @@
                 Pairs of start/end points specifying the regions
                 to be masked
-            invert:     return an inverted mask, i.e. the regions
-                        specified are not masked (INCLUDED)
+            invert:     optional argument. If specified as True,
+                        return an inverted mask, i.e. the regions
+                        specified are EXCLUDED
         Example:
             scan.set_unit('channel')
@@ -399 +400 @@
             a)
             msk = scan.set_mask([400,500],[800,900])
-            # masks the regions between 400 and 500
+            # masks everything outside 400 and 500
             # and 800 and 900 in the unit 'channel'
 
             b)
             msk = scan.set_mask([400,500],[800,900], invert=True)
-            # masks the regions outside 400 and 500
+            # masks the regions between 400 and 500
             # and 800 and 900 in the unit 'channel'
            
@@ -414 +415 @@
         n = self.nchan()
         data = self.getabcissa()
-        msk = ones(n)
+        msk = zeros(n)
         for  window in args:
             if (len(window) != 2 or window[0] > window[1] ):
@@ -421 +422 @@
             for i in range(n):
                 if data[i] >= window[0] and data[i] < window[1]:
-                    msk[i] = 0
+                    msk[i] = 1
         if kwargs.has_key('invert'):
             if kwargs.get('invert'):
@@ -475 +476 @@
 
         validyax = ['spectrum','tsys']
+        from asap.asaplot import ASAPlot
         if not self._p:
-            from asap.asaplot import ASAPlot
             self._p = ASAPlot()
-#            print "Plotting not enabled"
-#            return
+            #print "Plotting not enabled"
+            #return
+        if self._p.is_dead:
+            del self._p
+            self._p = ASAPlot()
         npan = 1
         x = None