Changeset 2911 for trunk/src/STMath.cpp

Timestamp:

04/01/14 13:05:18 (11 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: test_sdcal

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Defined new index iterator class, STIdxIter2.
STIdxIter2 has almost same functionality as STIdxIter and support
various kind of data.

File:

• trunk/src/STMath.cpp (modified) (1 diff)

trunk/src/STMath.cpp

@@ -3621 +3621 @@
     cols[1] = "POLNO" ;
     cols[2] = "IFNO" ;
-    STIdxIter *iter = new STIdxIterAcc( out, cols ) ;
+    STIdxIter2 iter( out, cols ) ;
     STSelector sel ;
-    while ( !iter->pastEnd() ) {
-      Vector<uInt> ids = iter->current() ;
+    while ( !iter.pastEnd() ) {
+      Record ids = iter.currentValue() ;
       stringstream ss ;
       ss << "SELECT FROM $1 WHERE "
-         << "BEAMNO==" << ids[0] << "&&"
-         << "POLNO==" << ids[1] << "&&"
-         << "IFNO==" << ids[2] ;
+         << "BEAMNO==" << ids.asuInt(cols[0]) << "&&"
+         << "POLNO==" << ids.asuInt(cols[1]) << "&&"
+         << "IFNO==" << ids.asuInt(cols[2]) ;
       //cout << "TaQL string: " << ss.str() << endl ;
       sel.setTaQL( ss.str() ) ;
       aoff->setSelection( sel ) ;
-      Vector<uInt> rows = iter->getRows( SHARE ) ;
+      Vector<uInt> rows = iter.getRows( SHARE ) ;
       // out should be an exact copy of s except that SPECTRA column is empty
       calibrateALMA( out, s, aoff, rows ) ;
       aoff->unsetSelection() ;
       sel.reset() ;
-      iter->next() ;
-    }
-    delete iter ;
+      iter.next() ;
+    }
     s->table_ = torg ;
     s->attach() ;