Changeset 494 for trunk/src

Timestamp:

02/21/05 18:05:58 (20 years ago)

Author:

kil064

Message:

rework bindings for stokes conversion and associated functions

Location:

trunk/src

Files:

• SDMemTableWrapper.h (modified) (2 diffs)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDMemTableWrapper.h

@@ -85 +85 @@
     return table_->getSpectrum(whichRow);
   }
-
-  std::vector<float> getStokesSpectrum(int whichRow=0, bool doPol=false, 
+//
+  std::vector<float> getStokesSpectrum(int whichRow=0, bool linPol=false, 
                                        float paOff=0.0) const {
-    return table_->getStokesSpectrum(whichRow, doPol, paOff);
-  }
-
-  std::vector<float> getCircularSpectrum(int whichRow=0, 
-                                         bool doRR=true) const {
-    return table_->getCircularSpectrum(whichRow, doRR);
-  }
-
+    return table_->getStokesSpectrum(whichRow, linPol, paOff);
+  }
+
+  std::vector<float> stokesToPolSpectrum (int whichRow, bool linear,
+                                          int polIdx) const {
+    return table_->stokesToPolSpectrum(whichRow, linear, polIdx);
+  }
+
+//  std::string getPolarizationLabel (bool linear, bool stokes, bool linPol, int polIdx) const {
+// Boost fails with 4 arguments.
+  std::string getPolarizationLabel (bool linear, bool stokes, bool linPol) const {
+     int polIdx = -1;
+     return table_->getPolarizationLabel (linear, stokes, linPol, polIdx);
+  }
+//
   std::vector<double> getAbcissa(int whichRow=0) const {
     return table_->getAbcissa(whichRow);
@@ -151 +158 @@
   int nScan() {return table_->nScan();}
   int nRow() {return table_->nRow();}
+  int nStokes() {return table_->nStokes();}
 
   //sets the mask

trunk/src/python_SDMemTable.cc

@@ -70 +70 @@
     .def("_getspectrum", &SDMemTableWrapper::getSpectrum,
          (boost::python::arg("whichRow")=0))
+    .def("nstokes", &SDMemTableWrapper::nStokes)
     .def("_getstokesspectrum", &SDMemTableWrapper::getStokesSpectrum,
          (boost::python::arg("whichRow")=0),
-         (boost::python::arg("pol")=false),
+         (boost::python::arg("linpol")=false),
          (boost::python::arg("pa")=0.0) )
-    .def("_getcircularspectrum", &SDMemTableWrapper::getCircularSpectrum,
+    .def("_stokestopolspectrum", &SDMemTableWrapper::stokesToPolSpectrum,
          (boost::python::arg("whichRow")=0),
-         (boost::python::arg("rr")=true))
+         (boost::python::arg("linear")=false),
+         (boost::python::arg("thepol")=0) )
+    .def("_getpolarizationlabel", &SDMemTableWrapper::getPolarizationLabel,
+         (boost::python::arg("linear")=false),
+         (boost::python::arg("stokes")=false),
+         (boost::python::arg("linpol")=false) )
+//         (boost::python::arg("thepol")=0) )        // Boost fails with 4 arguments
     .def("_setspectrum",&SDMemTableWrapper::setSpectrum,
          (boost::python::arg("whichRow")=0) )