Changeset 2550 for branches/hpc33/src/STMath.cpp

Timestamp:

05/29/12 11:24:15 (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...

Clean up code.

File:

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

branches/hpc33/src/STMath.cpp

@@ -184 +184 @@
     tout.addRow();
 //     t4 = mathutil::gettimeofday_sec() ;
-    //TableCopy::copyRows(tout, subt, outrowCount, 0, 1);
-    //TableCopy::copyRows(tout, baset, outrowCount, rows[0], 1);
     // skip to copy SPECTRA, FLAGTRA, and TSYS since those heavy columns are 
     // overwritten in the following process
@@ -235 +233 @@
 //     outrowCount += rowNum ;
 
-// merge loop 
+    // merge loop 
     uInt i = outrowCount ;
-//  for (uInt i=0; i < tout.nrow(); ++i) {
-
-    // in[0] is already selected by TableItertor
+    // in[0] is already selected by iterator
     specCol.attach(baset,"SPECTRA");
     flagCol.attach(baset,"FLAGTRA");
@@ -248 +244 @@
     Vector<uChar> flag;
     Double inter,time;
-//     for (uInt k = 0; k < subt.nrow(); ++k ) {
+
     for (uInt l = 0; l < rows.nelements(); ++l ) {
       uInt k = rows[l] ;
@@ -273 +269 @@
     // in[0] is already selected by TableIterator so that index is 
     // started from 1
-    //for ( int j=0; j < int(in.size()); ++j ) {
     for ( int j=1; j < int(in.size()); ++j ) {
       const Table& tin = in[j]->table();
@@ -362 +357 @@
     const Vector<Bool>& msk = acc.getMask();
     if ( allEQ(msk, False) ) {
-      //uint n = rowstodelete.nelements();
-      //rowstodelete.resize(n+1, True);
-      //rowstodelete[n] = i;
       rowstodelB[nrowdel] = i ;
       nrowdel++ ;
@@ -408 +400 @@
   }
 
-  //if (rowstodelete.nelements() > 0) {
   if ( nrowdel > 0 ) {
     Vector<uInt> rowstodelete( IPosition(1,nrowdel), rowstodelB.storage(), SHARE ) ;
@@ -5315 +5306 @@
 }
 
-void STMath::calibrateALMA( CountedPtr<Scantable>& on,
-                            CountedPtr<Scantable>& off )
-{
-  if ( on->nrow() == 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" ) ;
-  ArrayColumn<Float> tsysCol( on->table(), "TSYS" ) ;
-  vector<float> sp( on->nchan( on->getIF(0) ) ) ;
-  unsigned int spsize = sp.size() ;
-  for ( int index = 0 ; index < on->nrow() ; index++ ) {
-    double reftime = timeCol.asdouble(index) ;
-    Vector<Float> spoff = getSpectrumFromTime( reftime, timeVec, off, "linear" ) ;
-    vector<float> spec = on->getSpectrum( index ) ;
-    Vector<Float> tsys = tsysCol( index ) ;
-    // 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 ) ;
-  }
-}
-
-void STMath::calibrateALMA( CountedPtr<Scantable>& on,
-                            CountedPtr<Scantable>& off,
-                            Vector<uInt>& rows )
-{
-  // 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() ;
-  timeCol.attach( on->table(), "TIME" ) ;
-  ArrayColumn<Float> tsysCol( on->table(), "TSYS" ) ;
-  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++ ) {
-    double reftime = timeCol.asdouble(*p) ;
-    Vector<Float> spoff = getSpectrumFromTime( reftime, timeVec, off, "linear" ) ;
-    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, *p ) ;
-    p++ ;
-  }
-}
-
 void STMath::calibrateALMA( CountedPtr<Scantable>& out,
                             const CountedPtr<Scantable>& on,
@@ -5409 +5322 @@
   ROArrayColumn<Float> tsysCol( on->table(), "TSYS" ) ;
   unsigned int spsize = on->nchan( on->getIF(rows[0]) ) ;
-  //Vector<Float> spoff( spsize ) ;
-  //Vector<Float> spec( spsize ) ;
   // I know that the data is contiguous
   const uInt *p = rows.data() ;
@@ -5417 +5328 @@
     Vector<Float> spoff = getSpectrumFromTime( reftime, timeVec, off, "linear" ) ;
     Vector<Float> spec = on->specCol_( *p ) ;
-    //getSpectrumFromTime2( spoff, reftime, timeVec, off, "linear" ) ;
-    //on->specCol_.get( *p, spec ) ;
     Vector<Float> tsys = tsysCol( *p ) ;
     // ALMA Calibration