Changeset 2757 for trunk/src/CalibrationManager.cpp

Timestamp:

01/31/13 20:04:58 (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:

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

First version of Calibrator class for OTF scan without OFF.

File:

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

trunk/src/CalibrationManager.cpp

@@ -26 +26 @@
 #include "STCalTsys.h"
 #include "STCalSkyPSAlma.h"
+#include "STCalSkyOtfAlma.h"
 
 using namespace casa;
@@ -161 +162 @@
   }
   else if (calmode_ == "PS") {
-    // will match DV01-25, DA41-65, PM01-04, CM01-12
-    Regex reant("^(DV(0[1-9]|1[0-9]|2[0-5])|DA(4[1-9]|5[0-9]|6[0-5])|PM0[1-4]|CM(0[1-9]|1[1,2]))$");
-    const String antname = target_->getAntennaName();
-    if (reant.match(antname.c_str(), antname.size()) != String::npos) {
+//     // will match DV01-25, DA41-65, PM01-04, CM01-12
+//     Regex reant("^(DV(0[1-9]|1[0-9]|2[0-5])|DA(4[1-9]|5[0-9]|6[0-5])|PM0[1-4]|CM(0[1-9]|1[1,2]))$");
+//     const String antname = target_->getAntennaName();
+//     if (reant.match(antname.c_str(), antname.size()) != String::npos) {
+    if (isAlmaAntenna()) {
       os_ << LogIO::DEBUGGING << "ALMA specific position-switch calibration." << LogIO::POST; 
       STCalSkyPSAlma cal(target_);
@@ -171 +173 @@
     }
     else {
-      String msg = "Calibration type " + calmode_ + " for antenna " + antname + " is not supported.";
+      String msg = "Calibration type " + calmode_ + " for non-ALMA antenna " + target_->getAntennaName() + " is not supported.";
+      os_.origin(LogOrigin("CalibrationManager","calibrate",WHERE));
+      os_ << LogIO::SEVERE << msg << LogIO::POST;
+      throw AipsError(msg);
+    }      
+  }
+  else if (calmode_ == "OTF" || calmode_ == "OTFRASTER") {
+    if (isAlmaAntenna()) {
+      os_ << LogIO::DEBUGGING << "ALMA specific position-switch calibration." << LogIO::POST; 
+      STCalSkyOtfAlma cal(target_, (calmode_ == "OTFRASTER"));
+      if (!options_.empty())
+        cal.setOption(options_);
+      cal.calibrate();
+      skytables_.push_back(cal.applytable());
+    }
+    else {
+      String msg = "Calibration type " + calmode_ + " for non-ALMA antenna " + target_->getAntennaName() + " is not supported.";
       os_.origin(LogOrigin("CalibrationManager","calibrate",WHERE));
       os_ << LogIO::SEVERE << msg << LogIO::POST;
@@ -249 +267 @@
 }
 
-}
+Bool CalibrationManager::isAlmaAntenna()
+{
+  assert_<AipsError>(!target_.null(), "You have to set target scantable first.");
+  // will match DV01-25, DA41-65, PM01-04, CM01-12
+  Regex reant("^(DV(0[1-9]|1[0-9]|2[0-5])|DA(4[1-9]|5[0-9]|6[0-5])|PM0[1-4]|CM(0[1-9]|1[1,2]))$");
+  const String antname = target_->getAntennaName();
+  return (reant.match(antname.c_str(), antname.size()) != String::npos);
+}
+
+}