Changeset 2938 for trunk/src

Timestamp:

05/02/14 19:43:14 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-6486)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit tests of sdlist

Put in Release Notes: Yes

Module(s): sdlist, scantable.summary()

Description: Modified Frequency listing of Scantable::summary. It now lists channel 0 frequency and IF center frequency, instead of refval and refpix.

File:

• trunk/src/Scantable.cpp (modified) (5 diffs)

trunk/src/Scantable.cpp

@@ -1110 +1110 @@
   Block< Vector<uInt> > ifNos(nfid), polNos(nfid);
   Vector<Int> fIdchans(nfid,-1);
+  Vector<Double> fIdfreq0(nfid,-1);
+  Vector<Double> fIdfcent(nfid,-1);
   map<uInt, Int> fidMap;  // (FREQ_ID, row # in FREQ subtable) pair
   for (Int i=0; i < nfid; i++){
@@ -1189 +1191 @@
       fIdchans(ftabRow)=(*spec).shape()(0);
     }
+    if (fIdfreq0(ftabRow) < 0 ) {
+      SpectralCoordinate spc = frequencies().getSpectralCoordinate(ftabRow);
+      Double fs, fe;
+      spc.toWorld(fs, 0);
+      spc.toWorld(fe, fIdchans(ftabRow)-1);
+      fIdfreq0(ftabRow) = fs;
+      fIdfcent(ftabRow) = 0.5 * ( fs + fe );
+    }
     // Should keep ifNos and polNos form the previous SCANNO
     if ( !anyEQ(ifNos[ftabRow],ifNoCol(0)) ) {
@@ -1227 +1237 @@
         RORecordFieldPtr< Array<Float> > spec(rec, "SPECTRA");
         fIdchans(ftabRow) = (*spec).shape()(0);
+      }
+      if (fIdfreq0(ftabRow) < 0 ) {
+        SpectralCoordinate spc = frequencies().getSpectralCoordinate(ftabRow);
+        Double fs, fe;
+        spc.toWorld(fs, 0);
+        spc.toWorld(fe, fIdchans(ftabRow)-1);
+        fIdfreq0(ftabRow) = fs;
+        fIdfcent(ftabRow) = 5.e-1 * ( fs + fe );
       }
       if ( !anyEQ(ifNos[ftabRow],ifNoCol(i)) ) {
@@ -1274 +1292 @@
   // List FRECUENCIES Table (using STFrequencies.print may be slow)
   oss << "FREQUENCIES: " << nfreq << endl;
-  oss << std::right << setw(5) << "ID" << setw(2) << ""
-      << std::left  << setw(5) << "IFNO" << setw(2) << ""
+//   oss << std::right << setw(5) << "ID" << setw(2) << ""
+//       << std::left  << setw(5) << "IFNO" << setw(2) << ""
+//       << setw(8) << "Frame"
+//       << setw(16) << "RefVal"
+//       << setw(7) << "RefPix"
+//       << setw(15) << "Increment"
+//       << setw(9) << "Channels"
+//       << setw(6) << "POLNOs" << endl;
+//   Int tmplen;
+//   for (Int i=0; i < nfid; i++){
+//     // List row=i of FREQUENCIES subtable
+//     ifNos[i].shape(tmplen);
+//     if (tmplen >= 1) {
+//       oss << std::right << setw(5) << ftabIds(i) << setw(2) << ""
+//        << setw(3) << ifNos[i](0) << setw(1) << ""
+//        << std::left << setw(46) << frequencies().print(ftabIds(i)) 
+//        << setw(2) << ""
+//        << std::right << setw(8) << fIdchans[i] << setw(2) << ""
+//        << std::left << polNos[i];
+//       if (tmplen > 1) {
+//      oss  << " (" << tmplen << " chains)";
+//       }
+//       oss << endl;
+//     }
+  oss << std::right << setw(4) << "ID" << setw(2) << ""
+      << std::left  << setw(9) << "IFNO(SPW)" << setw(2) << ""
+      << setw(8) << "#Chans"
       << setw(8) << "Frame"
-      << setw(16) << "RefVal"
-      << setw(7) << "RefPix"
-      << setw(15) << "Increment"
-      << setw(9) << "Channels"
+      << setw(12) << "Ch0[MHz]"
+      << setw(14) << "ChanWid[kHz]"
+      << setw(14) << "Center[MHz]"
       << setw(6) << "POLNOs" << endl;
   Int tmplen;
@@ -1286 +1328 @@
     // List row=i of FREQUENCIES subtable
     ifNos[i].shape(tmplen);
+    Double refpix, refval, increment ;
     if (tmplen >= 1) {
-      oss << std::right << setw(5) << ftabIds(i) << setw(2) << ""
-          << setw(3) << ifNos[i](0) << setw(1) << ""
-          << std::left << setw(46) << frequencies().print(ftabIds(i)) 
-          << setw(2) << ""
-          << std::right << setw(8) << fIdchans[i] << setw(2) << ""
+      freqTable_.getEntry( refpix, refval, increment, ftabIds(i) ) ;
+      oss << std::right << setw(4) << ftabIds(i) << setw(2) << "" 
+          << std::left << setw(9) << ifNos[i](0) << setw(2) << ""
+          << std::right << setw(6) << fIdchans[i] << setw(2) << ""
+          << setw(6) << frequencies().getFrameString(true)
+          << setw(2) << "" 
+          << setw(10) << std::setprecision(9) << (fIdfreq0[i]*1.e-6) << setw(2) << ""
+          << setw(12) << (increment*1.e-3) << setw(2) << ""
+          << setw(12) << (fIdfcent[i]*1.e-6) << setw(2) << ""
           << std::left << polNos[i];
       if (tmplen > 1) {