Changeset 905 for trunk/src

Timestamp:

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

Author:

mar637

Message:

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

Location:

trunk/src

Files:

• STFiller.cpp (modified) (2 diffs)
• STHeader.h (modified) (1 diff)
• Scantable.cpp (modified) (5 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/STFiller.cpp

@@ -102 +102 @@
     nPol_ += 2;                          // Convert Complex -> 2 Floats
   }
-
   if (header_) delete header_;
   header_ = new STHeader();
@@ -108 +107 @@
   header_->npol = nPol_;
   header_->nbeam = nBeam_;
+
+  if ( nPol_  == 1 ) header_->poltype = "stokes";
+  else header_->poltype = "linear";
 
   Int status = reader_->getHeader(header_->observer, header_->project,

trunk/src/STHeader.h

@@ -65 +65 @@
   casa::String fluxunit;
   casa::String epoch;
+  casa::String poltype;
   void print() const ;
 };

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) {

trunk/src/Scantable.h

@@ -251 +251 @@
   std::vector<bool> getMask(int whichrow) const;
   std::vector<float> getSpectrum(int whichrow,
-                                 const std::string& poltype ="linear") const;
+                                 const std::string& poltype = "" ) const;
 
   void setSpectrum(const std::vector<float>& spec, int whichrow);

trunk/src/ScantableWrapper.h

@@ -64 +64 @@
 
   std::vector<float> getSpectrum( int whichrow=0,
-                                  const std::string& poltype="linear" ) const {
+                                  const std::string& poltype="" ) const {
     return table_->getSpectrum(whichrow, poltype);
   }

trunk/src/python_Scantable.cpp

@@ -69 +69 @@
     .def("_setInstrument", &ScantableWrapper::setInstrument)
     .def("_getspectrum", &ScantableWrapper::getSpectrum,
-         (arg("whichrow")=0, arg("poltype")=std::string("linear")) )
+         (arg("whichrow")=0, arg("poltype")=std::string("")) )
     .def("poltype", &ScantableWrapper::getPolType )
     .def("_getpollabel", &ScantableWrapper::getPolarizationLabel)