Changeset 2742 for trunk/src/STApplyCal.cpp

Timestamp:

01/22/13 19:01:34 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

Interface Changes: Yes/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...

Defined python interface for calibration that supports both
on-the-fly and interferometry-style (generate caltable and apply)
calibration.

File:

• trunk/src/STApplyCal.cpp (modified) (5 diffs)

trunk/src/STApplyCal.cpp

@@ -65 +65 @@
   caltype_ = STCalEnum::NoType;
   doTsys_ = False;
+  iTime_ = STCalEnum::DefaultInterpolation;
+  iFreq_ = STCalEnum::DefaultInterpolation;
 }
 
 void STApplyCal::reset()
 {
+  // call init
+  init();
+
+  // clear apply tables
+  // do not delete object here
+  skytable_.resize(0);
+  tsystable_.resize(0);
+
+  // clear mapping for Tsys transfer
+  spwmap_.clear();
+
+  // reset selector
+  sel_.reset();
+  
+  // delete interpolators
+  interpolatorT_ = 0;
+  interpolatorS_ = 0;
+  interpolatorF_ = 0;
+
+  // clear working scantable
+  work_ = 0;
+  
+  // clear calibrator
+  calibrator_ = 0;
 }
 
@@ -139 +165 @@
 }
 
-void STApplyCal::apply(Bool insitu)
+void STApplyCal::apply(Bool insitu, Bool filltsys)
 {
   os_.origin(LogOrigin("STApplyCal","apply",WHERE));
@@ -202 +228 @@
 void STApplyCal::doapply(uInt beamno, uInt ifno, uInt polno, 
                          Vector<uInt> &rows,
-                         Vector<uInt> &skylist)
+                         Vector<uInt> &skylist, 
+                         Bool filltsys)
 {
   os_.origin(LogOrigin("STApplyCal","doapply",WHERE));
@@ -379 +406 @@
     //os_ << "calibrated=" << calibrator_->getCalibrated() << LogIO::POST; 
     spCol.put(irow, calibrator_->getCalibrated());
-    tsysCol.put(irow, iTsys);
+    if (filltsys)
+      tsysCol.put(irow, iTsys);
   }
   
@@ -421 +449 @@
 void STApplyCal::save(const String &name)
 {
-  if (work_.null())
-    return;
+  assert(!work_.null());
 
   work_->setSelection(sel_);