Changeset 2539 for branches

Timestamp:

05/20/12 17:05:33 (12 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...

Speedup STMath::average(). Duplicated data selection for first input table
is removed by merging TableIterator? loop with for loop over the rows for
output table.

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() ;
+
   LogIO os( LogOrigin( "STMath", "average()", WHERE ) ) ;
   if ( avmode == "SCAN" && in.size() != 1 )
@@ -131 +134 @@
   const Table& baset = in[0]->table();
 
+  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;
+
   Block<String> cols(3);
   cols[0] = String("BEAMNO");
@@ -158 +172 @@
       scanColOut.put(outrowCount, uInt(0));
     }
+    /*
     ++outrowCount;
+    */
     // 2012/02/17 TN
     // Since STGrid is implemented, average doesn't consider direction 
@@ -198 +214 @@
 //     }
 //     outrowCount += rowNum ;
+/*
     ++iter;
   }
@@ -210 +227 @@
 
   Vector<uInt> rowstodelete;
-
-  for (uInt i=0; i < tout.nrow(); ++i) {
-    for ( int j=0; j < int(in.size()); ++j ) {
+*/
+
+// merge loop 
+    uInt i = outrowCount ;
+//  for (uInt i=0; i < tout.nrow(); ++i) {
+
+    // 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");
+    Vector<Float> spec,tsys;
+    Vector<uChar> flag;
+    Double inter,time;
+    for (uInt k = 0; k < subt.nrow(); ++k ) {
+      flagCol.get(k, flag);
+      Vector<Bool> bflag(flag.shape());
+      convertArray(bflag, flag);
+      /*                                                                                                   
+        if ( allEQ(bflag, True) ) {                                                                          
+        continue;//don't accumulate                                                                          
+        }                                                                                                    
+      */
+      specCol.get(k, spec);
+      tsysCol.get(k, tsys);
+      intCol.get(k, inter);
+      mjdCol.get(k, time);
+      // spectrum has to be added last to enable weighting by the other values                             
+      acc.add(spec, !bflag, tsys, inter, time);
+    }
+
+    // If there exists a channel at which all the input spectra are masked,                                
+    // spec has 'nan' values for that channel and it may affect the following                              
+    // processes. To avoid this, replacing 'nan' values in spec with                                       
+    // weighted-mean of all spectra in the following line.                                                 
+    // (done for CAS-2776, 2011/04/07 by Wataru Kawasaki)                                                  
+    acc.replaceNaN();
+
+    // in[0] is already selected by TableIterator so that it is not necessary to process 
+    // in[0] here
+    //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);
@@ -231 +288 @@
                          && tin.col("POLNO") == Int(rec.asuInt("POLNO")) );
 #endif
-      Table subt;
+      //      Table subt;
       if ( avmode == "SOURCE") {
         subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME"));
@@ -329 +386 @@
     }
     acc.reset();
+
+    // merge with while loop for preparing out table
+    ++outrowCount;
+    ++iter ;
   }
 
@@ -338 +399 @@
     }
   }
+
+  //  t1 = mathutil::gettimeofday_sec() ;
+  //  cout << "elapsed time for average(): " << t1-t0 << " sec" << endl ;
+
   return out;
 }
@@ -3861 +3926 @@
   }
   else {
-//     double t0, t1 ;
-//     t0 = mathutil::gettimeofday_sec() ;
+    //    double t0, t1 ;
+    //    t0 = mathutil::gettimeofday_sec() ;
     vector<bool> masks = s->getMask( 0 ) ;
     
@@ -3919 +3984 @@
     soff->scanCol_.putColumn( newscanno ) ;
 //     cout << "new scancol = " << soff->scanCol_.getColumn() << endl ;
-//     double t2 = mathutil::gettimeofday_sec() ;
+//    double t2 = mathutil::gettimeofday_sec() ;
     vector< CountedPtr<Scantable> > tmp( 1, soff ) ;
     CountedPtr<Scantable> aoff = average( tmp, masks, "TINT", "SCAN" ) ;
-//     double t3 = mathutil::gettimeofday_sec() ;
+    //    double t3 = mathutil::gettimeofday_sec() ;
     //cout << "aoff.nrow = " << aoff->nrow() << endl ;
     s->unsetSelection() ;
     sel.reset() ;
-//     t1 = mathutil::gettimeofday_sec() ;
-//     cout << "elapsed time for off averaging: " << t1-t0 << " sec" << endl ;
-//     cout << "   elapsed time for average(): " << t3-t2 << " sec" << endl ;
+    //    t1 = mathutil::gettimeofday_sec() ;
+    //    cout << "elapsed time for off averaging: " << t1-t0 << " sec" << endl ;
+    //    cout << "   elapsed time for average(): " << t3-t2 << " sec" << endl ;
     
     // on scan
-//     t0 = mathutil::gettimeofday_sec() ;
+    //    t0 = mathutil::gettimeofday_sec() ;
     bool insitu = insitu_ ;
     insitu_ = false ;
@@ -3942 +4007 @@
     s->unsetSelection() ;
     sel.reset() ;
-//     t1 = mathutil::gettimeofday_sec() ;
-//     cout << "elapsed time for preparing output table: " << t1-t0 << " sec" << endl ;
+    //    t1 = mathutil::gettimeofday_sec() ;
+    //    cout << "elapsed time for preparing output table: " << t1-t0 << " sec" << endl ;
 
     // process each on scan
-//     t0 = mathutil::gettimeofday_sec() ;
+    //    t0 = mathutil::gettimeofday_sec() ;
 //     for ( int i = 0 ; i < out->nrow() ; i++ ) {
 //       vector<float> sp = getCalibratedSpectra( out, aoff, i ) ;
@@ -3975 +4040 @@
     delete iter ;
 
-//     t1 = mathutil::gettimeofday_sec() ;
-//     cout << "elapsed time for calibration: " << t1-t0 << " sec" << endl ;
+    //    t1 = mathutil::gettimeofday_sec() ;
+    //    cout << "elapsed time for calibration: " << t1-t0 << " sec" << endl ;
 
     // flux unit