Changeset 420 for trunk

Timestamp:

02/14/05 12:36:38 (20 years ago)

Author:

kil064

Message:

handle cross polarization

Location:

trunk/src

Files:

• SDReader.cc (modified) (8 diffs)
• SDReader.h (modified) (1 diff)

trunk/src/SDReader.cc

@@ -48 +48 @@
   header_(0),
   frequencies_(0),
-  table_(new SDMemTable()) {
+  table_(new SDMemTable()),
+  haveXPol_(False)
+{
   cursor_ = 0;
 }
@@ -56 +58 @@
   header_(0),
   frequencies_(0),
-  table_(new SDMemTable()) {
+  table_(new SDMemTable()),
+  haveXPol_(False)
+{
   cursor_ = 0;
   open(filename, whichIF, whichBeam);
@@ -64 +68 @@
   reader_(0),
   header_(0),
-  table_(tbl) {
+  table_(tbl),
+  haveXPol_(False)
+{
   cursor_ = 0;
 }
@@ -88 +94 @@
                     int whichIF, int whichBeam) {
   if (reader_) delete reader_; reader_ = 0;
-  Bool   haveBase, haveSpectra, haveXPol;
+  Bool   haveBase, haveSpectra;
 
   String inName(filename);
@@ -105 +111 @@
   if ((reader_ = getPKSreader(inName, 0, False, format, beams, nIF_,
                               nChan_, nPol_, haveBase, haveSpectra,
-                              haveXPol)) == 0)  {
+                              haveXPol_)) == 0)  {
     throw(AipsError("Creation of PKSreader failed"));
   }
@@ -117 +123 @@
   nBeam_ = beams.nelements();
   // Get basic parameters.
-  if (haveXPol) {
-    cout << "Warning. Ignoring cross polarisation." << endl;
-    nPol_--;    
-  }
+  if (haveXPol_) {
+    cout << "Cross polarization present" << endl;
+    nPol_ += 2;                          // Convert Complex -> 2 Floats
+  }
+
   if (header_) delete header_;
   header_ = new SDHeader();
@@ -193 +200 @@
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
-  reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol);
+  reader_->select(beamSel, IFsel, start, end, ref, True, haveXPol_);
   table_->putSDHeader(*header_);
 
@@ -288 +295 @@
         sc.refbeam = refBeam-1;//make it 0-based; -1 if nbeams == 1
         sc.scanid = scanNo-1;//make it 0-based
-        sc.setSpectrum(spectra, beamNo, IFno);
-        sc.setFlags(flagtra,  beamNo, IFno);
-        sc.setTsys(tsys, beamNo, IFno);
+        if (haveXPol_) {
+           sc.setSpectrum(spectra, xPol, beamNo, IFno);
+           sc.setFlags(flagtra,  beamNo, IFno, True);
+        } else {
+           sc.setSpectrum(spectra, beamNo, IFno);
+           sc.setFlags(flagtra,  beamNo, IFno, False);
+        }
+        sc.setTsys(tsys, beamNo, IFno, haveXPol_);
         sc.setDirection(direction, beamNo);
       }

trunk/src/SDReader.h

@@ -85 +85 @@
   casa::Double timestamp_;
   casa::uInt beamOffset_, ifOffset_;
+  casa::Bool haveXPol_;
 };