Changeset 167 for trunk

Timestamp:

12/27/04 22:14:55 (20 years ago)

Author:

kil064

Message:

Reimplement 'bin' with insitu version as well

Location:

trunk

Files:

• python/asapmath.py (modified) (1 diff)
• src/SDMath.cc (modified) (3 diffs)
• src/SDMath.h (modified) (2 diffs)
• src/SDMathWrapper.h (modified) (3 diffs)
• src/python_SDMath.cc (modified) (1 diff)

trunk/python/asapmath.py

@@ -89 +89 @@
         return
         
-def bin(scan, binwidth=5):
+def bin(scan, width=5, insitu=False):
     """
+    Return a scan where all spectra have been binned up
+        width        The bin width (default=5) in pixels
+        insitu:      if False (default) a new scantable is returned.
+                     Otherwise, the addition is done in-situ
     """
-    from asap._asap import bin as _bin
-    return scantable(_bin(scan, binwidth))
+    if not insitu:
+        from asap._asap import bin as _bin
+        return scantable(_bin(scan, width))
+    else:
+        from asap._asap import bin_insitu as _bin
+        _bin(scan, width)
+        return
 
 def average_pol(scan, mask=None, insitu=False):

trunk/src/SDMath.cc

@@ -462 +462 @@
 }
 
-CountedPtr<SDMemTable> SDMath::bin(const CountedPtr<SDMemTable>& in,
-                                   Int width) 
-{
-  SDHeader sh = in->getSDHeader();
-  SDMemTable* sdmt = new SDMemTable(*in,True);
-
-// Bin up SpectralCoordinates
-
-  IPosition factors(1);
-  factors(0) = width;
-  for (uInt j=0; j<in->nCoordinates(); ++j) {
-    CoordinateSystem cSys;
-    cSys.addCoordinate(in->getCoordinate(j));
-    CoordinateSystem cSysBin = 
-      CoordinateUtil::makeBinnedCoordinateSystem (factors, cSys, False);
-//
-    SpectralCoordinate sCBin = cSysBin.spectralCoordinate(0);
-    sdmt->setCoordinate(sCBin, j);
-  }
-
-// Use RebinLattice to find shape
-
-  IPosition shapeIn(1,sh.nchan);
-  IPosition shapeOut = RebinLattice<Float>::rebinShape (shapeIn, factors);
-  sh.nchan = shapeOut(0);
-  sdmt->putSDHeader(sh);
-
-
-// Loop over rows and bin along channel axis
-  
-  const uInt axis = 3;
-  for (uInt i=0; i < in->nRow(); ++i) {
-    SDContainer sc = in->getSDContainer(i);
-//
-    Array<Float> tSys(sc.getTsys());                           // Get it out before sc changes shape
-
-// Bin up spectrum
-
-    MaskedArray<Float> marr(in->rowAsMaskedArray(i));
-    MaskedArray<Float> marrout;
-    LatticeUtilities::bin(marrout, marr, axis, width);
-
-// Put back the binned data and flags
-
-    IPosition ip2 = marrout.shape();
-    sc.resize(ip2);
-//
-    putDataInSDC (sc, marrout.getArray(), marrout.getMask());
-
-// Bin up Tsys.  
-
-    Array<Bool> allGood(tSys.shape(),True);
-    MaskedArray<Float> tSysIn(tSys, allGood, True);
-//
-    MaskedArray<Float> tSysOut;    
-    LatticeUtilities::bin(tSysOut, tSysIn, axis, width);
-    sc.putTsys(tSysOut.getArray());
-//
-    sdmt->putSDContainer(sc);
-  }
-  return CountedPtr<SDMemTable>(sdmt);
-}
+
+void SDMath::binInSitu (SDMemTable* pIn, int width)
+{
+  const uInt what = 1;
+  SDMemTable* pOut = localBin (*pIn, Int(width));
+  *pIn = *pOut;
+   delete pOut;
+}  
+
+
+CountedPtr<SDMemTable> SDMath::bin (const CountedPtr<SDMemTable>& in, int width)
+{
+  const uInt what = 1;
+  return CountedPtr<SDMemTable>(localBin(*in, Int(width)));
+}
+
 
 
@@ -866 +820 @@
 // 
   const Bool useMask = (mask.nelements() == shapeIn(chanAxis));
-cerr << "nEl=" << mask.nelements() << endl;
-cerr << "useMask=" << useMask << endl;
 
 // Loop over rows
@@ -962 +914 @@
   return pTabOut;
 }
