Changeset 2720 for trunk/src/STCalSkyPSAlma.cpp

Timestamp:

01/09/13 19:27:23 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: Yes

JIRA Issue: Yes CAS-4770 and its sub-tickets

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...

First version of applycal for single dish calibration.
Added new classes for the operation (STApplyCal, Calibrator, PSAlmaCalibrator,
Locator, BisectionLocator?, Interpolator1D, NearestInterpolator1D).
Also, modified existing classes to fit with implementation of applycal.

File:

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

trunk/src/STCalSkyPSAlma.cpp

@@ -26 +26 @@
   : STCalibration(s)
 {
-  applytable_ = new STCalSkyTable(*s, "PS");
+  applytable_ = new STCalSkyTable(*s, "PSALMA");
 }
 
@@ -63 +63 @@
   ROArrayColumn<Float> specCol(scantable_->table(), "SPECTRA");
   ROArrayColumn<uChar> flagCol(scantable_->table(), "FLAGTRA");
+  ROScalarColumn<uInt> freqidCol(scantable_->table(), "FREQ_ID");
 
   // dummy Tsys: the following process doesn't need Tsys but RowAccumulator 
@@ -124 +125 @@
           STCalSkyTable *p = dynamic_cast<STCalSkyTable *>(&(*applytable_));
           p->appenddata(0, 0, current[2], current[0], current[1],
-                        timeCen, elCen, acc.getSpectrum());
+                        freqidCol(irow), timeCen, elCen, acc.getSpectrum());
         }
         acc.reset() ;