Changeset 3021 for trunk/src

Timestamp:

12/15/14 20:22:00 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-7193

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: test_sdcal2

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fix for proper flag handling when input applytables are invalid/empty.

File:

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

trunk/src/STApplyCal.cpp

@@ -230 +230 @@
   }
 };
+
+inline void flagSpectrum(uInt &flagrow, Vector<uChar> &flagchan) {
+  flagrow = 1;
+  flagchan = (uChar)(1 << 7);
+}
+
+inline void flagSpectra(Table &tab, const Vector<uInt> &rows) {
+  //os_ << LogIO::WARN << "No valid sky data in sky caltable. Completely flag Beam " << beamno << " Spw " << ifno << " Pol " << polno << LogIO::POST;
+  // Given sky tables are all empty
+  // So, flag all data
+  //Table tab = work_->table();
+  ArrayColumn<uChar> flCol(tab, "FLAGTRA");
+  ScalarColumn<uInt> frCol(tab, "FLAGROW");
+  Vector<uChar> flag;
+  uInt flagrow;
+  for (uInt i = 0; i < rows.nelements(); i++) {
+    uInt irow = rows[i];
+    flCol.get(irow, flag);
+    frCol.get(irow, flagrow);
+    flagSpectrum(flagrow, flag);
+    //flag = (uChar)(1 << 7);
+    flCol.put(irow, flag);
+    frCol.put(irow, flagrow);
+  }
+}
+
 }
 
@@ -454 +480 @@
 
   // Skip IFNO without sky data
-  if (nrowSkyTotal == 0)
+  if (nrowSkyTotal == 0) {
+    if (skytable_.size() > 0) {
+      os_ << LogIO::WARN << "No data in sky caltable. Completely flag Beam " << beamno << " Spw " << ifno << " Pol " << polno << LogIO::POST;
+      // Given sky tables are all empty
+      // So, flag all data
+      flagSpectra(work_->table(), rows);
+    }
     return;
+  }
 
   uInt nchanTsys = 0;
   Vector<Double> ftsys;
   uInt tsysifno = getIFForTsys(ifno);
+  Bool onlyInvalidTsys = False;
   os_ << "tsysifno=" << (Int)tsysifno << LogIO::POST;
   if (tsystable_.size() == 0) {
@@ -483 +517 @@
       }
     }
+    if (nrowTsysTotal == 0) {
+      os_ << "No valid Tsys measurement. for Beam " << beamno << " Spw " << ifno << " Pol " << polno << ". Skip Tsys calibration." << LogIO::POST;
+      doTsys = False;
+      onlyInvalidTsys = True;
+    }
   }
 
@@ -493 +532 @@
                                   nrowSkyTotal, nchanSp,
                                   timeSky, spoff, flagoff);
+  if (allNE(flagoff, (uChar)0)) {
+    os_ << LogIO::WARN << "No valid sky data in sky caltable. Completely flag Beam " << beamno << " Spw " << ifno << " Pol " << polno << LogIO::POST;
+    // Given sky tables are all invalid
+    // So, flag all data
+    flagSpectra(work_->table(), rows);
+  }
   nrowSky = timeSky.nelements();
 
@@ -509 +554 @@
 
     if (allNE(flagtsys, (uChar)0)) {
-      os_ << LogIO::WARN << "No valid Tsys measurement. Skip Tsys calibration." << LogIO::POST;
+      os_ << LogIO::WARN << "No valid Tsys measurement for Beam " << beamno << " Spw " << ifno << " Pol " << polno << ". Skip Tsys calibration." << LogIO::POST;
       doTsys = False;
+      onlyInvalidTsys = True;
     }
   }
@@ -519 +565 @@
   ArrayColumn<Float> tsysCol(tab, "TSYS");
   ScalarColumn<Double> timeCol(tab, "TIME");
+  ScalarColumn<uInt> frCol(tab, "FLAGROW");
 
   // Array for scaling factor (aka Tsys)
@@ -547 +594 @@
     spCol.get(irow, on);
     flCol.get(irow, flag);
+    uInt flagrow = frCol(irow);
     //os_ << "on=" << on[0] << LogIO::POST;
     calibrator_->setSource(on);
@@ -605 +653 @@
     calibrator_->calibrate();
 
+    // flag spectrum if no valid Tsys measurement available
+    if (onlyInvalidTsys) {
+      flagSpectrum(flagrow, flag);
+    }
+
     // update table
     //os_ << "calibrated=" << calibrator_->getCalibrated()[0] << LogIO::POST; 
     spCol.put(irow, calibrator_->getCalibrated());
     flCol.put(irow, flag);
-    if (filltsys)
+    frCol.put(irow, flagrow);
+    if (filltsys && !onlyInvalidTsys)
       tsysCol.put(irow, iTsys);
   }