Changeset 2540

Timestamp:

05/21/12 11:43:29 (13 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...

Use STIdxIterExAcc instead of TableIterator.

File:

• branches/hpc33/src/STMath.cpp (modified) (12 diffs)

branches/hpc33/src/STMath.cpp

@@ -83 +83 @@
                  const std::string& avmode)
 {
-  //  double t0, t1 ;
-  //  t0 = mathutil::gettimeofday_sec() ;
+//    double t0, t1 ;
+//    t0 = mathutil::gettimeofday_sec() ;
 
   LogIO os( LogOrigin( "STMath", "average()", WHERE ) ) ;
@@ -137 +137 @@
   Vector<Bool> cmask(mask);
   acc.setUserMask(cmask);
-  ROTableRow row(tout);
+//   ROTableRow row(tout);
   ROArrayColumn<Float> specCol, tsysCol;
   ROArrayColumn<uChar> flagCol;
@@ -145 +145 @@
   Vector<uInt> rowstodelete;
 
-  Block<String> cols(3);
+//   Block<String> cols(3);
+  vector<string> cols(3) ;
   cols[0] = String("BEAMNO");
   cols[1] = String("IFNO");
@@ -161 +162 @@
   }
   uInt outrowCount = 0;
-  TableIterator iter(baset, cols);
+  // use STIdxIterExAcc instead of TableIterator
+  STIdxIterExAcc iter( in[0], cols ) ;
+//   TableIterator iter(baset, cols);
 //   int count = 0 ;
   while (!iter.pastEnd()) {
-    Table subt = iter.table();
+    Vector<uInt> rows = iter.getRows( SHARE ) ;
+    if ( rows.nelements() == 0 ) {
+      iter.next() ;
+      continue ;
+    }
+    Vector<uInt> current = iter.current() ;
+    String srcname = iter.getSrcName() ;
+    //Table subt = iter.table();
     // copy the first row of this selection into the new table
     tout.addRow();
-    TableCopy::copyRows(tout, subt, outrowCount, 0, 1);
+    //TableCopy::copyRows(tout, subt, outrowCount, 0, 1);
+    TableCopy::copyRows(tout, baset, outrowCount, rows[0], 1);
     // re-index to 0
     if ( avmode != "SCAN" && avmode != "SOURCE" ) {
       scanColOut.put(outrowCount, uInt(0));
     }
-    /*
-    ++outrowCount;
-    */
+
     // 2012/02/17 TN
     // Since STGrid is implemented, average doesn't consider direction 
@@ -214 +223 @@
 //     }
 //     outrowCount += rowNum ;
-/*
-    ++iter;
-  }
-  RowAccumulator acc(wtype);
-  Vector<Bool> cmask(mask);
-  acc.setUserMask(cmask);
-  ROTableRow row(tout);
-  ROArrayColumn<Float> specCol, tsysCol;
-  ROArrayColumn<uChar> flagCol;
-  ROScalarColumn<Double> mjdCol, intCol;
-  ROScalarColumn<Int> scanIDCol;
-
-  Vector<uInt> rowstodelete;
-*/
 
 // merge loop 
@@ -234 +229 @@
 
     // in[0] is already selected by TableItertor
-    specCol.attach(subt,"SPECTRA");
-    flagCol.attach(subt,"FLAGTRA");
-    tsysCol.attach(subt,"TSYS");
-    intCol.attach(subt,"INTERVAL");
-    mjdCol.attach(subt,"TIME");
+//     specCol.attach(subt,"SPECTRA");
+//     flagCol.attach(subt,"FLAGTRA");
+//     tsysCol.attach(subt,"TSYS");
+//     intCol.attach(subt,"INTERVAL");
+//     mjdCol.attach(subt,"TIME");
+    specCol.attach(baset,"SPECTRA");
+    flagCol.attach(baset,"FLAGTRA");
+    tsysCol.attach(baset,"TSYS");
+    intCol.attach(baset,"INTERVAL");
+    mjdCol.attach(baset,"TIME");
     Vector<Float> spec,tsys;
     Vector<uChar> flag;
     Double inter,time;
-    for (uInt k = 0; k < subt.nrow(); ++k ) {
+//     for (uInt k = 0; k < subt.nrow(); ++k ) {
+    for (uInt l = 0; l < rows.nelements(); ++l ) {
+      uInt k = rows[l] ;
       flagCol.get(k, flag);
       Vector<Bool> bflag(flag.shape());
@@ -266 +268 @@
     acc.replaceNaN();
 
-    // in[0] is already selected by TableIterator so that it is not necessary to process 
-    // in[0] here
+    // in[0] is already selected by TableIterator so that index is 
+    // started from 1
     //for ( int j=0; j < int(in.size()); ++j ) {
     for ( int j=1; j < int(in.size()); ++j ) {
       const Table& tin = in[j]->table();
-      const TableRecord& rec = row.get(i);
+      //const TableRecord& rec = row.get(i);
       ROScalarColumn<Double> tmp(tin, "TIME");
       Double td;tmp.get(0,td);
@@ -277 +279 @@
 #if 1
       static char const*const colNames1[] = { "IFNO", "BEAMNO", "POLNO" };
-      uInt const values1[] = { rec.asuInt("IFNO"), rec.asuInt("BEAMNO"), rec.asuInt("POLNO") };
+      //uInt const values1[] = { rec.asuInt("IFNO"), rec.asuInt("BEAMNO"), rec.asuInt("POLNO") };
+      uInt const values1[] = { current[1], current[0], current[2] };
       SingleTypeEqPredicate<uInt, 3> myPred(tin, colNames1, values1);
       CustomTableExprNodeRep myNodeRep(tin, myPred);
@@ -284 +287 @@
       Table basesubt = tin(myExpr);
 #else
-      Table basesubt = tin( tin.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
-                         && tin.col("IFNO") == Int(rec.asuInt("IFNO"))
-                         && tin.col("POLNO") == Int(rec.asuInt("POLNO")) );
+//       Table basesubt = tin( tin.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
+//                          && tin.col("IFNO") == Int(rec.asuInt("IFNO"))
+//                          && tin.col("POLNO") == Int(rec.asuInt("POLNO")) );
+      Table basesubt = tin( tin.col("BEAMNO") == current[0]
+                         && tin.col("IFNO") == current[1]
+                         && tin.col("POLNO") == current[2] );
 #endif
-      //      Table subt;
+      Table subt;
       if ( avmode == "SOURCE") {
-        subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME"));
+//         subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME"));
+        subt = basesubt( basesubt.col("SRCNAME") == srcname );
+
       } else if (avmode == "SCAN") {
-        subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME") 
-                      && basesubt.col("SCANNO") == Int(rec.asuInt("SCANNO")) );
+//         subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME") 
+//                    && basesubt.col("SCANNO") == Int(rec.asuInt("SCANNO")) );
+        subt = basesubt( basesubt.col("SRCNAME") == srcname 
+                      && basesubt.col("SCANNO") == current[4] );
       } else {
         subt = basesubt;
@@ -327 +337 @@
       intCol.attach(subt,"INTERVAL");
       mjdCol.attach(subt,"TIME");
-      Vector<Float> spec,tsys;
-      Vector<uChar> flag;
-      Double inter,time;
+//       Vector<Float> spec,tsys;
+//       Vector<uChar> flag;
+//       Double inter,time;
       for (uInt k = 0; k < subt.nrow(); ++k ) {
         flagCol.get(k, flag);
@@ -389 +399 @@
     // merge with while loop for preparing out table
     ++outrowCount;
-    ++iter ;
+//     ++iter ;
+    iter.next() ;
   }
 
@@ -400 +411 @@
   }
 
-  //  t1 = mathutil::gettimeofday_sec() ;
-  //  cout << "elapsed time for average(): " << t1-t0 << " sec" << endl ;
+//    t1 = mathutil::gettimeofday_sec() ;
+//    cout << "elapsed time for average(): " << t1-t0 << " sec" << endl ;
 
   return out;