Changeset 539 for trunk

Timestamp:

03/08/05 15:27:49 (20 years ago)

Author:

mar637

Message:

Reworked stokestopolspectrum to have polIdx=-1 to enable polSel_.

Location:

trunk/src

Files:

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

trunk/src/SDMemTable.cc

@@ -440 +440 @@
 }
 
-std::string SDMemTable::getPolarizationLabel (Bool linear, Bool stokes, Bool linPol, Int polIdx) const
+std::string SDMemTable::getPolarizationLabel(Bool linear, Bool stokes, 
+                                              Bool linPol, Int polIdx) const
 {
    uInt idx = polSel_;   
    if (polIdx >=0) idx = polIdx;
-//
-   return SDPolUtil::polarizationLabel (idx, linear, stokes, linPol);
-}
-
-
-
-std::vector<float> SDMemTable::stokesToPolSpectrum (Int whichRow, Bool toLinear, uInt polIdx) const
+   return SDPolUtil::polarizationLabel(idx, linear, stokes, linPol);
+}
+
+
+
+std::vector<float> SDMemTable::stokesToPolSpectrum(Int whichRow, 
+                                                   Bool toLinear, 
+                                                   Int polIdx) const
 //
 // polIdx
@@ -481 +483 @@
      throw(AipsError("Conversion to linears not yet supported"));
   } else {
-     Bool doRR = (polIdx==0);
-     if(polIdx>1) {
-        throw(AipsError("Only conversion to RR & LL is currently supported"));
-     }
-
-// Get I and V slices
-
-     Array<Float> I = SDPolUtil::getStokesSlice(arr,start,end,"I");
-     Array<Float> V = SDPolUtil::getStokesSlice(arr,start,end,"V");
-
-// Compute output 
-
-     out = SDPolUtil::circularPolarizationFromStokes(I, V, doRR);
-   }
-
-// Copy to output
-
+    uInt selection = polSel_;
+    if (polIdx > -1) selection = polIdx;
+    Bool doRR = (selection==0);
+    if (selection>1) {
+      throw(AipsError("Only conversion to RR & LL is currently supported"));
+    }
+    
+    // Get I and V slices    
+    Array<Float> I = SDPolUtil::getStokesSlice(arr,start,end,"I");
+    Array<Float> V = SDPolUtil::getStokesSlice(arr,start,end,"V");
+    
+    // Compute output     
+    out = SDPolUtil::circularPolarizationFromStokes(I, V, doRR);
+  }
+  
+  // Copy to output
    IPosition vecShape(1,shape(asap::ChanAxis));
    Vector<Float> outV = out.reform(vecShape);

trunk/src/SDMemTable.h

@@ -117 +117 @@
   virtual std::vector<float> stokesToPolSpectrum(casa::Int whichRow,
                                                  casa::Bool toLinear,
-                                                 casa::uInt polIdx) const;
+                                                 casa::Int polIdx) const;
 
   // Get all Stokes at the specified Beam/IF cursor location (ignoring

trunk/src/SDMemTableWrapper.h

@@ -91 +91 @@
   }
 
-  std::vector<float> stokesToPolSpectrum(int whichRow, bool linear,
-                                         int polIdx) const {
+  std::vector<float> stokesToPolSpectrum(int whichRow=0, bool linear=false,
+                                         int polIdx=-1) const {
     return table_->stokesToPolSpectrum(whichRow, linear, polIdx);
   }

trunk/src/python_SDMemTable.cc

@@ -77 +77 @@
          (boost::python::arg("whichRow")=0),
          (boost::python::arg("linear")=false),
-         (boost::python::arg("thepol")=0) )
+         (boost::python::arg("thepol")=-1) )
     .def("_getpolarizationlabel", &SDMemTableWrapper::getPolarizationLabel,
          (boost::python::arg("linear")=false),