Changeset 2916 for trunk/src/STApplyCal.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/STApplyCal.cpp (modified) (1 diff)

trunk/src/STApplyCal.cpp

@@ -226 +226 @@
   cols[1] = "POLNO" ;
   cols[2] = "IFNO" ;
-  CountedPtr<STIdxIter> iter = new STIdxIterAcc(work_, cols) ;
+  CountedPtr<STIdxIter2> iter = new STIdxIter2(work_, cols) ;
   while (!iter->pastEnd()) {
-    Vector<uInt> ids = iter->current();
+    Record ids = iter->currentValue();
     Vector<uInt> rows = iter->getRows(SHARE);
     if (rows.nelements() > 0)
-      doapply(ids[0], ids[2], ids[1], rows, skycalList, filltsys);
+      doapply(ids.asuInt("BEAMNO"), ids.asuInt("IFNO"), ids.asuInt("POLNO"), rows, skycalList, filltsys);
     iter->next();
   }