+
+SDMemTable* SDMath::localBin (const SDMemTable& in, Int width)
+{
+  SDHeader sh = in.getSDHeader();
+  SDMemTable* pTabOut = new SDMemTable(in, True);
+
+// Bin up SpectralCoordinates
+
+  IPosition factors(1);
+  factors(0) = width;
+  for (uInt j=0; j<in.nCoordinates(); ++j) {
+    CoordinateSystem cSys;
+    cSys.addCoordinate(in.getCoordinate(j));
+    CoordinateSystem cSysBin = 
+      CoordinateUtil::makeBinnedCoordinateSystem (factors, cSys, False);
+//
+    SpectralCoordinate sCBin = cSysBin.spectralCoordinate(0);
+    pTabOut->setCoordinate(sCBin, j);
+  }
+
+// Use RebinLattice to find shape
+
+  IPosition shapeIn(1,sh.nchan);
+  IPosition shapeOut = RebinLattice<Float>::rebinShape (shapeIn, factors);
+  sh.nchan = shapeOut(0);
+  pTabOut->putSDHeader(sh);
+
+
+// Loop over rows and bin along channel axis
+  
+  const uInt axis = 3;
+  for (uInt i=0; i < in.nRow(); ++i) {
+    SDContainer sc = in.getSDContainer(i);
+//
+    Array<Float> tSys(sc.getTsys());                           // Get it out before sc changes shape
+
+// Bin up spectrum
+
+    MaskedArray<Float> marr(in.rowAsMaskedArray(i));
+    MaskedArray<Float> marrout;
+    LatticeUtilities::bin(marrout, marr, axis, width);
+
+// Put back the binned data and flags
+
+    IPosition ip2 = marrout.shape();
+    sc.resize(ip2);
+//
+    putDataInSDC (sc, marrout.getArray(), marrout.getMask());
+
+// Bin up Tsys.  
+
+    Array<Bool> allGood(tSys.shape(),True);
+    MaskedArray<Float> tSysIn(tSys, allGood, True);
+//
+    MaskedArray<Float> tSysOut;    
+    LatticeUtilities::bin(tSysOut, tSysIn, axis, width);
+    sc.putTsys(tSysOut.getArray());
+//
+    pTabOut->putSDContainer(sc);
+  }
+  return pTabOut;
+}
+
+

trunk/src/SDMath.h

@@ -66 +66 @@
 // Bin up
 
-  casa::CountedPtr<SDMemTable> bin(const casa::CountedPtr<SDMemTable>& in, 
-                                   casa::Int width);
+  void binInSitu (SDMemTable* in, casa::Int width);
+  casa::CountedPtr<SDMemTable> bin(const casa::CountedPtr<SDMemTable>& in, casa::Int width);
 
 // Average in time
@@ -144 +144 @@
 
   SDMemTable* localAveragePol(const SDMemTable& in, const casa::Vector<casa::Bool>& mask);
+
+// Function to bin up spectra
+
+  SDMemTable* localBin (const SDMemTable& in, casa::Int width);
 };
 

trunk/src/SDMathWrapper.h

@@ -56 +56 @@
   void scaleInSitu(SDMemTableWrapper& in, casa::Float factor, casa::Bool all)
   {
-    SDMemTable* sdmt = in.getPtr();
     SDMath::multiplyInSitu(in.getPtr(),factor, all);
   }
@@ -69 +68 @@
   void addInSitu(SDMemTableWrapper& in, casa::Float offset, casa::Bool all)
   {
-    SDMemTable* sdmt = in.getPtr();
     SDMath::addInSitu(in.getPtr(), offset, all);
   }
@@ -85 +83 @@
 // Bin up
 
-  SDMemTableWrapper bin(const SDMemTableWrapper& in,
-                        int width) {
-    return SDMath::bin(in.getCP(), width);
+  void binInSitu (SDMemTableWrapper& in, int width) 
+  {
+    SDMath::binInSitu (in.getPtr(), width);
+  }
+  SDMemTableWrapper bin(const SDMemTableWrapper& in, int width) 
+  {
+    return SDMemTableWrapper(SDMath::bin(in.getCP(), width));
   }
 

trunk/src/python_SDMath.cc

@@ -62 +62 @@
     void python_SDMath() {
       def("quotient", &SDMathWrapper::quotient);
+//
       def("scale", &SDMathWrapper::scale);
       def("scale_insitu", &SDMathWrapper::scaleInSitu);
+//
       def("add", &SDMathWrapper::add);
       def("add_insitu", &SDMathWrapper::addInSitu);
+//
       def("hanning", &SDMathWrapper::hanning);
+//
       def("average", &SDMathWrapper::average);
+//
       def("averagepol", &SDMathWrapper::averagePol);
       def("averagepol_insitu", &SDMathWrapper::averagePolInSitu);
+//
       def("bin", &SDMathWrapper::bin);
+      def("bin_insitu", &SDMathWrapper::binInSitu);
+//
       def("stats", &SDMathWrapper::statistic);
     };