Changeset 447 for trunk

Timestamp:

02/15/05 18:39:32 (20 years ago)

Author:

kil064

Message:

remove arg 'useSelection ' from rowAsmAskedArray as it
is never used and doesn't do the right thing and
that wrong thing is avaikable in getSpectrum !

Location:

trunk/src

Files:

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

trunk/src/SDMemTable.cc

@@ -307 +307 @@
 }
 
-std::vector<bool> SDMemTable::getMask(Int whichRow) const {
+std::vector<bool> SDMemTable::getMask(Int whichRow) const 
+{
+
   std::vector<bool> mask;
+//
   Array<uChar> arr;
   flagsCol_.get(whichRow, arr);
+//
   ArrayAccessor<uChar, Axis<asap::BeamAxis> > aa0(arr);
   aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
@@ -429 +433 @@
   Vector<Float> outV = out.reform(vecShape);
   return convertVector(outV);
-}
-
-std::vector<float> SDMemTable::getFloatSpectrum (const Array<Float>& arr) const
-//
-// Get spectrum at cursor location
-//
-{
-
-// Iterate and extract
-
-  ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
-  aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-  ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
-  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
-//
-  std::vector<float> spectrum;
-  for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
-    spectrum.push_back(*i);
-  }
-  return spectrum;
 }
 
@@ -638 +620 @@
   }
 
+// Setup accessors
+
   ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
-  aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
+  aa0.reset(aa0.begin(uInt(beamSel_)));                   // Beam selection
   ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
-  aa1.reset(aa1.begin(uInt(IFSel_)));// go to IF
+  aa1.reset(aa1.begin(uInt(IFSel_)));                     // IF selection
   ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
-  aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
+  aa2.reset(aa2.begin(uInt(polSel_)));                    // Pol selection
+
+// Iterate
 
   std::vector<float>::iterator it = spectrum.begin();
@@ -709 +695 @@
 }
 */
-MaskedArray<Float> SDMemTable::rowAsMaskedArray(uInt whichRow, Bool useSelection,
-                                                Bool toStokes) const 
+
+MaskedArray<Float> SDMemTable::rowAsMaskedArray(uInt whichRow, Bool toStokes) const 
 {
 
@@ -718 +704 @@
   flagsCol_.get(whichRow, farr);
 
-// Get data and convert mask
+// Get data and convert mask to Bool
 
   Array<Float> arr;
   Array<Bool> mask;
-  uInt polSel = polSel_;
   if (toStokes) {
      stokesCol_.get(whichRow, arr);
@@ -729 +714 @@
      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);
@@ -739 +720 @@
   }
 //
-  MaskedArray<Float> marr;
-  if (useSelection) {
-    ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
-    aa0.reset(aa0.begin(uInt(beamSel_)));//go to beam
-    ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
-    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(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
-
-    Vector<Float> a(arr.shape()(3));
-    Vector<Bool> b(mask.shape()(3));
-    ArrayAccessor<Float, Axis<asap::BeamAxis> > a0(a);
-    ArrayAccessor<Bool, Axis<asap::BeamAxis> > b0(b);
-
-    ArrayAccessor<Bool, Axis<asap::ChanAxis> > j(baa2);
-    for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); 
-         i != i.end(); ++i) {
-      (*a0) = (*i);
-      (*b0) = !(*j);
-      j++;
-      a0++;
-      b0++;
-    }
-    marr.setData(a,b);
-  } else {
-    marr.setData(arr,!mask);
-  }
-  return marr;
+  return MaskedArray<Float>(arr,!mask);
 }
 
@@ -1708 +1655 @@
 }
 
+
+std::vector<float> SDMemTable::getFloatSpectrum (const Array<Float>& arr) const
+//
+// Get spectrum at cursor location
+//
+{
+
+// Setup accessors
+
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(arr);
+  aa0.reset(aa0.begin(uInt(beamSel_)));                    // Beam selection
+
+  ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
+  aa1.reset(aa1.begin(uInt(IFSel_)));                      // IF selection
+
+  ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
+  aa2.reset(aa2.begin(uInt(polSel_)));                     // Pol selection
+//
+  std::vector<float> spectrum;
+  for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
+    spectrum.push_back(*i);
+  }
+  return spectrum;
+}
+

trunk/src/SDMemTable.h

@@ -205 +205 @@
   // return a row as a Masked array, internally converting uChar flags
   // to bool mask
-  casa::MaskedArray<casa::Float> rowAsMaskedArray(casa::uInt whichRow,
-                                                  casa::Bool useSelection = 
-                                                  casa::False, casa::Bool
-                                                  toStokes=casa::False) const;
+  casa::MaskedArray<casa::Float> rowAsMaskedArray(casa::uInt whichRow, 
+                                                  casa::Bool toStokes=casa::False) const;
 
   // Return SC, setting only the basic construction state (i.e.