Changeset 441 for trunk

Timestamp:

02/15/05 11:21:48 (20 years ago)

Author:

kil064

Message:

add stokesConversion to function rowAsMaskedArray

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -712 +712 @@
                                                 Bool toStokes) const 
 {
+
+// Get flags
+
+  Array<uChar> farr;
+  flagsCol_.get(whichRow, farr);
+
+// Get data and convert mask
+
   Array<Float> arr;
-  Array<uChar> farr;
+  Array<Bool> mask;
+  uInt polSel = polSel_;
   if (toStokes) {
      stokesCol_.get(whichRow, arr);
+//
+     Array<Bool> tMask(farr.shape());
+     convertArray(tMask, farr);
+     mask = SDPolUtil::stokesMask (tMask, True);
+//
+     IPosition shape = arr.shape();
+     uInt nPol = shape(asap::PolAxis);
+     if (nPol<=2) polSel = 0;             // XX and XX,YY -> I
   } else {
      specCol_.get(whichRow, arr);
-  }
-  flagsCol_.get(whichRow, farr);
-  Array<Bool> barr(farr.shape());
-  convertArray(barr, farr);
+     mask.resize(farr.shape());
+     convertArray(mask, farr);
+  }
+//
   MaskedArray<Float> marr;
   if (useSelection) {
@@ -729 +746 @@
     aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
     ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
-    aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
-
-    ArrayAccessor<Bool, Axis<asap::BeamAxis> > baa0(barr);
+    aa2.reset(aa2.begin(uInt(polSel)));// go to pol
+
+    ArrayAccessor<Bool, Axis<asap::BeamAxis> > baa0(mask);
     baa0.reset(baa0.begin(uInt(beamSel_)));//go to beam
     ArrayAccessor<Bool, Axis<asap::IFAxis> > baa1(baa0);
     baa1.reset(baa1.begin(uInt(IFSel_)));// go to IF
     ArrayAccessor<Bool, Axis<asap::PolAxis> > baa2(baa1);
-    baa2.reset(baa2.begin(uInt(polSel_)));// go to pol
+    baa2.reset(baa2.begin(uInt(polSel)));// go to pol
 
     Vector<Float> a(arr.shape()(3));
-    Vector<Bool> b(barr.shape()(3));
+    Vector<Bool> b(mask.shape()(3));
     ArrayAccessor<Float, Axis<asap::BeamAxis> > a0(a);
     ArrayAccessor<Bool, Axis<asap::BeamAxis> > b0(b);
@@ -754 +771 @@
     marr.setData(a,b);
   } else {
-    marr.setData(arr,!barr);
+    marr.setData(arr,!mask);
   }
   return marr;

trunk/src/SDMemTable.h

@@ -111 +111 @@
                                                casa::Float paOffset=0.0) const;
 
-  // Get RR or LL at cursor location (not polSel_)
+  // Get RR or LL at cursor location (except not polSel_)
   virtual std::vector<float> getCircularSpectrum(casa::Int whichRow=0, 
                                                  casa::Bool rr=casa::True) const;