Changeset 2829 for trunk

Timestamp:

07/31/13 12:22:38 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap.scantable.average_time, asap.asapmath.average_time,

and all SD tasks that does averaging.

Description: STMath::average function now takes FLAGROW of scantable

into account in averaging.

File:

• trunk/src/STMath.cpp (modified) (6 diffs)

trunk/src/STMath.cpp

@@ -128 +128 @@
   ScalarColumn<uInt> cycColOut(tout,"CYCLENO");
   ScalarColumn<uInt> scanColOut(tout,"SCANNO");
+  ScalarColumn<uInt> flagRowColOut(tout,"FLAGROW");
 
   // set up the output table rows. These are based on the structure of the
@@ -141 +142 @@
   ROScalarColumn<Double> mjdCol, intCol;
   ROScalarColumn<Int> scanIDCol;
+  ROScalarColumn<uInt> flagRowCol;
 
   //Vector<uInt> rowstodelete;
@@ -240 +242 @@
     intCol.attach(baset,"INTERVAL");
     mjdCol.attach(baset,"TIME");
+    flagRowCol.attach(baset,"FLAGROW");
     Vector<Float> spec,tsys;
     Vector<uChar> flag;
     Double inter,time;
+    uInt flagRow;
 
     for (uInt l = 0; l < rows.nelements(); ++l ) {
@@ -248 +252 @@
       flagCol.get(k, flag);
       Vector<Bool> bflag(flag.shape());
-      convertArray(bflag, flag);
+      flagRowCol.get(k, flagRow);
+      if (flagRow > 0)
+        bflag = true;
+      else
+        convertArray(bflag, flag);
       /*                                                                                                   
         if ( allEQ(bflag, True) ) {                                                                          
@@ -334 +342 @@
       intCol.attach(subt,"INTERVAL");
       mjdCol.attach(subt,"TIME");
+      flagRowCol.attach(subt,"FLAGROW");
       for (uInt k = 0; k < subt.nrow(); ++k ) {
         flagCol.get(k, flag);
         Vector<Bool> bflag(flag.shape());
-        convertArray(bflag, flag);
+        flagRowCol.get(k, flagRow);
+        if (flagRow > 0)
+          bflag = true;
+        else
+          convertArray(bflag, flag);
         /*
         if ( allEQ(bflag, True) ) {
@@ -387 +400 @@
       // which requires resetting this value
       cycColOut.put(i, uInt(0));
+      // completely flagged rows are removed anyway
+      flagRowColOut.put(i, uInt(0));
     } else {
       os << "For output row="<<i<<", all input rows of data are flagged. no averaging" << LogIO::POST;