Changeset 2762 for trunk/src

Timestamp:

02/06/13 19:45:36 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

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

Added new method CalibrationManger::addApplyTable and its python interface.
The method understands what kind of apply table is given, and call
appropriate addXXX method.

Location:

trunk/src

Files:

• CalibrationManager.cpp (modified) (1 diff)
• CalibrationManager.h (modified) (1 diff)
• python_CalibrationManager.cpp (modified) (1 diff)

trunk/src/CalibrationManager.cpp

@@ -58 +58 @@
   // always plain table
   target_ = new Scantable(s, Table::Plain);
+}
+
+void CalibrationManager::addApplyTable(const string &c)
+{
+  STCalEnum::CalType caltype = STApplyTable::getCalType(c);
+  if (caltype == STCalEnum::CalTsys) {
+    addTsysTable(c);
+  }
+  else if (caltype != STCalEnum::NoType) {
+    // should be sky table
+    addSkyTable(c);
+  }
+  else {
+    os_.origin(LogOrigin("CalibrationManager","addCalTable",WHERE));
+    os_ << LogIO::WARN << "Table " << c << " is not ApplyTable." << LogIO::POST ;
+  }
 }
 

trunk/src/CalibrationManager.h

@@ -43 +43 @@
   void setScantable(ScantableWrapper &s);
   void setScantableByName(const std::string &s);
+  void addApplyTable(const std::string &c);
   void addSkyTable(const std::string &c);
   void addTsysTable(const std::string &c);

trunk/src/python_CalibrationManager.cpp

@@ -21 +21 @@
     .def("set_data", &CalibrationManager::setScantable)
     .def("set_data", &CalibrationManager::setScantableByName)
+    .def("add_applytable", &CalibrationManager::addApplyTable)
     .def("add_skytable", &CalibrationManager::addSkyTable)
     .def("add_tsystable", &CalibrationManager::addTsysTable)