Changeset 2556 for branches

Timestamp:

06/11/12 12:50:34 (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 speed-up of almacal: skip unecessary data copy.

Location:

branches/hpc33

Files:

• python/asapmath.py (modified) (1 diff)
• src/STMath.cpp (modified) (6 diffs)

branches/hpc33/python/asapmath.py

@@ -935 +935 @@
     from asap._asap import stmath
     stm = stmath()
-    ssub = scantab.get_scan( scannos )
-    scal = scantable( stm.almacal( ssub, calmode ) )
+    selection=selector()
+    selection.set_scans(scannos)
+    orig = scantab.get_selection()
+    scantab.set_selection(orig+selection)
+##     ssub = scantab.get_scan( scannos )
+##     scal = scantable( stm.almacal( ssub, calmode ) )
+    scal = scantable( stm.almacal( scantab, calmode ) )
+    scantab.set_selection(orig)
     return scal
 

branches/hpc33/src/STMath.cpp

@@ -3938 +3938 @@
   else {
 //     double t0, t1 ;
-    //    t0 = mathutil::gettimeofday_sec() ;
+//     t0 = mathutil::gettimeofday_sec() ;
     vector<bool> masks = s->getMask( 0 ) ;
-    
+
     // off scan
-    STSelector sel = STSelector() ;
-    vector<int> types( 1, SrcType::PSOFF ) ;
-    //types.push_back( SrcType::PSOFF ) ;
+    STSelector orig = s->getSelection() ;
+    STSelector sel = orig ;
+    vector<int> typesOrig = orig.getTypes() ;
+    vector<int> types = typesOrig ; 
+    types.push_back( SrcType::PSOFF ) ;
     sel.setTypes( types ) ;
     s->setSelection( sel ) ;
@@ -3951 +3953 @@
     // Each group must have own unique SCANNO (should be renumbered).
     // See PIPELINE/SDCalibration.py
-    CountedPtr<Scantable> soff = getScantable( s, false ) ;
-    Table ttab = soff->table() ;
-//     String tmpname = File::newUniqueName( "./", "temp" ).baseName() ;
-//     Table ttab = s->table().copyToMemoryTable( tmpname, False ) ;
+    bool insitu = insitu_ ;
+    insitu_ = false ;
+    // share off scan before average with out
+    CountedPtr<Scantable> out = getScantable( s, false ) ;
+    insitu_ = insitu ;
+    Table ttab = out->table() ;
     ROScalarColumn<Double> *timeCol = new ROScalarColumn<Double>( ttab, "TIME" ) ;
     uInt nrow = timeCol->nrow() ;
@@ -3962 +3966 @@
       timeSep[i] -= timeSep[i-1] ;
     }
-    Vector<Double> interval = soff->integrCol_.getColumn() ;
+    Vector<Double> interval = out->integrCol_.getColumn() ;
     interval /= 86400.0 ;
     Block<uInt> gaplist( 100 ) ;
@@ -3993 +3997 @@
       scnslice = i ;
     }
-    soff->scanCol_.putColumn( newscanno ) ;
-//     cout << "new scancol = " << soff->scanCol_.getColumn() << endl ;
-//    double t2 = mathutil::gettimeofday_sec() ;
-    vector< CountedPtr<Scantable> > tmp( 1, soff ) ;
+    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 ;
-    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 ;
+//     double t3 = mathutil::gettimeofday_sec() ;
+//     cout << "aoff.nrow = " << aoff->nrow() << endl ;
+    sel = orig ;
+//     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() ;
-    bool insitu = insitu_ ;
-    insitu_ = false ;
-    CountedPtr<Scantable> out = getScantable( s, true ) ;
-    insitu_ = insitu ;
-    types[0] = SrcType::PSON ;
+    types[types.size()-1] = SrcType::PSON ;
     sel.setTypes( types ) ;
     s->setSelection( sel ) ;
-    //TableCopy::copyRows( out->table(), s->table() ) ;
-    out->table().addRow( s->nrow() ) ;
+    out->table().addRow( s->nrow()-out->nrow() ) ;
     copyRows( out->table(), s->table(), 0, 0, s->nrow(), False ) ;
-    //s->unsetSelection() ;
     sel.reset() ;
 //     t1 = mathutil::gettimeofday_sec() ;
@@ -4024 +4020 @@
 
     // process each on scan
-    //    t0 = mathutil::gettimeofday_sec() ;
-//     for ( int i = 0 ; i < out->nrow() ; i++ ) {
-//       vector<float> sp = getCalibratedSpectra( out, aoff, i ) ;
-//       out->setSpectrum( sp, i ) ;
-//     }
+//     t0 = mathutil::gettimeofday_sec() ;
 
     // using STIdxIterAcc 
@@ -4054 +4046 @@
     }
     delete iter ;
-    s->unsetSelection() ;
-
-    //    t1 = mathutil::gettimeofday_sec() ;
-    //    cout << "elapsed time for calibration: " << t1-t0 << " sec" << endl ;
+    s->setSelection( orig ) ;
+
+//     t1 = mathutil::gettimeofday_sec() ;
+//     cout << "elapsed time for calibration: " << t1-t0 << " sec" << endl ;
 
     // flux unit