Changeset 3023 for trunk

Timestamp:

02/09/15 15:48:01 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (Bug fixes)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Added a function Scantable::nValidMask(const std::vector<bool>& mask);

Test Programs:

Put in Release Notes: Yes

Module(s): scantable, sdbaseline

Description:

• Added a new function Scantable::nValidMask(const std::vector<bool>& mask) that returns the number of elements in true in the input bool vector, mask.
• Fixed a bug in Scantable::isAllChannelsFlagged that fails to detect completely flagged channels when BDF flag and the other flag is mixed in a spectrum.
• Fixed a bug in *Baseline functions that caused an error of baseline subtraction in case there is a spectrum of which all channels are flagged.

Location:

trunk/src

Files:

• Scantable.cpp (modified) (10 diffs)
• Scantable.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -2552 +2552 @@
   if (rflag > 0)
     return true;
-  uChar flag;
+  bool flag;
   Vector<uChar> flags;
   flagsCol_.get(whichrow, flags);
-  flag = flags[0];
+  flag = (flags[0]>0);
   for (uInt i = 1; i < flags.size(); ++i) {
-    flag &= flags[i];
+    flag &= (flags[i]>0);
   }
   //  return ((flag >> 7) == 1);
   return (flag > 0);
 }
+
+std::size_t Scantable::nValidMask(const std::vector<bool>& mask)
+{
+  std::size_t nvalid=0;
+  assert(static_cast<std::size_t>(true)==1);
+  assert(static_cast<std::size_t>(false)==0);
+  for (uInt i = 1; i < mask.size(); ++i) {
+    nvalid += static_cast<std::size_t>(mask[i]);
+  }
+  return nvalid;
+}
+
 
 std::vector<std::string> Scantable::applyBaselineTable(const std::string& bltable, const bool returnfitresult, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
@@ -3051 +3063 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -3144 +3157 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -3229 +3243 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //      if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -3322 +3337 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //      if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -3911 +3927 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -4009 +4026 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -4690 +4708 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -4799 +4818 @@
       std::vector<float> params;
 
-      if (flagrowCol_(whichrow) == 0) {
+      //if (flagrowCol_(whichrow) == 0) {
+      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -4976 +4996 @@
                                                   STLineFinder& lineFinder)
 {
+  if (isAllChannelsFlagged(whichrow)) {//all channels flagged
+    std::vector<bool> res_mask(inMask.size(),false);
+    return res_mask;
+  } else if (nValidMask(inMask)==0){ //no valid mask channels
+    std::vector<bool> res_mask(inMask);
+    return res_mask; 
+  }
+
   std::vector<uint> ifNos = getIFNos();
   if ((edge.size() > 2) && (edge.size() < ifNos.size()*2)) {

trunk/src/Scantable.h

@@ -724 +724 @@
 
   std::vector<uint> getNumbers(const casa::ScalarColumn<casa::uInt>& col) const;
+
+  /**
+   * Returns a number of elements with "true" in a bool vector. 
+   * @param[in] mask (boolean vector)
+   * @return the numerb of elements in true
+   */
+  std::size_t nValidMask(const std::vector<bool>& mask);
 
   static const casa::uInt version_ = 4;