Changeset 2823 for trunk

Timestamp:

07/16/13 12:36:39 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: CAS-5375

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): pipeline

Description: Describe your changes here...

Fixed row number issue in STCalSkyPSAlma.

Location:

trunk/src

Files:

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

trunk/src/STCalSkyOtfAlma.cpp

@@ -28 +28 @@
     : STCalSkyPSAlma(s),
       israster_(israster)
-{}
+{
+  rowNumbers_ = scantable_->table().rowNumbers();
+}
 
 void STCalSkyOtfAlma::setupSelector(const STSelector &sel)
@@ -46 +48 @@
   vector<int> vectorRows(rows.nelements());
   for (size_t i = 0; i < vectorRows.size(); ++i)
-    vectorRows[i] = rows[i];
-
+    vectorRows[i] = rowNumbers_[rows[i]];
+  
   // Set list of row indices to selector
   sel_.setRows(vectorRows);
 }
 
-// void STCalSkyOtfAlma::fillCalTable()
-// {
-//   RowAccumulator acc(W_TINT);
-  
-//   vector<string> cols(3);
-//   cols[0] = "IFNO";
-//   cols[1] = "POLNO";
-//   cols[2] = "BEAMNO";
-//   STIdxIterAcc iter(scantable_, cols);
-
-//   ROScalarColumn<Double> *tcol = new ROScalarColumn<Double>(scantable_->table(), "TIME");
-//   Vector<Double> timeSec = tcol->getColumn() * 86400.0;
-//   tcol->attach(scantable_->table(), "INTERVAL");
-//   Vector<Double> intervalSec = tcol->getColumn();
-//   delete tcol;
-//   ROScalarColumn<Float> *ecol = new ROScalarColumn<Float>(scantable_->table(), "ELEVATION");
-//   Vector<Float> elevation = ecol->getColumn();
-//   delete ecol;
-
-//   ROArrayColumn<Float> specCol(scantable_->table(), "SPECTRA");
-//   ROArrayColumn<uChar> flagCol(scantable_->table(), "FLAGTRA");
-//   ROScalarColumn<uInt> freqidCol(scantable_->table(), "FREQ_ID");
-
-//   // dummy Tsys: the following process doesn't need Tsys but RowAccumulator 
-//   //             requires to set it with spectral data
-//   Vector<Float> tsys(1, 1.0);
-
-//   Double timeCen = 0.0;
-//   Float elCen = 0.0;
-//   uInt count = 0;
-
-//   while(!iter.pastEnd()) {
-//     Vector<uInt> rows = iter.getRows(SHARE);
-//     Vector<uInt> current = iter.current();
-//     uInt len = rows.nelements();
-//     if (len == 0) {
-//       iter.next();
-//       continue;
-//     }
-//     else if (len == 1) {
-//       STCalSkyTable *p = dynamic_cast<STCalSkyTable *>(&(*applytable_));
-//       uInt irow = rows[0];
-//       p->appenddata(0, 0, current[2], current[0], current[1], 
-//                     freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow));
-//       iter.next();
-//       continue;
-//     }
-    
-//     uInt nchan = scantable_->nchan(scantable_->getIF(rows[0]));
-//     Vector<uChar> flag(nchan);
-//     Vector<Bool> bflag(nchan);
-//     Vector<Float> spec(nchan);
-
-//     Vector<Double> timeSep(len); 
-//     for (uInt i = 0; i < len-1; i++) {
-//       timeSep[i] = timeSec[rows[i+1]] - timeSec[rows[i]] ;
-//     }
-//     Double tMedian = median(timeSep(IPosition(1,0), IPosition(1,len-2)));
-//     timeSep[len-1] = tMedian * 10000.0 ; // any large value
-
-//     uInt irow ;
-//     uInt jrow ;
-//     for (uInt i = 0; i < len; i++) {
-//       irow = rows[i];
-//       jrow = (i < len-1) ? rows[i+1] : rows[i];
-//       // accumulate data
-//       flagCol.get(irow, flag);
-//       convertArray(bflag, flag);
-//       specCol.get(irow, spec);
-//       if ( !allEQ(bflag,True) ) 
-//         acc.add( spec, !bflag, tsys, intervalSec[irow], timeSec[irow] ) ;
-//       timeCen += timeSec[irow];
-//       elCen += elevation[irow];
-//       count++;
-
-//       // check time gap
-//       double gap = 2.0 * timeSep[i] / (intervalSec[jrow] + intervalSec[irow]);
-//       if ( gap > 1.1 ) {
-//         if ( acc.state() ) {
-//           acc.replaceNaN() ;
-// //           const Vector<Bool> &msk = acc.getMask();
-// //           convertArray(flag, !msk);
-// //           for (uInt k = 0; k < nchan; ++k) {
-// //             uChar userFlag = 1 << 7;
-// //             if (msk[k]==True) userFlag = 0 << 7;
-// //             flag(k) = userFlag;
-// //           }
-//           timeCen /= (Double)count * 86400.0; // sec->day
-//           elCen /= (Float)count;
-//           STCalSkyTable *p = dynamic_cast<STCalSkyTable *>(&(*applytable_));
-//           p->appenddata(0, 0, current[2], current[0], current[1],
-//                         freqidCol(irow), timeCen, elCen, acc.getSpectrum());
-//         }
-//         acc.reset() ;
-//         timeCen = 0.0;
-//         elCen = 0.0;
-//         count = 0;
-//       }
-//     }
-
-//     iter.next() ;
-//   }
-// }
-
 }

trunk/src/STCalSkyOtfAlma.h

@@ -46 +46 @@
 private:
   bool israster_;
+
+  casa::Vector<casa::uInt> rowNumbers_;
 };