Changeset 1400 for branches/alma

Timestamp:

12/15/07 10:45:37 (16 years ago)

Author:

TakTsutsumi

Message:

added unflag parameter to flag function

Location:

branches/alma/src

Files:

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

branches/alma/src/MathUtils.cpp

@@ -35 +35 @@
 #include <casa/Arrays/MaskedArray.h>
 #include <casa/Arrays/MaskArrMath.h>
-#include <casa/Arrays/VectorSTLIterator.h>
 #include <casa/BasicSL/String.h>
 #include <scimath/Mathematics/MedianSlider.h>
@@ -85 +84 @@
 {
   std::vector<std::string> out;
-  VectorSTLIterator<String> it(in);
+  Vector<String>::const_iterator it = in.begin();
   for (uInt i=0; it != in.end(); ++it,++i) {
     out.push_back(*it);

branches/alma/src/Scantable.cpp

@@ -617 +617 @@
 }
 
-void Scantable::flag(const std::vector<bool>& msk)
+void Scantable::flag(const std::vector<bool>& msk, bool unflag)
 {
   std::vector<bool>::const_iterator it;
@@ -630 +630 @@
   if ( msk.size() == 0 ) {
     uChar userflag = 1 << 7;
+    if ( unflag ) {
+      userflag = 0 << 7;
+    }
     for ( uInt i=0; i<table_.nrow(); ++i) {
       Vector<uChar> flgs = flagsCol_(i);
@@ -649 +652 @@
     uInt j = 0;
     uChar userflag = 1 << 7;
+    if ( unflag ) {
+      userflag = 0 << 7;
+    }
     for (it = msk.begin(); it != msk.end(); ++it) {
       if ( *it ) {

branches/alma/src/Scantable.h

@@ -223 +223 @@
    * to be flagged
    */
-  void flag( const std::vector<bool>& msk = std::vector<bool>());
+  //void flag( const std::vector<bool>& msk = std::vector<bool>());
+  void flag( const std::vector<bool>& msk = std::vector<bool>(), bool unflag=false);
 
   /**

branches/alma/src/ScantableWrapper.h

@@ -101 +101 @@
     { return table_->getMask(whichrow); }
 
+  /**
   void flag(const std::vector<bool>& msk=std::vector<bool>())
     { table_->flag(msk); }
+  **/
+  void flag(const std::vector<bool>& msk=std::vector<bool>(), bool unflag=false)
+    { table_->flag(msk, unflag); }
 
   std::string getSourceName(int whichrow=0) const