Changeset 2560 for branches

Timestamp:

06/11/12 20:27:09 (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...

Minimize data copy in STMath::almacal

Location:

branches/hpc33/src

Files:

• STMath.cpp (modified) (3 diffs)
• STMath.h (modified) (1 diff)

branches/hpc33/src/STMath.cpp

@@ -3952 +3952 @@
     CountedPtr<Scantable> out = getScantable( s, true ) ;
     Table t = s->table_( s->table_.col("SRCTYPE") == (Int)SrcType::PSOFF ) ;
-    TableCopy::copyRows( out->table(), t ) ;
+    //TableCopy::copyRows( out->table(), t ) ;
+    out->table_ = t ;
+    out->attach() ;
     insitu_ = insitu ;
-    Table ttab = out->table() ;
-    ROScalarColumn<Double> *timeCol = new ROScalarColumn<Double>( ttab, "TIME" ) ;
-    uInt nrow = timeCol->nrow() ;
-    Vector<Double> timeSep = timeCol->getColumn() ;
-    delete timeCol ;
-    for ( uInt i = nrow-2 ; i > 0 ; i-- ) {
-      timeSep[i] -= timeSep[i-1] ;
-    }
-    Vector<Double> interval = out->integrCol_.getColumn() ;
-    interval /= 86400.0 ;
-    uInt *newscan = new uInt[nrow] ;
-    Vector<uInt> newscanno( IPosition(1,nrow), newscan, TAKE_OVER ) ; 
-    uInt *p = newscan ;
-    uInt newid = 0 ;
-    for ( uInt i = 0 ; i < nrow - 1 ; i++ ) {
-      *p = newid ;
-      double gap = 2.0 * timeSep[i+1] / ( interval[i] + interval[i+1] ) ;
-      //cout << "gap[" << i << "]=" << setw(5) << gap << endl ;
-      if ( gap > 1.1 ) {
-//         cout << "detected gap between " << i << " and " << i+1 << endl ;
-        newid++ ;
-      }
-      p++ ;
-    }
-    *p = newid ;
-    out->scanCol_.putColumn( newscanno ) ;
-//     double t2 = mathutil::gettimeofday_sec() ;
-    vector< CountedPtr<Scantable> > tmp( 1, out ) ;
-    CountedPtr<Scantable> aoff = average( tmp, masks, "TINT", "SCAN" ) ;
-//     double t3 = mathutil::gettimeofday_sec() ;
-//     cout << "aoff.nrow = " << aoff->nrow() << endl ;
+    CountedPtr<Scantable> aoff = averageWithinSession( out, 
+                                                       masks,
+                                                       "TINT" ) ;
+//     Table ttab = out->table() ;
+//     ROScalarColumn<Double> *timeCol = new ROScalarColumn<Double>( ttab, "TIME" ) ;
+//     uInt nrow = timeCol->nrow() ;
+//     Vector<Double> timeSep = timeCol->getColumn() ;
+//     delete timeCol ;
+//     for ( uInt i = nrow-2 ; i > 0 ; i-- ) {
+//       timeSep[i] -= timeSep[i-1] ;
+//     }
+//     Vector<Double> interval = out->integrCol_.getColumn() ;
+//     interval /= 86400.0 ;
+//     uInt *newscan = new uInt[nrow] ;
+//     Vector<uInt> newscanno( IPosition(1,nrow), newscan, TAKE_OVER ) ; 
+//     uInt *p = newscan ;
+//     uInt newid = 0 ;
+//     for ( uInt i = 0 ; i < nrow - 1 ; i++ ) {
+//       *p = newid ;
+//       double gap = 2.0 * timeSep[i+1] / ( interval[i] + interval[i+1] ) ;
+//       //cout << "gap[" << i << "]=" << setw(5) << gap << endl ;
+//       if ( gap > 1.1 ) {
+// //         cout << "detected gap between " << i << " and " << i+1 << endl ;
+//         newid++ ;
+//       }
+//       p++ ;
+//     }
+//     *p = newid ;
+//     out->scanCol_.putColumn( newscanno ) ;
+//     vector< CountedPtr<Scantable> > tmp( 1, out ) ;
+//     CountedPtr<Scantable> aoff = average( tmp, masks, "TINT", "SCAN" ) ;
 //     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
@@ -3993 +3994 @@
     s->table_ = s->table_( s->table_.col("SRCTYPE") == (Int)SrcType::PSON ) ;
     s->attach() ;
-    out->table().addRow( s->nrow()-out->nrow() ) ;
+    //out->table().addRow( s->nrow()-out->nrow() ) ;
+    out->table_ = out->originalTable_ ;
+    out->attach() ;
+    out->table().addRow( s->nrow() ) ;
     copyRows( out->table(), s->table(), 0, 0, s->nrow(), False ) ;
 //     t1 = mathutil::gettimeofday_sec() ;
@@ -5586 +5590 @@
   }
 }
+
+CountedPtr<Scantable> STMath::averageWithinSession( CountedPtr<Scantable> &s,
+                                                    vector<bool> &mask,
+                                                    string weight )
+{
+    Table ttab = s->table() ;
+    ROScalarColumn<Double> *timeCol = new ROScalarColumn<Double>( ttab, "TIME" ) ;
+    uInt nrow = timeCol->nrow() ;
+    Vector<Double> timeSep = timeCol->getColumn() ;
+    delete timeCol ;
+    for ( uInt i = nrow-2 ; i > 0 ; i-- ) {
+      timeSep[i] -= timeSep[i-1] ;
+    }
+    Vector<Double> interval = s->integrCol_.getColumn() ;
+    interval /= 86400.0 ;
+    uInt *newscan = new uInt[nrow] ;
+    Vector<uInt> newscanno( IPosition(1,nrow), newscan, TAKE_OVER ) ; 
+    uInt *p = newscan ;
+    uInt newid = 0 ;
+    for ( uInt i = 0 ; i < nrow - 1 ; i++ ) {
+      *p = newid ;
+      double gap = 2.0 * timeSep[i+1] / ( interval[i] + interval[i+1] ) ;
+      //cout << "gap[" << i << "]=" << setw(5) << gap << endl ;
+      if ( gap > 1.1 ) {
+//         cout << "detected gap between " << i << " and " << i+1 << endl ;
+        newid++ ;
+      }
+      p++ ;
+    }
+    *p = newid ;
+    s->scanCol_.putColumn( newscanno ) ;
+//     double t2 = mathutil::gettimeofday_sec() ;
+    vector< CountedPtr<Scantable> > tmp( 1, s ) ;
+    CountedPtr<Scantable> a = average( tmp, mask, weight, "SCAN" ) ;
+//     double t3 = mathutil::gettimeofday_sec() ;
+//     cout << "a.nrow = " << a->nrow() << endl ;
+//     t1 = mathutil::gettimeofday_sec() ;
+//     cout << "   elapsed time for average(): " << t3-t2 << " sec" << endl ;
+    return a ;
+}

branches/hpc33/src/STMath.h

@@ -448 +448 @@
                  casa::Bool copyFlagtra=true, 
                  casa::Bool copyTsys=true ) ; 
+  casa::CountedPtr<Scantable> averageWithinSession( casa::CountedPtr<Scantable> &s,
+                                                    vector<bool> &mask,
+                                                    string weight ) ;
 
   bool insitu_;