Changeset 1060 for trunk

Timestamp:

06/07/06 16:24:27 (18 years ago)

Author:

mar637

Message:

Tracking changes in PKSreader/writer for MOPS support.

Location:

trunk/src

Files:

• STFiller.cpp (modified) (8 diffs)
• STFiller.h (modified) (1 diff)
• STWriter.cpp (modified) (2 diffs)

trunk/src/STFiller.cpp

@@ -18 +18 @@
 #include <casa/Quanta/Unit.h>
 #include <casa/Arrays/ArrayMath.h>
+#include <casa/Arrays/ArrayLogical.h>
 #include <casa/Utilities/Regex.h>
 
@@ -83 +84 @@
   // Create reader and fill in values for arguments
   String format;
-  Vector<Bool> beams;
-  if ( (reader_ = getPKSreader(inName, 0, 0, format, beams, nIF_,
-                              nChan_, nPol_, haveBase, haveSpectra,
-                              haveXPol_)) == 0 )  {
+  Vector<Bool> beams, ifs;
+  Vector<uInt> nchans,npols;
+  if ( (reader_ = getPKSreader(inName, 0, 0, format, beams, ifs,
+                              nchans, npols, haveXPol_,haveBase, haveSpectra
+                              )) == 0 )  {
     throw(AipsError("Creation of PKSreader failed"));
   }
@@ -95 +97 @@
     return;
   }
-
   nBeam_ = beams.nelements();
+  nIF_ = ifs.nelements();
   // Get basic parameters.
-  if ( haveXPol_ ) {
+  if ( anyEQ(haveXPol_, True) ) {
     pushLog("Cross polarization present");
-    nPol_ += 2;                          // Convert Complex -> 2 Floats
+    for (uInt i=0; i< npols.nelements();++i) {
+      if (npols[i] < 3) npols[i] += 2;// Convert Complex -> 2 Floats
+    }
   }
   if (header_) delete header_;
   header_ = new STHeader();
-  header_->nchan = nChan_;
-  header_->npol = nPol_;
+  header_->nchan = max(nchans);
+  header_->npol = max(npols);
   header_->nbeam = nBeam_;
 
@@ -133 +137 @@
     header_->obstype = String("fswitch");
   }
-
   // Determine Telescope and set brightness unit
 
@@ -147 +150 @@
   // *** header_->frequnit = "Hz"
   // Apply selection criteria.
-
   Vector<Int> ref;
-  Vector<Bool> beamSel(nBeam_,True);
-  Vector<Bool> IFsel(nIF_,True);
-
   ifOffset_ = 0;
   if (whichIF>=0) {
     if (whichIF>=0 && whichIF<nIF_) {
-      IFsel = False;
-      IFsel(whichIF) = True;
+      ifs = False;
+      ifs(whichIF) = True;
       header_->nif = 1;
       nIF_ = 1;
@@ -172 +171 @@
   if (whichBeam>=0) {
     if (whichBeam>=0 && whichBeam<nBeam_) {
-      beamSel = False;
-      beamSel(whichBeam) = True;
+      beams = False;
+      beams(whichBeam) = True;
       header_->nbeam = 1;
       nBeam_ = 1;
@@ -187 +186 @@
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
-  reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol_);
+  reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False);
   table_->setHeader(*header_);
 }
@@ -319 +318 @@
       row.put(table_->table().nrow()-1, rec);
     }
-    if ( haveXPol_ ) {
+    if ( haveXPol_[0] ) {
       // no tsys given for xpol, so emulate it
       tsysvec = sqrt(tsys[0]*tsys[1]);

trunk/src/STFiller.h

@@ -101 +101 @@
   casa::Int nIF_, nBeam_, nPol_, nChan_;
   casa::uInt ifOffset_, beamOffset_;
-  casa::Bool haveXPol_;
+  casa::Vector<casa::Bool> haveXPol_;
 };
 

trunk/src/STWriter.cpp

@@ -131 +131 @@
   // Extract the header from the table.
   STHeader hdr = in->getHeader();
-  const Int nPol  = hdr.npol;
-  const Int nChan = hdr.nchan;
+  //const Int nPol  = hdr.npol;
+  //const Int nChan = hdr.nchan;
+  int nIF = in->nif();
+  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;
+  }
 
   const Table table = in->table();
@@ -140 +148 @@
   // Create the output file and write static data.
   Int status;
-  Bool havexpol = Bool(in->npol() > 2);
-  status = writer_->create(filename, hdr.observer, hdr.project,
+  //Bool havexpol = Bool(in->npol() > 2);
+  status = writer_->create(String(filename), hdr.observer, hdr.project,
                                hdr.antennaname, hdr.antennaposition,
                                hdr.obstype, hdr.equinox, hdr.freqref,
-                               nChan, nPol, False, havexpol);
+                               nChan, nPol, havexpol, False);
   if ( status ) {
     throw(AipsError("Failed to create output file"));