Changeset 2955

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.

Location:

trunk/src

Files:

• STCalSkyPSAlma.cpp (modified) (1 diff)
• STCalSkyPSAlma.h (modified) (1 diff)
• STCalSkyTable.cpp (modified) (5 diffs)
• STCalSkyTable.h (modified) (2 diffs)
• STCalTsys.cpp (modified) (3 diffs)
• STCalTsys.h (modified) (1 diff)
• STCalTsysTable.cpp (modified) (6 diffs)
• STCalTsysTable.h (modified) (2 diffs)
• STCalibration.cpp (modified) (2 diffs)
• STCalibration.h (modified) (1 diff)

trunk/src/STCalSkyPSAlma.cpp

@@ -53 +53 @@
                                 uInt beamno, uInt ifno, uInt polno, 
                                 uInt freqid, Double time, Float elevation, 
-                                Vector<Float> any_data)
+                                const Vector<Float> &any_data,
+                                const Vector<uChar> &channel_flag)
 {
   STCalSkyTable *p = dynamic_cast<STCalSkyTable *>(&(*applytable_));
   p->appenddata(scanno, cycleno, beamno, ifno, polno,
-                freqid, time, elevation, any_data);
+                freqid, time, elevation, any_data, channel_flag);
 }
 

trunk/src/STCalSkyPSAlma.h

@@ -46 +46 @@
                           casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
                           casa::uInt freqid, casa::Double time, casa::Float elevation, 
-                          casa::Vector<casa::Float> any_data);
+                          const casa::Vector<casa::Float> &any_data,
+                          const casa::Vector<casa::uChar> &channel_flag);
 };
 

trunk/src/STCalSkyTable.cpp

@@ -19 +19 @@
 #include <tables/Tables/ScaColDesc.h>
 #include <tables/Tables/TableRecord.h>
+#include <tables/Tables/TableIter.h>
 #include <measures/TableMeasures/TableMeasDesc.h>
 #include <measures/TableMeasures/TableMeasRefDesc.h>
@@ -43 +44 @@
   : STApplyTable(name)
 {
+  if (!table_.tableDesc().isColumn("FLAGTRA")) {
+    LogIO os(LogOrigin("STCalSkyTable", "STCalSkyTable", WHERE));
+    os << "Adding FLAGTRA column to " << name << " with initial value of 0 (all data valid)." << LogIO::POST;
+    table_.addColumn(ArrayColumnDesc<uChar>("FLAGTRA"));
+    TableIterator iter(table_, "IFNO");
+    while (!iter.pastEnd()) {
+      Table t = iter.table();
+      ArrayColumn<Float> spectraCol(t, "SPECTRA");
+      IPosition shape(2, spectraCol.shape(0)[0], t.nrow());
+      ArrayColumn<uChar> flagtraCol(t, "FLAGTRA");
+      Array<uChar> flagtra(shape, (uChar)0);
+      flagtraCol.putColumn(flagtra);
+      iter.next();
+    }
+  }
+
   attachOptionalColumns();
 }
@@ -53 +70 @@
 {
   table_.addColumn(ArrayColumnDesc<Float>("SPECTRA"));
+  table_.addColumn(ArrayColumnDesc<uChar>("FLAGTRA"));
   table_.addColumn(ScalarColumnDesc<Float>("ELEVATION"));
 
@@ -66 +84 @@
 {
   spectraCol_.attach(table_, "SPECTRA");
+  flagtraCol_.attach(table_, "FLAGTRA");
   elCol_.attach(table_,"ELEVATION");
-  
 }
 
 void STCalSkyTable::setdata(uInt irow, uInt scanno, uInt cycleno, 
                             uInt beamno, uInt ifno, uInt polno, uInt freqid,  
-                            Double time, Float elevation, Vector<Float> spectra)
+                            Double time, Float elevation,
+                            const Vector<Float> &spectra,
+                            const Vector<uChar> &flagtra)
 {
   if (irow >= (uInt)nrow()) {
@@ -86 +106 @@
   elCol_.put(irow, elevation);
   spectraCol_.put(irow, spectra);
+  flagtraCol_.put(irow, flagtra);
 }
 
 void STCalSkyTable::appenddata(uInt scanno, uInt cycleno, 
                                uInt beamno, uInt ifno, uInt polno, uInt freqid,
-                               Double time, Float elevation, Vector<Float> spectra)
+                               Double time, Float elevation,
+                               const Vector<Float> &spectra,
+                               const Vector<uChar> &flagtra)
 {
   uInt irow = nrow();
   table_.addRow(1, True);
-  setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, elevation, spectra);
+  setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, elevation,
+          spectra, flagtra);
 }
 

