Changeset 459 for trunk/src/SDPol.cc

Timestamp:

02/17/05 01:43:54 (19 years ago)

Author:

kil064

Message:

make templatyed function SDPolUtil::stokesData to handle stokesMask
and stokesTsys calculation. Delete the non-templated versions.

In SDStokesEngone track interface changes in Table system (some bug fixes for me)

Mo

File:

• trunk/src/SDPol.cc (modified) (6 diffs)

trunk/src/SDPol.cc

@@ -57 +57 @@
                            const String& inputColumnName)
 : BaseMappedArrayEngine<Float,Float> (outputColumnName, inputColumnName)
-{}
+{
+   setWritable(False);
+}
 
 
@@ -63 +65 @@
 : BaseMappedArrayEngine<Float,Float> ()
 {
+    setWritable(False);
     if (spec.isDefined("OUTPUTNAME")  &&  spec.isDefined("INPUTNAME")) {
         setNames (spec.asString("OUTPUTNAME"), spec.asString("INPUTNAME"));
@@ -95 +98 @@
 String SDStokesEngine::dataManagerName() const
 {
-    return sourceName();
+    return virtualName();
 }
 
@@ -101 +104 @@
 {
     Record spec;
-    spec.define ("OUTPUTNAME", sourceName());    // Ger uses opposite meaning for source/target
-    spec.define ("INPUTNAME", targetName());
+    spec.define ("OUTPUTNAME", virtualName());
+    spec.define ("INPUTNAME", storedName());
     return spec;
 }
@@ -148 +151 @@
     throw(AipsError("This Virtual Column is not writable"));
 }
-
-
-
 
     
@@ -320 +320 @@
       return Float(0.5)*(I-V);
    }
-}
-
-Array<Bool> SDPolUtil::stokesMask (Array<Bool> rawFlags,
-                                   Bool doLinear)
-//
-// Generate mask for each Stokes parameter from the
-// raw flags.  This is a lot of computational work and may
-// not be worth the effort.
-//
-{
-   IPosition shapeIn = rawFlags.shape();
-   uInt nPol = shapeIn(asap::PolAxis);
-   const uInt nDim = shapeIn.nelements();
-   Array<Bool> stokesFlags;
-//
-   IPosition start(nDim,0);
-   IPosition end(shapeIn-1);
-   IPosition shapeOut = shapeIn;
-//
-   if (doLinear) {
-      if (nPol==1) {
-         stokesFlags.resize(shapeOut);
-         stokesFlags = rawFlags;
-      } else if (nPol==2 || nPol==4) {
-
-// Set shape of output array
-
-         if (nPol==2) {
-            shapeOut(asap::PolAxis) = 1;
-         } else {
-            shapeOut(asap::PolAxis) = 4;
-         }
-         stokesFlags.resize(shapeOut);
-
-// Get reference slices and assign/compute
-
-         start(asap::PolAxis) = 0;
-         end(asap::PolAxis) = 0;
-         Array<Bool> M1In = rawFlags(start,end);
-//
-         start(asap::PolAxis) = 1;
-         end(asap::PolAxis) = 1;
-         Array<Bool> M2In = rawFlags(start,end);
-//
-         start(asap::PolAxis) = 0;
-         end(asap::PolAxis) = 0;
-         Array<Bool> M1Out = stokesFlags(start,end);
-         M1Out = M1In && M2In;                             // I
-//
-         if (nPol==4) {   
-            start(asap::PolAxis) = 2;
-            end(asap::PolAxis) = 2;
-            Array<Bool> M3In = rawFlags(start,end);
-//
-            start(asap::PolAxis) = 3;
-            end(asap::PolAxis) = 3;
-            Array<Bool> M4In = rawFlags(start,end);
-//
-            start(asap::PolAxis) = 1;
-            end(asap::PolAxis) = 1;
-            Array<Bool> M2Out = stokesFlags(start,end);
-            M2Out = M1Out;                                  // Q
-//
-            start(asap::PolAxis) = 2;
-            end(asap::PolAxis) = 2;
-            Array<Bool> M3Out = stokesFlags(start,end);
-            M3Out = M3In;                                   // U
-//
-            start(asap::PolAxis) = 3;
-            end(asap::PolAxis) = 3;
-            Array<Bool> M4Out = stokesFlags(start,end);
-            M4Out = M4In;                                   // V
-         }
-      } else {
-         throw(AipsError("Can only handle 1,2 or 4 polarizations"));
-      }
-   } else {
-      throw (AipsError("Only implemented for Linear polarizations"));
-   }
-//
-   return stokesFlags;
 }