Changeset 2544 for branches

Timestamp:

05/22/12 13:07:47 (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...

Updated STMath::almacal to use STMath::copyRows instead of TableCopy::copyRows

Location:

branches/hpc33/src

Files:

• STMath.cpp (modified) (7 diffs)
• STMath.h (modified) (2 diffs)

branches/hpc33/src/STMath.cpp

@@ -3940 +3940 @@
   }
   else {
-    //    double t0, t1 ;
+//     double t0, t1 ;
     //    t0 = mathutil::gettimeofday_sec() ;
     vector<bool> masks = s->getMask( 0 ) ;
@@ -4010 +4010 @@
     
     // on scan
-    //    t0 = mathutil::gettimeofday_sec() ;
+//     t0 = mathutil::gettimeofday_sec() ;
     bool insitu = insitu_ ;
     insitu_ = false ;
@@ -4018 +4018 @@
     sel.setTypes( types ) ;
     s->setSelection( sel ) ;
-    TableCopy::copyRows( out->table(), s->table() ) ;
-    s->unsetSelection() ;
+    //TableCopy::copyRows( out->table(), s->table() ) ;
+    out->table().addRow( s->nrow() ) ;
+    copyRows( out->table(), s->table(), 0, 0, s->nrow(), False ) ;
+    //s->unsetSelection() ;
     sel.reset() ;
-    //    t1 = mathutil::gettimeofday_sec() ;
-    //    cout << "elapsed time for preparing output table: " << t1-t0 << " sec" << endl ;
+//     t1 = mathutil::gettimeofday_sec() ;
+//     cout << "elapsed time for preparing output table: " << t1-t0 << " sec" << endl ;
 
     // process each on scan
@@ -4044 +4046 @@
          << "POLNO==" << ids[1] << "&&"
          << "IFNO==" << ids[2] ;
+      //cout << "TaQL string: " << ss.str() << endl ;
       sel.setTaQL( ss.str() ) ;
       aoff->setSelection( sel ) ;
       Vector<uInt> rows = iter->getRows( SHARE ) ;
-      calibrateALMA( out, aoff, rows ) ;
+      // out should be an exact copy of s except that SPECTRA column is empty
+      calibrateALMA( out, s, aoff, rows ) ;
       aoff->unsetSelection() ;
       sel.reset() ;
@@ -4053 +4057 @@
     }
     delete iter ;
+    s->unsetSelection() ;
 
     //    t1 = mathutil::gettimeofday_sec() ;
@@ -4592 +4597 @@
 vector<float> STMath::getSpectrumFromTime( double reftime,
                                            Vector<Double> &timeVec,
-                                           CountedPtr<Scantable>& s,
+                                           const CountedPtr<Scantable>& s,
                                            string mode ) 
 {
@@ -5273 +5278 @@
 }
 
+void STMath::calibrateALMA( CountedPtr<Scantable>& out,
+                            const CountedPtr<Scantable>& on,
+                            const CountedPtr<Scantable>& off,
+                            Vector<uInt>& rows )
+{
+  // 2012/05/22 TN
+  // Assume that out has empty SPECTRA column
+
+  // if rows is empty, just return
+  if ( rows.nelements() == 0 )
+    return ;
+//   string reftime = on->getTime( index ) ;
+  ROScalarColumn<Double> timeCol( off->table(), "TIME" ) ;
+  Vector<Double> timeVec = timeCol.getColumn() ;
+  //ROTableColumn timeCol( on->table(), "TIME" ) ;
+  timeCol.attach( on->table(), "TIME" ) ;
+  ROArrayColumn<Float> tsysCol( on->table(), "TSYS" ) ;
+  //vector<float> sp( on->nchan( on->getIF(rows[0]) ) ) ;
+  Vector<Float> sp( on->nchan( on->getIF(rows[0]) ) ) ;
+  unsigned int spsize = sp.size() ;
+  // I know that the data is contiguous
+  const uInt *p = rows.data() ;
+  for ( int irow = 0 ; irow < rows.nelements() ; irow++ ) {
+    //int index = rows[irow] ;
+    //double reftime = timeCol.asdouble(index) ;
+    double reftime = timeCol.asdouble(*p) ;
+    vector<float> spoff = getSpectrumFromTime( reftime, timeVec, off, "linear" ) ;
+    //vector<float> spec = on->getSpectrum( index ) ;
+    //Vector<Float> tsys = tsysCol( index ) ;
+    vector<float> spec = on->getSpectrum( *p ) ;
+    Vector<Float> tsys = tsysCol( *p ) ;
+    // ALMA Calibration
+    // 
+    // Ta* = Tsys * ( ON - OFF ) / OFF
+    //
+    // 2010/01/07 Takeshi Nakazato
+    unsigned int tsyssize = tsys.nelements() ;
+    for ( unsigned int j = 0 ; j < sp.size() ; j++ ) {
+      float tscale = 0.0 ;
+      if ( tsyssize == spsize ) 
+        tscale = tsys[j] ;
+      else 
+        tscale = tsys[0] ;
+      float v = tscale * ( spec[j] - spoff[j] ) / spoff[j] ;
+      sp[j] = v ;
+    }
+    //on->setSpectrum( sp, index ) ;
+    //on->setSpectrum( sp, *p ) ;
+    // no check for nchan
+    //Vector<Float> spv( sp ) ;
+    out->specCol_.put( *p, sp ) ;
+    p++ ;
+  }
+}
+
 vector<float> STMath::getFSCalibratedSpectra( CountedPtr<Scantable>& sig,
                                               CountedPtr<Scantable>& ref,

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::Vector<casa::Double> &v, casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
+  vector<float> getSpectrumFromTime( 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" ) ;
@@ -425 +425 @@
   void calibrateALMA( casa::CountedPtr<Scantable>& on,
                       casa::CountedPtr<Scantable>& off,
+                      casa::Vector<casa::uInt>& rows ) ;
+  void calibrateALMA( casa::CountedPtr<Scantable>& out,
+                      const casa::CountedPtr<Scantable>& on,
+                      const casa::CountedPtr<Scantable>& off,
                       casa::Vector<casa::uInt>& rows ) ;
   vector<float> getFSCalibratedSpectra( casa::CountedPtr<Scantable>& sig,