Changeset 2524 for branches

Timestamp:

05/15/12 19:00:13 (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...

Minor speedup of the code. Share memory between arrays as much as possible.

Location:

branches/hpc33/src

Files:

• STIdxIter.cpp (modified) (4 diffs)
• STIdxIter.h (modified) (4 diffs)
• STMath.cpp (modified) (6 diffs)

branches/hpc33/src/STIdxIter.cpp

@@ -116 +116 @@
 }
 
-Vector<uInt> ArrayIndexIteratorNormal::getRows()
+Vector<uInt> ArrayIndexIteratorNormal::getRows( StorageInitPolicy policy )
 {
   Vector<uInt> v = current() ;
@@ -130 +130 @@
   pos_m[0] = len ;
   p = storage_m.storage() ;
-  return Vector<uInt>( pos_m, p ) ;
+  return Vector<uInt>( pos_m, p, policy ) ;
 }
 
@@ -159 +159 @@
 }
 
-Vector<uInt> ArrayIndexIteratorAcc::getRows()
+Vector<uInt> ArrayIndexIteratorAcc::getRows( StorageInitPolicy policy )
 {
   Vector<uInt> v = current() ;
@@ -177 +177 @@
   }
   pos_m[0] = len_m[0] ;
-  return Vector<uInt>( pos_m, storage_m.storage() ) ;
+  return Vector<uInt>( pos_m, storage_m.storage(), policy ) ;
 }
 

branches/hpc33/src/STIdxIter.h

@@ -39 +39 @@
   Bool pastEnd() ;
   virtual void next() = 0 ;
-  virtual Vector<uInt> getRows() = 0 ;
+  virtual Vector<uInt> getRows( StorageInitPolicy policy=COPY ) = 0 ;
 protected:
   IndexIterator *iter_m ;
@@ -55 +55 @@
                             vector< vector<uInt> > idlist=vector< vector<uInt> >() ) ;
   void next() ;
-  Vector<uInt> getRows() ;
+  Vector<uInt> getRows( StorageInitPolicy policy=COPY ) ;
 private:
   Block<uInt> storage_m ;
@@ -67 +67 @@
                          vector< vector<uInt> > idlist=vector< vector<uInt> >() ) ;
   void next() ;
-  Vector<uInt> getRows() ;
+  Vector<uInt> getRows( StorageInitPolicy policy=COPY ) ;
 private:
   Int isChanged( Vector<uInt> &idx ) ;
@@ -92 +92 @@
   void next() { iter_m->next() ; } ;
   vector<uInt> getRowsSTL() { return tovector( iter_m->getRows() ) ; } ;
-  Vector<uInt> getRows() { return iter_m->getRows() ; } ;
+  Vector<uInt> getRows( StorageInitPolicy policy=COPY ) { return iter_m->getRows( policy ) ; } ;
 protected:
   ArrayIndexIterator *iter_m ;

branches/hpc33/src/STMath.cpp

@@ -3861 +3861 @@
   }
   else {
-//     double t0 = mathutil::gettimeofday_sec() ;
+//     double t0, t1 ;
+//     t0 = mathutil::gettimeofday_sec() ;
     vector<bool> masks = s->getMask( 0 ) ;
     
@@ -3904 +3905 @@
       }
     }
-    //cout << "gaplist = " << gaplist << endl ;
+    gaplist[glidx] = nrow - 1 ;
+    glidx++ ;
+//     cout << "gaplist = " << Vector<uInt>(IPosition(1,glidx),gaplist.storage()) << endl ;
     uInt newid = 0 ;
-    for ( uInt i = 0 ; i < nrow ; i++ ) {
-      soff->scanCol_.put( i, newid ) ;
-      if ( i == gaplist[newid] ) {
-        newid++ ;
-      }
-    }
-    //cout << "new scancol = " << scanCol.getColumn() << endl ;
+    Vector<uInt> newscanno( nrow, 0 ) ;
+    uInt *p = newscanno.data() ;
+    IPosition pos( 1 ) ;
+    for ( uInt i = 1 ; i < glidx  ; i++ ) {
+      pos[0] = gaplist[i] - gaplist[i-1] ;
+      Vector<uInt> scnslice( pos, p+gaplist[i-1]+1, SHARE ) ;
+      scnslice = i ;
+    }
+    soff->scanCol_.putColumn( newscanno ) ;
+//     cout << "new scancol = " << soff->scanCol_.getColumn() << endl ;
+//     double t2 = mathutil::gettimeofday_sec() ;
     vector< CountedPtr<Scantable> > tmp( 1, soff ) ;
     CountedPtr<Scantable> aoff = average( tmp, masks, "TINT", "SCAN" ) ;
+//     cout << "elapsed time for average(): " << mathutil::gettimeofday_sec()-t2 << " sec" << endl ; 
     //cout << "aoff.nrow = " << aoff->nrow() << endl ;
     s->unsetSelection() ;
     sel.reset() ;
-    //types.clear() ;
-//     double t1 = mathutil::gettimeofday_sec() ;
+//     t1 = mathutil::gettimeofday_sec() ;
 //     cout << "elapsed time for off averaging: " << t1-t0 << " sec" << endl ;
     
@@ -3928 +3935 @@
     CountedPtr<Scantable> out = getScantable( s, true ) ;
     insitu_ = insitu ;
-    //types.push_back( SrcType::PSON ) ;
     types[0] = SrcType::PSON ;
     sel.setTypes( types ) ;
@@ -3935 +3941 @@
     s->unsetSelection() ;
     sel.reset() ;
-    //types.clear() ;
 //     t1 = mathutil::gettimeofday_sec() ;
 //     cout << "elapsed time for preparing output table: " << t1-t0 << " sec" << endl ;
@@ -3961 +3966 @@
       sel.setTaQL( ss.str() ) ;
       aoff->setSelection( sel ) ;
-      Vector<uInt> rows = iter->getRows() ;
+      Vector<uInt> rows = iter->getRows( SHARE ) ;
       calibrateALMA( out, aoff, rows ) ;
       aoff->unsetSelection() ;
@@ -4615 +4620 @@
 //         double tref = getMJD( reftime ) ;
         double tref = reftime ;
-        vector<float> sp0 = s->getSpectrum( idx[0] ) ;
+        sp = s->getSpectrum( idx[0] ) ;
         vector<float> sp1 = s->getSpectrum( idx[1] ) ;
-        sp.resize( sp0.size() ) ;
-        for ( unsigned int i = 0 ; i < sp0.size() ; i++ ) {
-          sp[i] = ( sp1[i] - sp0[i] ) / ( t1 - t0 ) * ( tref - t0 ) + sp0[i] ;
+        double tfactor = ( tref - t0 ) / ( t1 - t0 ) ;
+        for ( unsigned int i = 0 ; i < sp.size() ; i++ ) {
+          sp[i] = ( sp1[i] - sp[i] ) * tfactor + sp[i] ;
         }
       }