Changeset 2551 for branches

Timestamp:

05/29/12 11:52:20 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4195

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...

Load whole (averaged) off spectra on memory instead to get one spectrum
when it is needed since those are not so heavy. It might reduce number of
call of ArrayColumn::get().

Location:

branches/hpc33/src

Files:

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

branches/hpc33/src/STMath.cpp

@@ -4711 +4711 @@
 }
 
+Vector<Float> STMath::getSpectrumFromTime( double reftime,
+                                           const Vector<Double> &timeVec,
+                                           const Matrix<Float>& spectra,
+                                           string mode ) 
+{
+  LogIO os( LogOrigin( "STMath", "getSpectrumFromTime", WHERE ) ) ;
+  Vector<Float> sp ;
+  uInt ncol = spectra.ncolumn() ;
+
+  if ( ncol == 0 ) {
+    os << LogIO::SEVERE << "No spectra in the input scantable. Return empty spectrum." << LogIO::POST ;
+    return sp ;
+  }
+  else if ( ncol == 1 ) {
+    //os << "use row " << 0 << " (scanno = " << s->getScan( 0 ) << ")" << LogIO::POST ;
+    //s->specCol_.get( 0, sp ) ;
+    sp.reference( spectra.column( 0 ) ) ;
+    return sp ;
+  }
+  else {
+    vector<int> idx = getRowIdFromTime( reftime, timeVec ) ;
+    if ( mode == "before" ) {
+      int id = -1 ;
+      if ( idx[0] != -1 ) {
+        id = idx[0] ;
+      }
+      else if ( idx[1] != -1 ) {
+        os << LogIO::WARN << "Failed to find a scan before reftime. return a spectrum just after the reftime." << LogIO::POST ;
+        id = idx[1] ;
+      }
+      //os << "use row " << id << " (scanno = " << s->getScan( id ) << ")" << LogIO::POST ;
+      //s->specCol_.get( id, sp ) ;
+      //sp = s->getSpectrum( id ) ;
+      sp.reference( spectra.column( id ) ) ;
+    }
+    else if ( mode == "after" ) {
+      int id = -1 ;
+      if ( idx[1] != -1 ) {
+        id = idx[1] ;
+      }
+      else if ( idx[0] != -1 ) {
+        os << LogIO::WARN << "Failed to find a scan after reftime. return a spectrum just before the reftime." << LogIO::POST ;
+        id = idx[1] ;
+      }
+      //os << "use row " << id << " (scanno = " << s->getScan( id ) << ")" << LogIO::POST ;
+      //s->specCol_.get( id, sp ) ;
+      //sp = s->getSpectrum( id ) ;
+      sp.reference( spectra.column( id ) ) ;
+    }
+    else if ( mode == "nearest" ) {
+      int id = -1 ;
+      if ( idx[0] == -1 ) {
+        id = idx[1] ;
+      }
+      else if ( idx[1] == -1 ) {
+        id = idx[0] ;
+      }
+      else if ( idx[0] == idx[1] ) {
+        id = idx[0] ;
+      }
+      else {
+        double t0 = timeVec[idx[0]] ;
+        double t1 = timeVec[idx[1]] ;
+        double tref = reftime ;
+        if ( abs( t0 - tref ) > abs( t1 - tref ) ) {
+          id = idx[1] ;
+        }
+        else {
+          id = idx[0] ;
+        }
+      }
+      //os << "use row " << id << " (scanno = " << s->getScan( id ) << ")" << LogIO::POST ;
+      //s->specCol_.get( id, sp ) ;
+      //sp = s->getSpectrum( id ) ;      
+      sp.reference( spectra.column( id ) ) ;
+    }
+    else if ( mode == "linear" ) {
+      if ( idx[0] == -1 ) {
+        // use after
+        os << LogIO::WARN << "Failed to interpolate. return a spectrum just after the reftime." << LogIO::POST ;
+        int id = idx[1] ;
+        //os << "use row " << id << " (scanno = " << s->getScan( id ) << ")" << LogIO::POST ;
+        //s->specCol_.get( id, sp ) ;
+        //sp = s->getSpectrum( id ) ;
+        sp.reference( spectra.column( id ) ) ;
+      }
+      else if ( idx[1] == -1 ) {
+        // use before
+        os << LogIO::WARN << "Failed to interpolate. return a spectrum just before the reftime." << LogIO::POST ;
+        int id = idx[0] ;
+        //os << "use row " << id << " (scanno = " << s->getScan( id ) << ")" << LogIO::POST ;
+        //s->specCol_.get( id, sp ) ;
+        //sp = s->getSpectrum( id ) ;
+        sp.reference( spectra.column( id ) ) ;
+      }
+      else if ( idx[0] == idx[1] ) {
+        // use before
+        //os << "No need to interporate." << LogIO::POST ;
+        int id = idx[0] ;
+        //os << "use row " << id << " (scanno = " << s->getScan( id ) << ")" << LogIO::POST ;
+        //s->specCol_.get( id, sp ) ;
+        //sp = s->getSpectrum( id ) ;
+        sp.reference( spectra.column( id ) ) ;
+      }
+      else {
+        // do interpolation
+        //os << "interpolate between " << idx[0] << " and " << idx[1] << " (scanno: " << s->getScan( idx[0] ) << ", " << s->getScan( idx[1] ) << ")" << LogIO::POST ;
+        double t0 = timeVec[idx[0]] ;
+        double t1 = timeVec[idx[1]] ;
+        double tref = reftime ;
+        //s->specCol_.get( idx[0], sp ) ;
+        //sp = s->getSpectrum( idx[0] ) ;
+        //vector<float> sp1 = s->getSpectrum( idx[1] ) ;
+        sp = spectra.column( idx[0] ).copy() ;
+        //Vector<Float> sp1 = s->specCol_( idx[1] ) ;
+        Vector<Float> sp1( spectra.column( idx[1] ) ) ;
+        double tfactor = ( tref - t0 ) / ( t1 - t0 ) ;
+        for ( unsigned int i = 0 ; i < sp.size() ; i++ ) {
+          sp[i] = ( sp1[i] - sp[i] ) * tfactor + sp[i] ;
+        }
+      }
+    }
+    else {
+      os << LogIO::SEVERE << "Unknown mode" << LogIO::POST ;
+    }
+    return sp ;
+  }
+}
+
 void STMath::getSpectrumFromTime2( Vector<Float> &sp,
                                    double reftime,
@@ -4895 +5024 @@
 }
 
-vector<int> STMath::getRowIdFromTime( double reftime, Vector<Double> &t )
+vector<int> STMath::getRowIdFromTime( double reftime, const Vector<Double> &t )
 {
 //   double reft = reftime ;

branches/hpc33/src/STMath.h

@@ -404 +404 @@
   vector<float> getSpectrumFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
   casa::Vector<casa::Float> getSpectrumFromTime( double reftime, casa::Vector<casa::Double> &v, const casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
+  casa::Vector<casa::Float> getSpectrumFromTime( double reftime, const casa::Vector<casa::Double> &v, const casa::Matrix<casa::Float>& sp, string mode = "before" ) ;
   void getSpectrumFromTime2( casa::Vector<casa::Float> &sp, double reftime, casa::Vector<casa::Double> &v, const 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" ) ;
   vector<int> getRowIdFromTime( string reftime, casa::CountedPtr<Scantable>& s ) ;
-  vector<int> getRowIdFromTime( double reftime, casa::Vector<casa::Double>& t ) ;
+  vector<int> getRowIdFromTime( double reftime, const casa::Vector<casa::Double>& t ) ;
 
   // Chopper-Wheel type calibration