Changeset 2960 for trunk

Timestamp:

06/27/14 19:39:09 (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...

Channel flag in sky caltable is properly handled in applycal stage.

File:

• trunk/src/STApplyCal.cpp (modified) (12 diffs)

trunk/src/STApplyCal.cpp

@@ -304 +304 @@
   Vector<Double> timeSkySorted;
   Matrix<Float> spoffSorted;
+  Matrix<uChar> flagoffSorted;
   {
     Vector<Double> timeSky(nrowSky);
     Matrix<Float> spoff(nrowSky, nchanSp);
+    Matrix<uChar> flagoff(nrowSky, nchanSp);
     nrowSky = 0;
     for (uInt i = 0 ; i < skylist.nelements(); i++) {
@@ -312 +314 @@
       Vector<Double> t = p->getTime();
       Matrix<Float> sp = p->getSpectra();
+      Matrix<uChar> fl = p->getFlagtra();
       for (uInt j = 0; j < t.nelements(); j++) {
         timeSky[nrowSky] = t[j];
         spoff.row(nrowSky) = sp.column(j);
+        flagoff.row(nrowSky) = fl.column(j);
         nrowSky++;
       }
@@ -333 +337 @@
                             new Float[nrowSky * nchanSp],
                             TAKE_OVER);
+    flagoffSorted.takeStorage(IPosition(2, nrowSkySorted, nchanSp),
+                              new uChar[nrowSkySorted * nchanSp],
+                              TAKE_OVER);
     for (uInt i = 0 ; i < nrowSky; i++) {
       spoffSorted.row(i) = spoff.row(skyIdx[i]);
+      flagoffSorted.row(i) = flagoff.row(skyIdx[i]);
     }
   }
@@ -340 +348 @@
   uInt nrowTsysSorted = nrowTsys;
   Matrix<Float> tsysSorted;
+  Matrix<uChar> flagtsysSorted;
   Vector<Double> timeTsysSorted;
   if (doTsys) {
@@ -345 +354 @@
     Vector<Double> timeTsys(nrowTsys);
     Matrix<Float> tsys(nrowTsys, nchanTsys);
+    Matrix<uChar> flagtsys(nrowTsys, nchanTsys);
     tsysSorted.takeStorage(IPosition(2, nrowTsys, nchanTsys),
                            new Float[nrowTsys * nchanTsys],
@@ -353 +363 @@
       Vector<Double> t = p->getTime();
       Matrix<Float> ts = p->getTsys();
+      Matrix<uChar> fl = p->getFlagtra();
       for (uInt j = 0; j < t.nelements(); j++) {
         timeTsys[nrowTsys] = t[j];
         tsys.row(nrowTsys) = ts.column(j);
+        flagtsys.row(nrowTsys) = fl.column(j);
         nrowTsys++;
       }
@@ -365 +377 @@
                                new Double[nrowTsysSorted],
                                TAKE_OVER);
+    flagtsysSorted.takeStorage(IPosition(2, nrowTsysSorted, nchanTsys),
+                               new uChar[nrowTsysSorted * nchanTsys],
+                               TAKE_OVER);
     for (uInt i = 0 ; i < nrowTsysSorted; i++) {
       timeTsysSorted[i] = timeTsys[tsysIdx[i]];
@@ -372 +387 @@
     for (uInt i = 0; i < nrowTsys; ++i) {
       tsysSorted.row(i) = tsys.row(tsysIdx[i]);
+      flagtsysSorted.row(i) = flagtsys.row(tsysIdx[i]);
     }
   }
@@ -377 +393 @@
   Table tab = work_->table();
   ArrayColumn<Float> spCol(tab, "SPECTRA");
+  ArrayColumn<uChar> flCol(tab, "FLAGTRA");
   ArrayColumn<Float> tsysCol(tab, "TSYS");
   ScalarColumn<Double> timeCol(tab, "TIME");
-  Vector<Float> on;
+  //Vector<Float> on;
 
   // Array for scaling factor (aka Tsys)
@@ -396 +413 @@
 
     // target spectral data
-    on = spCol(irow);
+    Vector<Float> on = spCol(irow);
+    Vector<uChar> flag = flCol(irow);
     //os_ << "on=" << on[0] << LogIO::POST;
     calibrator_->setSource(on);
@@ -403 +421 @@
     Double t0 = timeCol(irow);
     for (uInt ichan = 0; ichan < nchanSp; ichan++) {
-      Float *tmpY = &(spoffSorted.data()[ichan * nrowSkySorted]); 
+      Float *tmpY = &(spoffSorted.data()[ichan * nrowSkySorted]);
+      if (allNE(flagoffSorted.column(ichan), (uChar)0)) {
+        flag[ichan] = 1 << 7; // user flag
+      }
       interpolatorS_->setY(tmpY, nrowSkySorted);
       iOff[ichan] = interpolatorS_->interpolate(t0);
@@ -450 +471 @@
     //os_ << "calibrated=" << calibrator_->getCalibrated()[0] << LogIO::POST; 
     spCol.put(irow, calibrator_->getCalibrated());
+    flCol.put(irow, flag);
     if (filltsys)
       tsysCol.put(irow, iTsys);