Changeset 2557 for branches

Timestamp:

06/11/12 17:40:21 (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...

Minor speed-up of STMath::almacal

File:

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

branches/hpc33/src/STMath.cpp

@@ -3943 +3943 @@
     // off scan
     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 ) ;
     // TODO 2010/01/08 TN
     // Grouping by time should be needed before averaging.
@@ -3956 +3950 @@
     insitu_ = false ;
     // share off scan before average with out
-    CountedPtr<Scantable> out = getScantable( s, false ) ;
+    CountedPtr<Scantable> out = getScantable( s, true ) ;
+    Table t = s->table_( s->table_.col("SRCTYPE") == (Int)SrcType::PSOFF ) ;
+    TableCopy::copyRows( out->table(), t ) ;
     insitu_ = insitu ;
     Table ttab = out->table() ;
@@ -4003 +3999 @@
 //     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 ;
@@ -4010 +4005 @@
     // on scan
 //     t0 = mathutil::gettimeofday_sec() ;
-    types[types.size()-1] = SrcType::PSON ;
-    sel.setTypes( types ) ;
-    s->setSelection( sel ) ;
+    s->table_ = s->table_( s->table_.col("SRCTYPE") == (Int)SrcType::PSON ) ;
+    s->attach() ;
     out->table().addRow( s->nrow()-out->nrow() ) ;
     copyRows( out->table(), s->table(), 0, 0, s->nrow(), False ) ;
-    sel.reset() ;
 //     t1 = mathutil::gettimeofday_sec() ;
 //     cout << "elapsed time for preparing output table: " << t1-t0 << " sec" << endl ;
@@ -4028 +4021 @@
     cols[2] = "IFNO" ;
     STIdxIter *iter = new STIdxIterAcc( out, cols ) ;
+    STSelector sel ;
     while ( !iter->pastEnd() ) {
       Vector<uInt> ids = iter->current() ;