Changeset 2922 for trunk

Timestamp:

04/07/14 16:10:14 (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...

Define new method, setTsysSpwWithRange, to support channel averaging of Tsys.
Implementation is not completed so that it only supports similar
behavior with previous one (which is using setTsysSpw).

Location:

trunk/src

Files:

• CalibrationManager.cpp (modified) (5 diffs)
• CalibrationManager.h (modified) (2 diffs)
• python_CalibrationManager.cpp (modified) (1 diff)

trunk/src/CalibrationManager.cpp

@@ -36 +36 @@
   : target_(0),
     calmode_(""),
-    spwlist_(0)
+    spwlist_(0),
+    spwlist_withrange_()
 {
   applicator_ = new STApplyCal();
@@ -146 +147 @@
 }
 
+void CalibrationManager::setTsysSpwWithRange(const Record &spwlist, bool average)
+{
+  os_.origin(LogOrigin("CalibrationManager","setTsysSpw",WHERE));
+  os_ << LogIO::DEBUGGING << "set IFNO for Tsys calibration to " << LogIO::POST;
+  spwlist.print(os_.output());
+  os_ << LogIO::DEBUGGING << LogIO::POST;
+  os_ << LogIO::DEBUGGING << ((average) ? "with averaging" : "without averaging") << LogIO::POST;
+  spwlist_withrange_ = spwlist;
+}
+
 void CalibrationManager::resetCalSetup()
 {
@@ -153 +164 @@
   calmode_ = "";
   spwlist_.clear();
+  spwlist_withrange_ = Record();
 }
 
@@ -162 +174 @@
   calmode_ = "";
   spwlist_.clear();
+  spwlist_withrange_ = Record();
 }
 
@@ -172 +185 @@
   if (calmode_ == "TSYS") {
     //assert(spwlist_.size() > 0);
-    assert_<AipsError>(spwlist_.size() > 0, "You have to set list of IFNOs for ATM calibration.");
-    STCalTsys cal(target_, spwlist_);
-    cal.calibrate();
-    tsystables_.push_back(cal.applytable());
+    if (spwlist_withrange_.empty()) {
+      assert_<AipsError>(spwlist_.size() > 0, "You have to set list of IFNOs for ATM calibration.");
+      STCalTsys cal(target_, spwlist_);
+      cal.calibrate();
+      tsystables_.push_back(cal.applytable());
+    }
+    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);
+      cal.calibrate();
+      tsystables_.push_back(cal.applytable());
+    }      
   }
   else if (calmode_ == "PS") {

trunk/src/CalibrationManager.h

@@ -50 +50 @@
   void setFrequencyInterpolation(const std::string &interp, int order=-1);
   void setTsysSpw(const std::vector<int> &spwlist);
+  void setTsysSpwWithRange(const casa::Record &spwlist, bool average=false);
   void setTsysTransfer(unsigned int from, 
                        const std::vector<unsigned int> &to);
@@ -74 +75 @@
   casa::String calmode_;
   std::vector<int> spwlist_;
+  casa::Record spwlist_withrange_;
 
   casa::LogIO os_;

trunk/src/python_CalibrationManager.cpp

@@ -34 +34 @@
     .def("reset", &CalibrationManager::reset)
     .def("set_tsys_spw", &CalibrationManager::setTsysSpw)
+    .def("set_tsys_spw_withrange", &CalibrationManager::setTsysSpwWithRange,
+         (boost::python::arg("spwlist"),
+          boost::python::arg("average")=false))
     .def("set_tsys_transfer", &CalibrationManager::setTsysTransfer)
     .def("calibrate", &CalibrationManager::calibrate)