Changeset 1430 for trunk

Timestamp:

07/11/08 11:55:28 (16 years ago)

Author:

Malte Marquarding

Message:

merged in unflag option from alma branch

Location:

trunk/src

Files:

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

trunk/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 ) {

trunk/src/Scantable.h

@@ -226 +226 @@
    * 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);
 
   /**

trunk/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