Changeset 2947 for trunk/src

Timestamp:

06/19/14 11:21:28 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6588

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

flag and clip is updated so that channel flagging operation is not
applied if target row is flagged.

File:

• trunk/src/Scantable.cpp (modified) (2 diffs)

trunk/src/Scantable.cpp

@@ -763 +763 @@
 void Scantable::clip(const Float uthres, const Float dthres, bool clipoutside, bool unflag)
 {
+  Vector<uInt> flagrow = flagrowCol_.getColumn();
   for (uInt i=0; i<table_.nrow(); ++i) {
-    Vector<uChar> flgs = flagsCol_(i);
-    srchChannelsToClip(i, uthres, dthres, clipoutside, unflag, flgs);
-    flagsCol_.put(i, flgs);
+    // apply flag only when specified row is vaild
+    if (flagrow[i] == 0) {
+      Vector<uChar> flgs = flagsCol_(i);
+      srchChannelsToClip(i, uthres, dthres, clipoutside, unflag, flgs);
+      flagsCol_.put(i, flgs);
+    }
   }
 }
@@ -833 +837 @@
   }
   if (whichrow > -1 ) {
-    applyChanFlag(uInt(whichrow), msk, userflag);
+    // apply flag only when specified row is vaild
+    if (flagrowCol_(whichrow) == 0) {
+      applyChanFlag(uInt(whichrow), msk, userflag);
+    }
   } else {
     for ( uInt i=0; i<table_.nrow(); ++i) {
-      applyChanFlag(i, msk, userflag);
+      // apply flag only when specified row is vaild
+      if (flagrowCol_(i) == 0) {
+        applyChanFlag(i, msk, userflag);
+      }
     }
   }