Changeset 3062 for trunk/src

Timestamp:

11/18/15 20:02:30 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-8098

Ready for Test: Yes

Interface Changes: 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...

Data selection for Tsys calibration takes intents into account. Only take Tsys's with SrcType::POFFCAL (CALIBRATE_ATMOSPHERE#OFF_SOURCE).

File:

• trunk/src/STCalTsys.cpp (modified) (3 diffs)

trunk/src/STCalTsys.cpp

@@ -15 +15 @@
 #include <casa/Arrays/ArrayMath.h>
 #include <casa/Logging/LogIO.h>
+#include <tables/Tables/ScalarColumn.h>
 
 #include "STSelector.h"
@@ -49 +50 @@
 void STCalTsys::setupSelector(const STSelector &sel)
 {
+  // sel is an selector object that is associated with
+  // input Scantable
   sel_ = sel;
+  //cout << "original: " << endl << sel_.print() << endl;
   vector<int> ifnos = sel_.getIFs();
   if (ifnos.size() > 0) {
@@ -70 +74 @@
     sel_.setIFs(iflist_);
   }
+
+  // intent selection
+  ROScalarColumn<Int> srctypeCol(scantable_->table(), "SRCTYPE");
+  Vector<Int> srctype = srctypeCol.getColumn();
+  uInt calOffCount = 0;
+  uInt calOnCount = 0;
+  for (size_t i = 0; i < srctype.nelements(); ++i) {
+    if (srctype[i] == static_cast<Int>(SrcType::PONCAL)) {
+      calOnCount++;
+    }
+    else if (srctype[i] == static_cast<Int>(SrcType::POFFCAL)) {
+      calOffCount++;
+    }
+  }
+  //cout << "srctype = " << srctype << endl;
+  //cout << "calOnCount, calOffCount = " << calOnCount << "," << calOffCount << endl;
+  if (calOnCount == 0 || calOffCount == 0) {
+    LogIO os(LogOrigin("STCalTsys", "setupSelector", WHERE));
+    os << LogIO::SEVERE << "Input scantable doesn't have ATMCal intents" << LogIO::EXCEPTION;
+  }
+
+  vector<int> intents = sel_.getTypes();
+  if (count(intents.begin(), intents.end(), static_cast<Int>(SrcType::POFFCAL)) == 0) {
+    intents.push_back(static_cast<Int>(SrcType::POFFCAL));
+    sel_.setTypes(intents);
+  }
+
+  //cout << "modified: " << endl << sel_.print() << endl;
 }