Changeset 1293 for branches

Timestamp:

11/06/06 21:54:21 (18 years ago)

Author:

mar637

Message:

Fix for Ticket #89. subselections of IFs weren't handled correctly.
PKSwriter needs Full IF table, can't handle e.g. just IF2.

Location:

branches/Release2.1.1/src

Files:

• STAsciiWriter.cpp (modified) (1 diff)
• STWriter.cpp (modified) (5 diffs)

branches/Release2.1.1/src/STAsciiWriter.cpp

@@ -109 +109 @@
     String fName = rootName + String(onstr) + String(".txt");
     ofstream of(fName.chars(), ios::trunc);
-    int row0 = t.rowNumbers()[0];
+    int row0 = t.rowNumbers(tab)[0];
     MDirection mdir = stable.getDirection(row0);
     of << setfill('#') << setw(70) << "" << setfill(' ') << endl;

branches/Release2.1.1/src/STWriter.cpp

@@ -119 +119 @@
   //const Int nPol  = hdr.npol;
   //const Int nChan = hdr.nchan;
-  int nIF = in->nif();
+  std::vector<uint> ifs = in->getIFNos();
+  int nIF = in->nif();//ifs.size();
   Vector<uInt> nPol(nIF),nChan(nIF);
   Vector<Bool> havexpol(nIF);
-  for (int i=0;i<nIF;++i) {
-    nPol(i) = in->npol();
-    nChan(i) = in->nchan(i);
-    havexpol(i) = nPol(i) > 2;
+  nPol = 0;nChan = 0; havexpol = False;
+  for (int i=0;i<ifs.size();++i) {
+    nPol(ifs[i]) = in->npol();
+    nChan(ifs[i]) = in->nchan(ifs[i]);
+    havexpol(ifs[i]) = nPol(ifs[i]) > 2;
   }
 
@@ -170 +172 @@
       ROScalarColumn<Double> svelCol(btable, "SRCVELOCITY");
       svelCol.get(0, srcVel);
+      ROScalarColumn<uInt> bCol(btable, "BEAMNO");
+      beamno = bCol(0)+1;
       Int cycno = 1;
       while (!cycit.pastEnd() ) {
@@ -181 +185 @@
           const TableRecord& rec = row.get(0);
           ROArrayColumn<Float> specCol(itable, "SPECTRA");
+          ifno = rec.asuInt("IFNO")+1;
           uInt nchan = specCol(0).nelements();
           Double cdelt,crval,crpix, restfreq;
@@ -244 +249 @@
           }
           ++count;
-          ++ifno;
+          //++ifno;
           ++ifit;
         }
@@ -250 +255 @@
         ++cycit;
       }
-      ++beamno;
+      //++beamno;
       ++beamit;
     }