Changeset 2842 for trunk/src

Timestamp:

08/26/13 18:04:21 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5545

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdsave[sdsave_flagging]

Put in Release Notes: No

Module(s): sd

Description: Describe your changes here...

Changed a behavior of MSWriter according to CAS-5545.

• All the FLAG_ROW's are always set to False.
• If FLAGROW is non-zero in a certain Scantable row, all the FLAG values in the corresponding location in MS/MAIN (FLAG in the corresponding polarization component) have to be set to True.

File:

• trunk/src/MSWriter.cpp (modified) (3 diffs)

trunk/src/MSWriter.cpp

@@ -274 +274 @@
   void postFlagRow() 
   {
-    *flagRowRF = anyEQ( flagRow, True ) ;
+    // CAS-5545 FLAG_ROW must always be set False
+    //*flagRowRF = anyEQ( flagRow, True ) ;
+    *flagRowRF = False;
   }
   inline void accumulateFlag( uInt &id, Vector<Bool> &fl ) 
@@ -347 +349 @@
   virtual void postFlag()
   {
+    // CAS-5545 FLAG must all be set True if FLAG_ROW is True
+    for (uInt ipol = 0; ipol < npol; ++ipol) {
+      if (flagRow[ipol]) {
+        flag(IPosition(2, ipol, 0), IPosition(2, ipol, nchan-1)) = True;
+      }
+    }
+    
     if ( npol == 2 ) {
       flagRF.define( flag( IPosition( 2, 0, 0 ), IPosition( 2, npol-1, nchan-1 ) ) ) ; 
@@ -386 +395 @@
   virtual void postFlag()
   {
+    // CAS-5545 FLAG must all be set True if FLAG_ROW is True
+    for (uInt ipol = 0; ipol < npol; ++ipol) {
+      if (flagRow[ipol]) {
+        flag(IPosition(2, ipol, 0), IPosition(2, ipol, nchan-1)) = True;
+      }
+    }
+    
     if ( npol == 4 ) {
       Vector<Bool> tmp = flag.row( 3 ) ;