Changeset 1707 for branches/alma

Timestamp:

02/19/10 20:30:37 (14 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes (CAS-1807)

Ready to Release: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sdflag

Description: added Scantable::getClipMask() and Scantable::srchChannelsToClip().

Location:

branches/alma/src

Files:

• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

branches/alma/src/Scantable.cpp

@@ -706 +706 @@
 {
   for (uInt i=0; i<table_.nrow(); ++i) {
-    Vector<Float> spcs = specCol_(i);
     Vector<uChar> flgs = flagsCol_(i);
+    srchChannelsToClip(i, uthres, dthres, clipoutside, unflag, flgs);
+    flagsCol_.put(i, flgs);
+  }
+}
+
+std::vector<bool> Scantable::getClipMask(int whichrow, const Float uthres, const Float dthres, bool clipoutside, bool unflag)
+{
+  Vector<uChar> flags;
+  flagsCol_.get(uInt(whichrow), flags);
+  srchChannelsToClip(uInt(whichrow), uthres, dthres, clipoutside, unflag, flags);
+  Vector<Bool> bflag(flags.shape());
+  convertArray(bflag, flags);
+  //bflag = !bflag;
+
+  std::vector<bool> mask;
+  bflag.tovector(mask);
+  return mask;
+}
+
+void Scantable::srchChannelsToClip(uInt whichrow, const Float uthres, const Float dthres, bool clipoutside, bool unflag,
+                                   Vector<uChar> flgs)
+{
+    Vector<Float> spcs = specCol_(whichrow);
     uInt nchannel = nchan();
     if (spcs.nelements() != nchannel) {
@@ -731 +753 @@
       }
     }
-    flagsCol_.put(i, flgs);
-  }
 }
 

branches/alma/src/Scantable.h

@@ -250 +250 @@
 
   /**
+   * Return a list of booleans with the size of nchan for a specified row, to get info 
+   * about which channel is clipped.
+   */
+  std::vector<bool> getClipMask(int whichrow, const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag);
+  void srchChannelsToClip(casa::uInt whichrow, const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag, 
+                          casa::Vector<casa::uChar> flgs);
+
+  /**
    * Return a list of row numbers with respect to the original table.
    * @return a list of unsigned ints

branches/alma/src/ScantableWrapper.h

@@ -117 +117 @@
     { table_->clip(uthres, dthres, clipoutside, unflag); }
 
+  std::vector<bool> getClipMask(int whichrow, const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag) const
+    { return table_->getClipMask(whichrow, uthres, dthres, clipoutside, unflag); }
+
   std::string getSourceName(int whichrow=0) const
     { return table_->getSourceName(whichrow); }

branches/alma/src/python_Scantable.cpp

@@ -88 +88 @@
     .def("_getmask", &ScantableWrapper::getMask,
          (boost::python::arg("whichrow")=0) )
+    .def("_getclipmask", &ScantableWrapper::getClipMask,
+         (boost::python::arg("whichrow")=0) )
     .def("_gettsys", &ScantableWrapper::getTsys)
     .def("_getsourcename", &ScantableWrapper::getSourceName,