Changeset 2955 for trunk/src/STCalibration.cpp

Timestamp:

06/25/14 15:28:36 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6585, CAS-6571

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...

Added FLAGTRA column to sky and Tsys caltable.
To support previous versions of caltabls that don't have FLAGTRA
column, the code automatically add FLAGTRA column and initialize
it with initial value (uChar)0 if no FLAGTRA exists.

File:

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

trunk/src/STCalibration.cpp

@@ -79 +79 @@
       uInt irow = rows[0];
       appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
-                 freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow));
+                 freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow),
+                 flagCol(irow));
       iter.next();
       continue;
@@ -126 +127 @@
           timeCen /= (Double)count * 86400.0; // sec->day
           elCen /= (Float)count;
-          appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
-                     freqidCol(irow), timeCen, elCen, acc.getSpectrum());
+          const Vector<Bool> &mask = acc.getMask();
+          Vector<uChar> flag(mask.shape(), (uChar)0);
+          const uChar userFlag = 1 << 7;
+          for (uInt k = 0; k < flag.nelements(); ++k) {
+            if (mask[k] == True)
+              flag[k] = userFlag;
+          }
+          appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"),
+                     current.asuInt("POLNO"),
+                     freqidCol(irow), timeCen, elCen,
+                     acc.getSpectrum(), flag);
         }
         acc.reset() ;