trunk/src/STCalSkyTable.h

@@ -47 +47 @@
                casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
                casa::uInt freqid, casa::Double time, casa::Float elevation, 
-               casa::Vector<casa::Float> spectra);
+               const casa::Vector<casa::Float> &spectra,
+               const casa::Vector<casa::uChar> &flagtra);
   void appenddata(casa::uInt scanno, casa::uInt cycleno, casa::uInt beamno, 
                   casa::uInt ifno, casa::uInt polno, casa::uInt freqid,  
                   casa::Double time, casa::Float elevation, 
-                  casa::Vector<casa::Float> spectra);
+                  const casa::Vector<casa::Float> &spectra,
+                  const casa::Vector<casa::uChar> &flagtra);
   
   casa::Vector<casa::Float> getElevation() {return elCol_.getColumn();}
@@ -63 +65 @@
   const casa::String caltype_;
   casa::ArrayColumn<casa::Float> spectraCol_;
+  casa::ArrayColumn<casa::uChar> flagtraCol_;
   casa::ScalarColumn<casa::Float> elCol_;
 };

trunk/src/STCalTsys.cpp

@@ -75 +75 @@
                            uInt beamno, uInt ifno, uInt polno, 
                            uInt freqid, Double time, Float elevation, 
-                           Vector<Float> any_data)
+                           const Vector<Float> &any_data,
+                           const Vector<uChar> &channel_flag)
 {
   STCalTsysTable *p = dynamic_cast<STCalTsysTable *>(&(*applytable_));
@@ -81 +82 @@
     LogIO os(LogOrigin("STCalTsys", "appenddata", WHERE));
     Vector<Float> averaged_data(any_data.size());
+    Vector<uChar> averaged_flag(any_data.size(), 0);
     Float averaged_value = 0.0;
     size_t num_value = 0;
@@ -104 +106 @@
     os << LogIO::DEBUGGING << "any_data = " << any_data << LogIO::POST;
     p->appenddata(scanno, cycleno, beamno, ifno, polno,
-                  freqid, time, elevation, averaged_data);
+                  freqid, time, elevation, averaged_data,
+                  averaged_flag);
   }
   else {
     p->appenddata(scanno, cycleno, beamno, ifno, polno,
-                  freqid, time, elevation, any_data);
+                  freqid, time, elevation, any_data,
+                  channel_flag);
   }
 }

trunk/src/STCalTsys.h

@@ -49 +49 @@
                           casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
                           casa::uInt freqid, casa::Double time, casa::Float elevation, 
-                          casa::Vector<casa::Float> any_data);
+                          const casa::Vector<casa::Float> &any_data,
+                          const casa::Vector<casa::uChar> &channel_flag);
 
   vector<int> iflist_;

trunk/src/STCalTsysTable.cpp

@@ -19 +19 @@
 #include <tables/Tables/ScaColDesc.h>
 #include <tables/Tables/TableRecord.h>
+#include <tables/Tables/TableIter.h>
 #include <measures/TableMeasures/TableMeasDesc.h>
 #include <measures/TableMeasures/TableMeasRefDesc.h>
