Changeset 2757 for trunk/src

Timestamp:

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

Location:

trunk/src

Files:

• CMakeLists.txt (modified) (1 diff)
• CalibrationManager.cpp (modified) (4 diffs)
• CalibrationManager.h (modified) (3 diffs)
• EdgeMarker.cpp (modified) (1 diff)
• EdgeMarker.h (modified) (1 diff)
• STCalSkyOtfAlma.cpp (added)
• STCalSkyOtfAlma.h (added)
• STCalSkyPSAlma.h (modified) (1 diff)
• STCalibration.h (modified) (4 diffs)
• python_CalibrationManager.cpp (modified) (1 diff)

trunk/src/CMakeLists.txt

@@ -76 +76 @@
      ${SRCDIR}/STCalibration.cpp
      ${SRCDIR}/STCalSkyPSAlma.cpp
+     ${SRCDIR}/STCalSkyOtfAlma.cpp
      ${SRCDIR}/STCalTsys.cpp
      ${SRCDIR}/STApplyCal.cpp

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);
+}
+
+}

trunk/src/CalibrationManager.h

@@ -51 +51 @@
   void setTsysTransfer(unsigned int from, 
                        const std::vector<unsigned int> &to);
+  void setCalibrationOptions(const casa::Record &options) {options_ = options;}
   void resetCalSetup();
   void reset();
@@ -60 +61 @@
 private:
   STCalEnum::InterpolationType stringToInterpolationEnum(const std::string &s);
+
+  casa::Bool isAlmaAntenna();
 
   casa::CountedPtr<STApplyCal> applicator_;
@@ -72 +75 @@
 
   casa::LogIO os_;
+
+  casa::Record options_;
 };
 

trunk/src/EdgeMarker.cpp

@@ -160 +160 @@
 }
 
+Block<uInt> EdgeMarker::getDetectedRows()
+{
+  uInt *p = off_.storage();
+  return Block<uInt>(noff_, p, False);
+}
+
 CountedPtr<Scantable> EdgeMarker::get()
 {

trunk/src/EdgeMarker.h

@@ -40 +40 @@
   void detect() ;
   void mark() ;
+  casa::Block<casa::uInt> getDetectedRows() ;
   casa::CountedPtr<Scantable> get() ;
 //   void reset() ;

trunk/src/STCalSkyPSAlma.h

@@ -39 +39 @@
   STCalSkyPSAlma(casa::CountedPtr<Scantable> &s);
 
-  ~STCalSkyPSAlma() {;}
+  virtual ~STCalSkyPSAlma() {;}
   
-private:
-  void setupSelector();
-  void fillCalTable();
+protected:
+  virtual void setupSelector();
+  virtual void fillCalTable();
 };
 

trunk/src/STCalibration.h

@@ -13 +13 @@
 #define ASAPSTCALIBRATION_H
 
-#include <memory>
-
 #include <casa/aips.h>
 #include <casa/Arrays/Vector.h>
@@ -20 +18 @@
 #include <casa/Utilities/CountedPtr.h>
 #include <casa/Logging/LogIO.h>
+#include <casa/Containers/Record.h>
 
 #include <scimath/Mathematics/InterpolateArray1D.h>
@@ -44 +43 @@
   //const STApplyTable &applytable() {return *applytable_;}
   const casa::CountedPtr<STApplyTable> applytable() {return applytable_;}
+
+  void setOption(casa::Record &rec) {options_ = rec;}
+
 protected:
   virtual void setupSelector() = 0;
@@ -52 +54 @@
   casa::CountedPtr<STApplyTable> applytable_; 
   casa::LogIO os_;
+  casa::Record options_;
 };
 

trunk/src/python_CalibrationManager.cpp

@@ -30 +30 @@
          (boost::python::arg("interp"),
           boost::python::arg("order")=-1))
+    .def("set_calibration_options", &CalibrationManager::setCalibrationOptions)
     .def("reset", &CalibrationManager::reset)
     .def("set_tsys_spw", &CalibrationManager::setTsysSpw)