Changeset 2923 for trunk/src/CalibrationManager.cpp

Timestamp:

04/08/14 11:28:23 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6382

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_tsdcal2

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Implement averaged Tsys calibration.

File:

• trunk/src/CalibrationManager.cpp (modified) (5 diffs)

trunk/src/CalibrationManager.cpp

@@ -37 +37 @@
     calmode_(""),
     spwlist_(0),
-    spwlist_withrange_()
+    spwlist_withrange_(),
+    do_average_(false)
 {
   applicator_ = new STApplyCal();
@@ -155 +156 @@
   os_ << LogIO::DEBUGGING << ((average) ? "with averaging" : "without averaging") << LogIO::POST;
   spwlist_withrange_ = spwlist;
+  do_average_ = average;
 }
 
@@ -165 +167 @@
   spwlist_.clear();
   spwlist_withrange_ = Record();
+  do_average_ = false;
 }
 
@@ -175 +178 @@
   spwlist_.clear();
   spwlist_withrange_ = Record();
+  do_average_ = false;
 }
 
@@ -192 +196 @@
     }
     else {
-      uInt nfield = spwlist_withrange_.nfields();
-      vector<int> spwlist(nfield);
-      for (uInt i = 0; i < nfield; ++i) {
-        spwlist[i] = std::atoi(spwlist_withrange_.name(i).c_str());
-      }
-      STCalTsys cal(target_, spwlist);
+      STCalTsys cal(target_, spwlist_withrange_, do_average_);
       cal.calibrate();
       tsystables_.push_back(cal.applytable());