Changeset 437 for trunk/src

Timestamp:

02/14/05 20:09:27 (20 years ago)

Author:

kil064

Message:

make it work for nPol=1,2 or 4

Location:

trunk/src

Files:

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

trunk/src/SDPol.cc

@@ -138 +138 @@
 void SDStokesEngine::getArray (uInt rownr, Array<Float>& output)
 {
-    IPosition inputShape = findInputShape (output.shape());
-    Array<Float> input(inputShape);  
+    Array<Float> input;
     roColumn().get(rownr, input);
 //
@@ -152 +151 @@
 
 
-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)
@@ -183 +173 @@
 
    const uInt nDim = input.ndim();
-   DebugAssert(nDim==4,AipsError);
-   DebugAssert(array.ndim()==4,AipsError);
+   AlwaysAssert(nDim==4,AipsError);
+   AlwaysAssert(output.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);
+   AlwaysAssert(nPol==1 || nPol==2 || nPol==3, AipsError);
 
 // The silly Array slice operator does not give me back
@@ -247 +238 @@
 
 
-
-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

trunk/src/SDPol.h

@@ -116 +116 @@
     static void registerClass();
 
+    // Non writable
+    virtual casa::Bool isWritable () const {return casa::False;}
+
 private:
     // Copy constructor is only used by clone().
@@ -147 +150 @@
                      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);
+    // Get shape
     virtual casa::IPosition shape (casa::uInt rownr);
 
-    // Convert input/output shapes
-    casa::IPosition findInputShape (const casa::IPosition& outputShape) const;
+    // Convert input to output (virtual) shape
     casa::IPosition findOutputShape (const casa::IPosition& inputShape) const;
-