Changeset 2750 for trunk/src/STApplyCal.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/STApplyCal.cpp (modified) (3 diffs)

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