Changeset 905 for trunk/src/Scantable.cpp

Timestamp:

03/17/06 17:00:16 (18 years ago)

Author:

mar637

Message:

change default polytype passed as argument to "", to then apply Scantable::poltype if empty.
added poltype to STHeader

File:

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

trunk/src/Scantable.cpp

@@ -298 +298 @@
   table_.rwKeywordSet().define("FluxUnit", sdh.fluxunit);
   table_.rwKeywordSet().define("Epoch", sdh.epoch);
+  table_.rwKeywordSet().define("POLTYPE", sdh.poltype);
 }
 
@@ -319 +320 @@
   table_.keywordSet().get("FluxUnit", sdh.fluxunit);
   table_.keywordSet().get("Epoch", sdh.epoch);
+  table_.keywordSet().get("POLTYPE", sdh.poltype);
   return sdh;
 }
@@ -596 +598 @@
                                            const std::string& poltype ) const
 {
+  String ptype = poltype;
+  if (poltype == "" ) ptype = getPolType();
   if ( whichrow  < 0 || whichrow >= nrow() )
     throw(AipsError("Illegal row number."));
@@ -602 +606 @@
   uInt requestedpol = polCol_(whichrow);
   String basetype = getPolType();
-  if ( String(poltype) == basetype) {
+  if ( ptype == basetype ) {
     specCol_.get(whichrow, arr);
   } else {
@@ -613 +617 @@
       focusTable_.getEntry(frot, fang, ftan, mfocusidCol_(row));
       stpol->setPhaseCorrections(frot, fang, ftan);
-      arr = stpol->getSpectrum(requestedpol, poltype);
+      arr = stpol->getSpectrum(requestedpol, ptype);
       delete stpol;
     } catch (AipsError& e) {