Changeset 2750 for trunk/src/CalibrationManager.cpp

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.

File:

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

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