Changeset 539 for trunk/src/SDMemTable.cc

Timestamp:

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

Author:

mar637

Message:

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

File:

• trunk/src/SDMemTable.cc (modified) (2 diffs)

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