Changeset 2916 for trunk/src/EdgeMarker.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/EdgeMarker.cpp (modified) (2 diffs)

trunk/src/EdgeMarker.cpp

@@ -77 +77 @@
     ROArrayColumn<uChar> flagCol( st_->table(), "FLAGTRA" ) ;
     vector<string> cols( 1, "IFNO" ) ;
-    STIdxIterAcc iter( st_, cols ) ;
+    STIdxIter2 iter( st_, cols ) ;
     while( !iter.pastEnd() ) {
-      uInt current = iter.current()[0] ;
+      uInt current = iter.currentValue().asuInt("IFNO") ;
       uInt firstRow = iter.getRows()[0] ;
       uInt nchan = flagCol( firstRow ).nelements() ;
@@ -110 +110 @@
   cols[2] = "IFNO" ;
   cols[3] = "SRCTYPE" ;
-  STIdxIterExAcc iter( st_, cols ) ;
+  STIdxIter2 iter( st_, cols ) ;
   ROScalarColumn<Double> timeCol( st_->table(), "TIME" ) ;
   ROArrayColumn<Double> directionCol( st_->table(), "DIRECTION" ) ;
   while( !iter.pastEnd() ) {
-    Vector<uInt> current = iter.current() ;
-    Int srcType = iter.getSrcType() ;
+    Record current = iter.currentValue() ;
+    Int srcType = current.asInt("SRCTYPE");
+    uInt ifno = current.asuInt("IFNO");
     os_ << LogIO::DEBUGGING
-        << "BEAMNO=" << current[0] 
-        << " POLNO=" << current[1]
-        << " IFNO=" << current[2]
+        << "BEAMNO=" << current.asuInt("BEAMNO")
+        << " POLNO=" << current.asuInt("POLNO")
+        << " IFNO=" << ifno
         << " SRCTYPE=" << srcType << LogIO::POST ;
     // only process ON position and no WVR
     Vector<uInt> rows = iter.getRows( SHARE ) ;
     uInt nrow = rows.nelements() ;
-    if ( srcType == Int(SrcType::PSON) && allNE( wvr_, current[2] ) && nrow > 0 ) {
+    if ( srcType == Int(SrcType::PSON) && allNE( wvr_, ifno ) && nrow > 0 ) {
       Vector<Double> t( nrow ) ;
       Matrix<Double> d( 2, nrow ) ;