Changeset 2532 for branches

Timestamp:

05/16/12 14:20:11 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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::almacal.
Reduced a number of call of ScalarColumn?<T>::getColumn().

Location:

branches/hpc33/src

Files:

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

branches/hpc33/src/STMath.cpp

@@ -4510 +4510 @@
 }
 
-vector<float> STMath::getSpectrumFromTime( double reftime, 
+vector<float> STMath::getSpectrumFromTime( double reftime,
+                                           Vector<Double> &timeVec,
                                            CountedPtr<Scantable>& s,
                                            string mode ) 
@@ -4526 +4527 @@
   }
   else {
-    ROScalarColumn<Double> timeCol( s->table(), "TIME" ) ;
-    Vector<Double> timeVec = timeCol.getColumn() ;
+    //ROScalarColumn<Double> timeCol( s->table(), "TIME" ) ;
+    //Vector<Double> timeVec = timeCol.getColumn() ;
     vector<int> idx = getRowIdFromTime( reftime, timeVec ) ;
     if ( mode == "before" ) {
@@ -5066 +5067 @@
 {
 //   string reftime = on->getTime( index ) ;
-  ROTableColumn timeCol( on->table(), "TIME" ) ;
+  ROScalarColumn<Double> timeCol( off->table(), "TIME" ) ;
+  Vector<Double> timeVec = timeCol.getColumn() ;
+  //ROTableColumn timeCol( on->table(), "TIME" ) ;
+  timeCol.attach( on->table(), "TIME" ) ;
   double reftime = timeCol.asdouble(index) ;
   vector<int> ii( 1, on->getIF( index ) ) ;
@@ -5076 +5080 @@
   sel.setPolarizations( ip ) ;
   off->setSelection( sel ) ;
-  vector<float> spoff = getSpectrumFromTime( reftime, off, "linear" ) ;
+  vector<float> spoff = getSpectrumFromTime( reftime, timeVec, off, "linear" ) ;
   vector<float> spec = on->getSpectrum( index ) ;
   //vector<float> tcal = getTcalFromTime( reftime, sky, "linear" ) ;
@@ -5109 +5113 @@
 {
   //   string reftime = on->getTime( index ) ;
-  ROTableColumn timeCol( on->table(), "TIME" ) ;
+  ROScalarColumn<Double> timeCol( off->table(), "TIME" ) ;
+  Vector<Double> timeVec = timeCol.getColumn() ;
+  //ROTableColumn timeCol( on->table(), "TIME" ) ;
+  timeCol.attach( on->table(), "TIME" ) ;
   ArrayColumn<Float> tsysCol( on->table(), "TSYS" ) ;
   vector<float> sp( on->nchan( on->getIF(0) ) ) ;
@@ -5115 +5122 @@
   for ( int index = 0 ; index < on->nrow() ; index++ ) {
     double reftime = timeCol.asdouble(index) ;
-    vector<float> spoff = getSpectrumFromTime( reftime, off, "linear" ) ;
+    vector<float> spoff = getSpectrumFromTime( reftime, timeVec, off, "linear" ) ;
     vector<float> spec = on->getSpectrum( index ) ;
     Vector<Float> tsys = tsysCol( index ) ;
@@ -5142 +5149 @@
 {
 //   string reftime = on->getTime( index ) ;
-  ROTableColumn timeCol( on->table(), "TIME" ) ;
+  ROScalarColumn<Double> timeCol( off->table(), "TIME" ) ;
+  Vector<Double> timeVec = timeCol.getColumn() ;
+  //ROTableColumn timeCol( on->table(), "TIME" ) ;
+  timeCol.attach( on->table(), "TIME" ) ;
   ArrayColumn<Float> tsysCol( on->table(), "TSYS" ) ;
   vector<float> sp( on->nchan( on->getIF(rows[0]) ) ) ;
@@ -5152 +5162 @@
     //double reftime = timeCol.asdouble(index) ;
     double reftime = timeCol.asdouble(*p) ;
-    vector<float> spoff = getSpectrumFromTime( reftime, off, "linear" ) ;
+    vector<float> spoff = getSpectrumFromTime( reftime, timeVec, off, "linear" ) ;
     //vector<float> spec = on->getSpectrum( index ) ;
     //Vector<Float> tsys = tsysCol( index ) ;

branches/hpc33/src/STMath.h

@@ -403 +403 @@
 
   vector<float> getSpectrumFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
-  vector<float> getSpectrumFromTime( double reftime, casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
+  vector<float> getSpectrumFromTime( double reftime, casa::Vector<casa::Double> &v, casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
   vector<float> getTcalFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode="before" ) ;
   vector<float> getTsysFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode="before" ) ;