Changeset 800 for branches/Release12/src

Timestamp:

01/10/06 15:11:58 (19 years ago)

Author:

mar637

Message:

Request: added channel based flagging

Location:

branches/Release12/src

Files:

• SDMemTable.cc (modified) (2 diffs)
• SDMemTable.h (modified) (1 diff)
• SDMemTableWrapper.h (modified) (1 diff)
• python_SDMemTable.cc (modified) (1 diff)

branches/Release12/src/SDMemTable.cc

@@ -1622 +1622 @@
 }
 */
-void SDMemTable::flag(int whichRow)
+void SDMemTable::flagSpectrum(const std::vector<bool>& flags, int whichRow)
   {
   Array<uChar> arr;
   flagsCol_.get(whichRow, arr);
+
+  std::vector<bool>::const_iterator it = flags.begin();
+  if ( flags.size() != arr.shape()(asap::ChanAxis) )
+    throw(AipsError("Incorrect number of channels in flags"));
 
   ArrayAccessor<uChar, Axis<asap::BeamAxis> > aa0(arr);
@@ -1634 +1638 @@
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
+  uChar userflag = 1 << 7; // user flag bit
   for (ArrayAccessor<uChar, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
-    (*i) = uChar(True);
+    if (*it)
+      (*i) |= userflag;
+    ++it;
   }
 

branches/Release12/src/SDMemTable.h

@@ -182 +182 @@
   virtual void resetCursor();
 
-  // Hard flags the current spectrum, not reversible
-  virtual void flag(int whichRow);
+  // Hard flags the current spectrum, (currently) not reversible
+  virtual void flagSpectrum(const std::vector<bool>& flags, int whichRow);
 
   // return the currently selected values

branches/Release12/src/SDMemTableWrapper.h

@@ -131 +131 @@
   }
 
-  void flag(int whichRow=-1) {
-    table_->flag(whichRow);
-  }
+  void flagSpectrum(const std::vector<bool>& flags, int whichRow=-1) {
+    table_->flagSpectrum(flags, whichRow);
+  }
+
   std::string getSourceName(int whichRow=0) {
     return table_->getSourceName(whichRow);

branches/Release12/src/python_SDMemTable.cc

@@ -101 +101 @@
     .def("_gettime", &SDMemTableWrapper::getTime,
          (boost::python::arg("whichRow")=0) )
-    .def("_flag", &SDMemTableWrapper::flag,
+    .def("_flagspectrum", &SDMemTableWrapper::flagSpectrum,
          (boost::python::arg("whichRow")=-1) )
     .def("_save",  &SDMemTableWrapper::makePersistent)