Changeset 2542 for branches/hpc33/src/STMath.cpp

Timestamp:

05/22/12 10:17:06 (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...

More speedup of STMath::average().

• Reduced number of call of RowAccumulator::replaceNaN().
• Performance of RowAccumulator::add() is improved.

File:

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

branches/hpc33/src/STMath.cpp

@@ -164 +164 @@
   // use STIdxIterExAcc instead of TableIterator
   STIdxIterExAcc iter( in[0], cols ) ;
+//   double t2 = 0 ;
+//   double t3 = 0 ;
 //   TableIterator iter(baset, cols);
 //   int count = 0 ;
@@ -229 +231 @@
 
     // 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(baset,"SPECTRA");
     flagCol.attach(baset,"FLAGTRA");
@@ -258 +255 @@
       mjdCol.get(k, time);
       // spectrum has to be added last to enable weighting by the other values                             
+//       t2 = mathutil::gettimeofday_sec() ;
       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();
+//       t3 += mathutil::gettimeofday_sec() - t2 ;
+      
+    }
+
 
     // in[0] is already selected by TableIterator so that index is 
@@ -337 +331 @@
       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);
@@ -354 +345 @@
         mjdCol.get(k, time);
         // spectrum has to be added last to enable weighting by the other values
+//         t2 = mathutil::gettimeofday_sec() ;
         acc.add(spec, !bflag, tsys, inter, time);
-      }
-
+//         t3 += mathutil::gettimeofday_sec() - t2 ;
+      }
+
+    }
+    const Vector<Bool>& msk = acc.getMask();
+    if ( allEQ(msk, False) ) {
+      uint n = rowstodelete.nelements();
+      rowstodelete.resize(n+1, True);
+      rowstodelete[n] = i;
+      continue;
+    }
+    //write out
+    if (acc.state()) {
       // 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 
@@ -363 +366 @@
       // (done for CAS-2776, 2011/04/07 by Wataru Kawasaki)
       acc.replaceNaN();
-    }
-    const Vector<Bool>& msk = acc.getMask();
-    if ( allEQ(msk, False) ) {
-      uint n = rowstodelete.nelements();
-      rowstodelete.resize(n+1, True);
-      rowstodelete[n] = i;
-      continue;
-    }
-    //write out
-    if (acc.state()) {
+
       Vector<uChar> flg(msk.shape());
       convertArray(flg, !msk);
@@ -413 +407 @@
 //    t1 = mathutil::gettimeofday_sec() ;
 //    cout << "elapsed time for average(): " << t1-t0 << " sec" << endl ;
+//    cout << "   elapsed time for acc.add(): " << t3 << " sec" << endl ;
 
   return out;