Changeset 1994

Timestamp:

02/16/11 14:59:40 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1306)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added row selection parameters to scantable.flag,

ScantableWrapper::flag and Scantable::flag.

Test Programs:

Put in Release Notes: No

Module(s): scantable class

Description:

Enabled a row selection in scantable.flag.

• A parameter 'row' is added to scantable.flag. The default value -1 applies

specified channel flags to the all rows in the scantable (same as previous code).

• A parameter 'whichrow' is also added to ScantableWrapper::flag and

Scantable::flag accordingly.

• The actual flagg application part in the code Scantable::flag is moved to a new

private function Scantable::applyChanFlag(uInt whichrow, vector<bool> msk, uChar flagval).
The function applies flag with a value, 'flagval', to masked channels, 'msk',
in a selected row, 'whichrow'.

Location:

trunk

Files:

• python/scantable.py (modified) (3 diffs)
• src/Scantable.cpp (modified) (3 diffs)
• src/Scantable.h (modified) (2 diffs)
• src/ScantableWrapper.h (modified) (1 diff)

trunk/python/scantable.py

@@ -1014 +1014 @@
 
     @asaplog_post_dec
-    def flag(self, mask=None, unflag=False):
+    def flag(self, row=-1, mask=None, unflag=False):
         """\
         Flag the selected data using an optional channel mask.
@@ -1020 +1020 @@
         Parameters:
 
+            row:    an optional row number in the scantable.
+                      Default -1 flags all rows
+                      
             mask:   an optional channel mask, created with create_mask. Default
                     (no mask) is all channels.
@@ -1028 +1031 @@
         varlist = vars()
         mask = mask or []
-        self._flag(mask, unflag)
+        self._flag(row, mask, unflag)
         self._add_history("flag", varlist)
 

trunk/src/Scantable.cpp

@@ -778 +778 @@
 }
 
-void Scantable::flag(const std::vector<bool>& msk, bool unflag)
-{
+
+void Scantable::flag( int whichrow, const std::vector<bool>& msk, bool unflag ) {
   std::vector<bool>::const_iterator it;
   uInt ntrue = 0;
+  if (whichrow >= int(table_.nrow()) ) {
+    throw(AipsError("Invalid row number"));
+  }
   for (it = msk.begin(); it != msk.end(); ++it) {
     if ( *it ) {
@@ -787 +790 @@
     }
   }
-  if ( selector_.empty()  && (msk.size() == 0 || msk.size() == ntrue) )
+  //if ( selector_.empty()  && (msk.size() == 0 || msk.size() == ntrue) )
+  if ( whichrow == -1 && !unflag && selector_.empty() && (msk.size() == 0 || msk.size() == ntrue) )
     throw(AipsError("Trying to flag whole scantable."));
+  uChar userflag = 1 << 7;
+  if ( unflag ) {
+    userflag = 0 << 7;
+  }
+  if (whichrow > -1 ) {
+    applyChanFlag(uInt(whichrow), msk, userflag);
+  } else {
+    for ( uInt i=0; i<table_.nrow(); ++i) {
+      applyChanFlag(i, msk, userflag);
+    }
+  }
+}
+
+void Scantable::applyChanFlag( uInt whichrow, const std::vector<bool>& msk, uChar flagval )
+{
+  if (whichrow >= table_.nrow() ) {
+    throw( casa::indexError<int>( whichrow, "asap::Scantable::applyChanFlag: Invalid row number" ) );
+  }
+  Vector<uChar> flgs = flagsCol_(whichrow);
   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);
-      flgs = userflag;
-      flagsCol_.put(i, flgs);
-    }
+    flgs = flagval;
+    flagsCol_.put(whichrow, flgs);
     return;
   }
@@ -804 +820 @@
     throw(AipsError("Mask has incorrect number of channels."));
   }
-  for ( uInt i=0; i<table_.nrow(); ++i) {
-    Vector<uChar> flgs = flagsCol_(i);
-    if ( flgs.nelements() != msk.size() ) {
-      throw(AipsError("Mask has incorrect number of channels."
-                      " Probably varying with IF. Please flag per IF"));
-    }
-    std::vector<bool>::const_iterator it;
-    uInt j = 0;
-    uChar userflag = 1 << 7;
-    if ( unflag ) {
-      userflag = 0 << 7;
-    }
-    for (it = msk.begin(); it != msk.end(); ++it) {
-      if ( *it ) {
-        flgs(j) = userflag;
-      }
-      ++j;
-    }
-    flagsCol_.put(i, flgs);
-  }
+  if ( flgs.nelements() != msk.size() ) {
+    throw(AipsError("Mask has incorrect number of channels."
+                    " Probably varying with IF. Please flag per IF"));
+  }
+  std::vector<bool>::const_iterator it;
+  uInt j = 0;
+  for (it = msk.begin(); it != msk.end(); ++it) {
+    if ( *it ) {
+      flgs(j) = flagval;
+    }
+    ++j;
+  }
+  flagsCol_.put(whichrow, flgs);
 }
 

trunk/src/Scantable.h

@@ -230 +230 @@
    */
   //void flag( const std::vector<bool>& msk = std::vector<bool>());
-  void flag( const std::vector<bool>& msk = std::vector<bool>(), bool unflag=false);
+  //void flag( const std::vector<bool>& msk = std::vector<bool>(), bool unflag=false);
+
+  void flag( int whichrow = -1, const std::vector<bool>& msk = std::vector<bool>(), bool unflag=false);
 
   /**
@@ -607 +609 @@
 
   void doPolyBaseline(const std::vector<bool>& mask, int order, int rowno, Fitter& fitter);
+
+  void applyChanFlag( casa::uInt whichrow, const std::vector<bool>& msk, casa::uChar flagval);
+
+
 };
 
-
 } // namespace
 

trunk/src/ScantableWrapper.h

@@ -109 +109 @@
     { table_->flag(msk); }
   **/
+  /**
   void flag(const std::vector<bool>& msk=std::vector<bool>(), bool unflag=false)
     { table_->flag(msk, unflag); }
+  **/
+  void flag(int whichrow=-1, const std::vector<bool>& msk=std::vector<bool>(), bool unflag=false)
+    { table_->flag(whichrow, msk, unflag); }
 
   void flagRow(const std::vector<casa::uInt>& rows=std::vector<casa::uInt>(), bool unflag=false)