Changeset 2427 for trunk

Timestamp:

03/08/12 16:57:56 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-3758)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: interactive test with

Put in Release Notes: No

Module(s): sdbaseline, sdfit, sdstat

Description:

Interactivemask module looks for the number of channels in the first
IF to create mask instead of the number recorded in scantable header.
Changed minimum number of channels required from 2 to 1 in
scantable.get_masklist, scantable.get_mask_indices,
Scantable::getMaskRangeList, and Scantable::getMaskEdgeIndices,
because it is not mandatory to have multiple channels in these functions.

Location:

trunk

Files:

• python/interactivemask.py (modified) (2 diffs)
• python/scantable.py (modified) (2 diffs)
• src/Scantable.cpp (modified) (2 diffs)

trunk/python/interactivemask.py

@@ -55 +55 @@
             raise TypeError(msg)
 
-        self.mask = _n_bools(self.scan.nchan(),True)
+        self.mask = _n_bools(self.scan.nchan(self.scan.getif(0)),True)
         self.callback = None
         self.event = None
@@ -92 +92 @@
             self.mask = self.scan.create_mask(masklist,invert=invert)
         elif invert == True:
-            self.mask = _n_bools(self.scan.nchan(),False)
-        else:
-            self.mask = _n_bools(self.scan.nchan(),True)
+            self.mask = _n_bools(self.scan.nchan(self.scan.getif(0)),False)
+        else:
+            self.mask = _n_bools(self.scan.nchan(self.scan.getif(0)),True)
 
 

trunk/python/scantable.py

@@ -1426 +1426 @@
         if not (isinstance(mask,list) or isinstance(mask, tuple)):
             raise TypeError("The mask should be list or tuple.")
-        if len(mask) < 2:
-            raise TypeError("The mask elements should be > 1")
+        if len(mask) <= 0:
+            raise TypeError("The mask elements should be > 0")
         data = self._getabcissa(row)
         if len(data) != len(mask):
@@ -1467 +1467 @@
         if not (isinstance(mask,list) or isinstance(mask, tuple)):
             raise TypeError("The mask should be list or tuple.")
-        if len(mask) < 2:
-            raise TypeError("The mask elements should be > 1")
+        if len(mask) <= 0:
+            raise TypeError("The mask elements should be > 0")
         istart = []
         iend = []

trunk/src/Scantable.cpp

@@ -3550 +3550 @@
 std::string Scantable::getMaskRangeList(const std::vector<bool>& mask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, bool verbose)
 {
-  if (mask.size() < 2) {
-    throw(AipsError("The mask elements should be > 1"));
+  if (mask.size() <= 0) {
+    throw(AipsError("The mask elements should be > 0"));
   }
   int IF = getIF(whichrow);
@@ -3584 +3584 @@
 std::vector<int> Scantable::getMaskEdgeIndices(const std::vector<bool>& mask)
 {
-  if (mask.size() < 2) {
-    throw(AipsError("The mask elements should be > 1"));
+  if (mask.size() <= 0) {
+    throw(AipsError("The mask elements should be > 0"));
   }