Changeset 2750 for trunk

Timestamp:

01/29/13 19:21:55 (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: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Various fixes to avoid segmentation fault, and a few updates on
python interface.

Location:

trunk/src

Files:

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

trunk/src/CalibrationManager.cpp

@@ -182 +182 @@
 }
 
-void CalibrationManager::apply()
+void CalibrationManager::apply(bool insitu, bool filltsys)
 {
   os_.origin(LogOrigin("CalibrationManager","apply",WHERE));
@@ -191 +191 @@
   for (size_t i = 0; i < skytables_.size(); i++) 
     applicator_->push(dynamic_cast<STCalSkyTable*>(&(*skytables_[i])));
-  applicator_->apply(false);
+  applicator_->apply(insitu, filltsys);
 }
 
@@ -198 +198 @@
   os_.origin(LogOrigin("CalibrationManager","saveCaltable",WHERE));
   if (calmode_ == "TSYS") {
+    assert(tsystables_.size() > 0);
     os_ << LogIO::DEBUGGING << "save latest STCalTsysTable as " << name << "." << LogIO::POST;
     tsystables_[tsystables_.size()-1]->save(name);
   }
   else {
+    assert(skytables_.size() > 0);
     os_ << LogIO::DEBUGGING << "save latest STCalSkyTable as " << name << "." << LogIO::POST;
     skytables_[skytables_.size()-1]->save(name);

trunk/src/CalibrationManager.h

@@ -55 +55 @@
   
   void calibrate();
-  void apply();
+  void apply(bool insitu=false, bool filltsys=true);
   void saveCaltable(const std::string &name);
   void split(const std::string &name);

trunk/src/STApplyCal.cpp

@@ -168 +168 @@
 {
   os_.origin(LogOrigin("STApplyCal","apply",WHERE));
+  
+  assert(!target_.null());
+
   // calibrator
   if (caltype_ == STCalEnum::CalPSAlma)
@@ -186 +189 @@
 
   // working data
-  if (insitu)
+  if (insitu) {
+    os_.origin(LogOrigin("STApplyCal","apply",WHERE));
+    os_ << "Overwrite input scantable" << LogIO::POST;
     work_ = target_;
-  else
+  }
+  else {
+    os_.origin(LogOrigin("STApplyCal","apply",WHERE));
+    os_ << "Create output scantable from input" << LogIO::POST;
     work_ = new Scantable(*target_, false);
+  }
 
   //os_ << "work_->nrow()=" << work_->nrow() << LogIO::POST;
@@ -219 +228 @@
     Vector<uInt> rows = iter->getRows(SHARE);
     if (rows.nelements() > 0)
-      doapply(ids[0], ids[2], ids[1], rows, skycalList);
+      doapply(ids[0], ids[2], ids[1], rows, skycalList, filltsys);
     iter->next();
   }

trunk/src/STApplyCal.h

@@ -66 +66 @@
 
   // apply tables
-  void apply(casa::Bool insitu=true, casa::Bool filltsys=false);
+  void apply(casa::Bool insitu=false, casa::Bool filltsys=true);
 
   // split target data and store it to disk
@@ -88 +88 @@
                casa::Vector<casa::uInt> &rows,
                casa::Vector<casa::uInt> &skylist,
-               casa::Bool filltsys=false);
+               casa::Bool filltsys=true);
 
   // get frequency information from FREQUENCIES subtable

trunk/src/python_CalibrationManager.cpp

@@ -34 +34 @@
     .def("set_tsys_transfer", &CalibrationManager::setTsysTransfer)
     .def("calibrate", &CalibrationManager::calibrate)
-    .def("apply", &CalibrationManager::apply)
+    .def("apply", &CalibrationManager::apply,
+         (boost::python::arg("insitu")=false,
+          boost::python::arg("filltsys")=true))
     .def("save_caltable", &CalibrationManager::saveCaltable)
     .def("split", &CalibrationManager::split)