Changeset 2916 for trunk/src/STCalibration.cpp

Timestamp:

04/03/14 13:45:09 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

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

Replaced STIdxIter classes with STIdxIter2 as much as possible.
Also disabled python interface for STIdxIter since the iterator has
a problem.

File:

• trunk/src/STCalibration.cpp (modified) (4 diffs)

trunk/src/STCalibration.cpp

@@ -44 +44 @@
   cols[1] = "POLNO";
   cols[2] = "BEAMNO";
-  STIdxIterAcc iter(scantable_, cols);
+  STIdxIter2 iter(scantable_, cols);
 
   ROScalarColumn<Double> *tcol = new ROScalarColumn<Double>(scantable_->table(), "TIME");
@@ -69 +69 @@
   while(!iter.pastEnd()) {
     Vector<uInt> rows = iter.getRows(SHARE);
-    Vector<uInt> current = iter.current();
+    Record current = iter.currentValue();
     //os_ << "current=" << current << LogIO::POST;
     uInt len = rows.nelements();
@@ -78 +78 @@
     else if (len == 1) {
       uInt irow = rows[0];
-      appenddata(0, 0, current[2], current[0], current[1],
+      appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
                  freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow));
       iter.next();
@@ -126 +126 @@
           timeCen /= (Double)count * 86400.0; // sec->day
           elCen /= (Float)count;
-          appenddata(0, 0, current[2], current[0], current[1],
+          appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
                      freqidCol(irow), timeCen, elCen, acc.getSpectrum());
         }