Changeset 427 for trunk/src

Timestamp:

02/14/05 15:51:11 (20 years ago)

Author:

kil064

Message:

Now handle 1,2 or 4 input polarizations in SDStokesEngine

Location:

trunk/src

Files:

• SDPol.cc (modified) (6 diffs)
• SDPol.h (modified) (2 diffs)

trunk/src/SDPol.cc

@@ -31 +31 @@
 
 #include "SDPol.h"
+#include "SDDefs.h"
 
 #include <casa/Arrays/Array.h>
@@ -52 +53 @@
 
 
-SDStokesEngine::SDStokesEngine (const String& sourceColumnName,
-                           const String& targetColumnName)
-
-: BaseMappedArrayEngine<Float,Float> (sourceColumnName, targetColumnName)
+SDStokesEngine::SDStokesEngine (const String& outputColumnName,
+                           const String& inputColumnName)
+: BaseMappedArrayEngine<Float,Float> (outputColumnName, inputColumnName)
 {}
 
@@ -62 +62 @@
 : BaseMappedArrayEngine<Float,Float> ()
 {
-    if (spec.isDefined("SOURCENAME")  &&  spec.isDefined("TARGETNAME")) {
-        setNames (spec.asString("SOURCENAME"), spec.asString("TARGETNAME"));
+    if (spec.isDefined("OUTPUTNAME")  &&  spec.isDefined("INPUTNAME")) {
+        setNames (spec.asString("OUTPUTNAME"), spec.asString("INPUTNAME"));
     }
 }
@@ -100 +100 @@
 {
     Record spec;
-    spec.define ("SOURCENAME", sourceName());
-    spec.define ("TARGETNAME", targetName());
+    spec.define ("OUTPUTNAME", sourceName());    // Ger uses opposite meaning for source/target
+    spec.define ("INPUTNAME", targetName());
     return spec;
 }
@@ -136 +136 @@
 
 
-void SDStokesEngine::getArray (uInt rownr, Array<Float>& array)
-{
-    Array<Float> target(array.shape());
-    roColumn().get(rownr, target);
-//
-    computeOnGet (array, target);
-}
-
-void SDStokesEngine::putArray (uInt rownr, const Array<Float>& array)
+void SDStokesEngine::getArray (uInt rownr, Array<Float>& output)
+{
+    IPosition inputShape = findInputShape (output.shape());
+    Array<Float> input(inputShape);  
+    roColumn().get(rownr, input);
+//
+    computeOnGet (output, input);
+}
+
+void SDStokesEngine::putArray (uInt rownr, const Array<Float>& input)
 {
     throw(AipsError("This Virtual Column is not writable"));
@@ -151 +152 @@
 
 
-void SDStokesEngine::computeOnGet(Array<Float>& array,
-                                 const Array<Float>& target)
+void SDStokesEngine::setShape (uInt rownr, const IPosition& outputShape)   
+{   
+    BaseMappedArrayEngine<Float,Float>::setShape (rownr, findInputShape(outputShape));
+}
+  
+void SDStokesEngine::setShapeColumn (const IPosition& outputShape)
+{
+    BaseMappedArrayEngine<Float,Float>::setShapeColumn (findInputShape(outputShape));
+}
+      
+    
+IPosition SDStokesEngine::shape (uInt rownr)
+{
+   IPosition inputShape = roColumn().shape (rownr);
+   return findOutputShape(inputShape);
+}
+
+
+
+void SDStokesEngine::computeOnGet(Array<Float>& output,
+                                 const Array<Float>& input)
 //
 // array of shape (nBeam,nIF,nPol,nChan)
 //
 {
-   DebugAssert(target.ndim()==4,AipsError);
+
+// Checks
+
+   const uInt nDim = input.ndim();
+   DebugAssert(nDim==4,AipsError);
    DebugAssert(array.ndim()==4,AipsError);
+   const IPosition inputShape = input.shape();
+   const uInt polAxis = asap::PolAxis;
+   const uInt nPol = inputShape(polAxis);
+   DebugAssert(nPol==1 || nPol==2 || nPol==3, AipsError);
 
 // The silly Array slice operator does not give me back
 // a const reference so have to caste it away
 
-   Array<Float>& target2 = const_cast<Array<Float>&>(target);
-
-// uInt polAxis = asap::PolAxis;
-   uInt polAxis = 2;
-//
-   const uInt nDim = target.ndim();
+   Array<Float>& input2 = const_cast<Array<Float>&>(input);
+
+// Slice coordnates
+
    IPosition start(nDim,0);
-   IPosition end(target.shape()-1);
-
-// Input slices
+   IPosition end(input.shape()-1);
+
+// Generate Slices
 
    start(polAxis) = 0;
    end(polAxis) = 0;
-   Array<Float> C1 = target2(start,end);
+   Array<Float> C1 = input2(start,end);          // Input : C1
+//
+   start(polAxis) = 0;
+   end(polAxis) = 0;
+   Array<Float> I = output(start,end);           // Output : I
+//
+   if (nPol==1) {
+      I = C1;
+      return;
+   }
 //
    start(polAxis) = 1;
    end(polAxis) = 1;
-   Array<Float> C2 = target2(start,end);
+   Array<Float> C2 = input2(start,end);          // Input : C1
+//
+   I = Float(0.5)*(C1 + C2);
+   if (nPol <= 2) return;
 //
    start(polAxis) = 2;
    end(polAxis) = 2;
-   Array<Float> C3 = target2(start,end);
+   Array<Float> C3 = input2(start,end);          // Input : C3
 //
    start(polAxis) = 3;
    end(polAxis) = 3;
-   Array<Float> C4 = target2(start,end);
-
-// Compute Output slices
-
-   start(polAxis) = 0;
-   end(polAxis) = 0;
-   Array<Float> I = array(start,end); 
-   I = Float(0.5)*(C1 + C2);
+   Array<Float> C4 = input2(start,end);          // Input : C4
 //
    start(polAxis) = 1;
    end(polAxis) = 1;
-   Array<Float> Q = array(start,end); 
+   Array<Float> Q = output(start,end);           // Output : Q
    Q = Float(0.5)*(C1 - C2);
 //
    start(polAxis) = 2;
    end(polAxis) = 2;
-   Array<Float> U = array(start,end); 
+   Array<Float> U = output(start,end);           // Output : U
    U = C3;
 //
    start(polAxis) = 3;
    end(polAxis) = 3;
-   Array<Float> V = array(start,end); 
+   Array<Float> V = output(start,end);           // Output : V
    V = C4;
 }
 
+
+
+IPosition SDStokesEngine::findInputShape (const IPosition& outputShape) const
+//
+// Don't know how to handle the degeneracy that both
+// XX    -> I
+// XX,YY -> I
+// 
+{
+   uInt axis = asap::PolAxis;
+   uInt nPol = outputShape(axis);
+   IPosition inputShape = outputShape;
+   if (nPol==1) {
+      inputShape(axis) = 2;            // XX YY -> I
+   } else if (nPol==4) {
+      inputShape(axis) = 4;            // XX YY R(XY) I(XY) -> I Q U V
+   }
+   return inputShape;
+}
+
+IPosition SDStokesEngine::findOutputShape (const IPosition& inputShape) const
+{
+   uInt axis = 2;
+   uInt nPol = inputShape(axis);
+   IPosition outputShape = inputShape;
+   if (nPol==1) {
+      outputShape(axis) = 1;            // XX -> I
+   } else if (nPol==2) {
+      outputShape(axis) = 1;            // XX YY -> I
+   } else if (nPol==4) {
+      outputShape(axis) = 4;            // XX YY R(XY) I(XY) -> I Q U V
+   }
+   return outputShape;
+}
 
 

trunk/src/SDPol.h

@@ -69 +69 @@
 
 public:
-    // Construct an engine to scale all arrays in a column with
-    // the given offset and scale factor.
-    // TargetColumnName is the name of the column where the scaled
-    // data will be put and must have data type Float.
-    // The source column using this engine must have data type Float.
-    SDStokesEngine (const casa::String& sourceColumnName,
-               const casa::String& targetColumnName);
+    // Construct engine.  The sourveColumnName holds the XX,YY,R(XY),I(XY)
+    // correlations
+    SDStokesEngine (const casa::String& virtualColumnName,
+               const casa::String& sourceColumnName);
 
     // Construct from a record specification as created by getmanagerSpec().
@@ -131 +128 @@
     void getArray (casa::uInt rownr, casa::Array<casa::Float>& array);
 
-    // Excpetion
+    // Exception
     void putArray (casa::uInt rownr, const casa::Array<casa::Float>& array);
 
-    // Compute STokes parameters
+    // Compute Stokes parameters
     void computeOnGet (casa::Array<casa::Float>& array,
                      const casa::Array<casa::Float>& target);
+
+    // Set shapes
+    virtual void setShape (casa::uInt rownr, const casa::IPosition& outputShape);
+    virtual void setShapeColumn (const casa::IPosition& outputShape);
+    virtual casa::IPosition shape (casa::uInt rownr);
+
+    // Convert input/output shapes
+    casa::IPosition findInputShape (const casa::IPosition& outputShape) const;
+    casa::IPosition findOutputShape (const casa::IPosition& inputShape) const;
+