@@ -42 +43 @@
   : STApplyTable(name)
 {
+  if (!table_.tableDesc().isColumn("FLAGTRA")) {
+    LogIO os(LogOrigin("STCalTsysTable", "STCalTsysTable", WHERE));
+    os << "Adding FLAGTRA column to " << name << " with initial value of 0 (all data valid)." << LogIO::POST;
+    table_.addColumn(ArrayColumnDesc<uChar>("FLAGTRA"));
+    TableIterator iter(table_, "IFNO");
+    while (!iter.pastEnd()) {
+      Table t = iter.table();
+      ArrayColumn<Float> tsysCol(t, "TSYS");
+      IPosition shape(2, tsysCol.shape(0)[0], t.nrow());
+      ArrayColumn<uChar> flagtraCol(t, "FLAGTRA");
+      Array<uChar> flagtra(shape, (uChar)0);
+      flagtraCol.putColumn(flagtra);
+      iter.next();
+    }
+  }
+  
   attachOptionalColumns();
 }
@@ -52 +69 @@
 {
   table_.addColumn(ArrayColumnDesc<Float>("TSYS"));
+  table_.addColumn(ArrayColumnDesc<uChar>("FLAGTRA"));
   table_.addColumn(ScalarColumnDesc<Float>("ELEVATION"));
 
@@ -62 +80 @@
 {
   tsysCol_.attach(table_, "TSYS");
+  flagtraCol_.attach(table_, "FLAGTRA");
   elCol_.attach(table_,"ELEVATION");
   
@@ -68 +87 @@
 void STCalTsysTable::setdata(uInt irow, uInt scanno, uInt cycleno, 
                              uInt beamno, uInt ifno, uInt polno, uInt freqid,  
-                             Double time, Float elevation, Vector<Float> tsys)
+                             Double time, Float elevation,
+                             const Vector<Float> &tsys,
+                             const Vector<uChar> &flagtra)
 {
   if (irow >= (uInt)nrow()) {
@@ -82 +103 @@
   elCol_.put(irow, elevation);
   tsysCol_.put(irow, tsys);
+  flagtraCol_.put(irow, flagtra);
 }
 
 void STCalTsysTable::appenddata(uInt scanno, uInt cycleno, 
                                 uInt beamno, uInt ifno, uInt polno, uInt freqid,
-                                Double time, Float elevation, Vector<Float> tsys)
+                                Double time, Float elevation,
+                                const Vector<Float> &tsys,
+                                const Vector<uChar> &flagtra)
 {
   uInt irow = nrow();
   table_.addRow(1, True);
-  setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, elevation, tsys);
+  setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, elevation,
+          tsys, flagtra);
 }
 

trunk/src/STCalTsysTable.h

@@ -45 +45 @@
                casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
                casa::uInt freqid, casa::Double time, casa::Float elevation, 
-               casa::Vector<casa::Float> tsys);
+               const casa::Vector<casa::Float> &tsys,
+               const casa::Vector<casa::uChar> &flagtra);
   void appenddata(casa::uInt scanno, casa::uInt cycleno, 
                   casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
                   casa::uInt freqid, casa::Double time, casa::Float elevation, 
-                  casa::Vector<casa::Float> tsys);
+                  const casa::Vector<casa::Float> &tsys,
+                  const casa::Vector<casa::uChar> &flagtra);
   
   casa::Vector<casa::Float> getElevation() {return elCol_.getColumn();}
@@ -60 +62 @@
   static const casa::String name_ ;
   casa::ArrayColumn<casa::Float> tsysCol_;
+  casa::ArrayColumn<casa::uChar> flagtraCol_;
   casa::ScalarColumn<casa::Float> elCol_;
 };

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() ;

trunk/src/STCalibration.h

@@ -53 +53 @@
                           casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
                           casa::uInt freqid, casa::Double time, casa::Float elevation, 
-                          casa::Vector<casa::Float> any_data) = 0;
+                          const casa::Vector<casa::Float> &any_data,
+                          const casa::Vector<casa::uChar> &channel_flag) = 0;
 
   STSelector sel_;