Changeset 177 for trunk/src

Timestamp:

01/07/05 11:18:33 (20 years ago)

Author:

kil064

Message:

remove function 'hanning'
add function 'smooth' (includes hanning)

Location:

trunk/src

Files:

• SDMath.cc (modified) (5 diffs)
• SDMath.h (modified) (2 diffs)

trunk/src/SDMath.cc

@@ -42 +42 @@
 #include <casa/Arrays/MaskArrMath.h>
 #include <casa/Arrays/MaskArrLogi.h>
+#include <casa/Utilities/Assert.h>
 #include <casa/Exceptions.h>
+
+#include <scimath/Mathematics/VectorKernel.h>
+#include <scimath/Mathematics/Convolver.h>
 
 #include <tables/Tables/Table.h>
@@ -84 +88 @@
 
 CountedPtr<SDMemTable> SDMath::average (const Block<CountedPtr<SDMemTable> >& in,
-                                        const Vector<Bool>& mask, bool scanAv,
+                                        const Vector<Bool>& mask, Bool scanAv,
                                         const std::string& weightStr)
 //
@@ -391 +395 @@
 
 
-SDMemTable* SDMath::hanning(const SDMemTable& in, Bool doAll)
-//
-// Hanning smooth each row
-// Should Tsys be smoothed ?
-//
-{
-
-// New Table
-
-  SDMemTable* pTabOut = new SDMemTable(in,True);
-
-// Get cursor location
-         
-  IPosition start, end;
-  getCursorLocation (start, end, in);
-//
-  const uInt chanAxis = 3;                    // Spectrum axis
-  IPosition shapeOut(4,1);
-
-// Loop over rows in Table
-
-  for (uInt ri=0; ri < in.nRow(); ++ri) {
-
-// Get copy of data
-    
-    const MaskedArray<Float>& dataIn(in.rowAsMaskedArray(ri));
-    Array<Float> valuesIn = dataIn.getArray();
-    Array<Bool> maskIn = dataIn.getMask();
-
-// Smooth along the channels axis
-
-    Vector<Float> outValues;
-    Vector<Bool> outMask;
-    if (doAll) {
-       uInt axis = 3;
-       VectorIterator<Float> itValues(valuesIn, axis);
-       VectorIterator<Bool> itMask(maskIn, axis);
-       while (!itValues.pastEnd()) {
-          mathutil::hanning(outValues, outMask, itValues.vector(), itMask.vector());
-          itValues.vector() = outValues; 
-          itMask.vector() = outMask;
-//
-          itValues.next();
-          itMask.next();
-       }
-    } else {
-
-// Set multi-dim Vector shape
-
-       shapeOut(chanAxis) = valuesIn.shape()(chanAxis);
-
-// Stuff about with shapes so that we don't have conformance run-time errors
-
-       Vector<Float> valuesIn2 = valuesIn(start,end).nonDegenerate();
-       Vector<Bool> maskIn2 = maskIn(start,end).nonDegenerate();
-       mathutil::hanning(outValues, outMask, valuesIn2, maskIn2);
-
-// Write back
-
-       valuesIn(start,end) = outValues.reform(shapeOut);
-       maskIn(start,end) = outMask.reform(shapeOut);
-    }
-
-// Create and put back
-
-    SDContainer sc = in.getSDContainer(ri);
-    putDataInSDC (sc, valuesIn, maskIn);
-//
-    pTabOut->putSDContainer(sc);
-  }
-//
-  return pTabOut;
-}
-
-
-
-
 std::vector<float> SDMath::statistic (const CountedPtr<SDMemTable>& in,
-                                       const std::vector<bool>& mask,
-                                       const std::string& which)
+                                      const std::vector<bool>& mask,
+                                      const String& which)
 //
 // Perhaps iteration over pol/beam/if should be in here
@@ -779 +706 @@
   return pTabOut;
 }
+
+
+SDMemTable* SDMath::smooth (const SDMemTable& in, const casa::String& kernelType,
+                            casa::Float width, Bool doAll)
+{
+
+// Number of channels
+
+   const uInt chanAxis = 3;                                     // Spectral axis
+   SDHeader sh = in.getSDHeader();
+   const uInt nChan = sh.nchan;
+
+// Generate Kernel
+
+   VectorKernel::KernelTypes type = VectorKernel::toKernelType (kernelType);
+   Vector<Float> kernel = VectorKernel::make(type, width, nChan, True, False);
+
+// Generate Convolver
+
+   IPosition shape(1,nChan);
+   Convolver<Float> conv(kernel, shape);
+
+// New Table
+
+   SDMemTable* pTabOut = new SDMemTable(in,True);
+
+// Get cursor location
+         
+  IPosition start, end;
+  getCursorLocation (start, end, in);
+//
+  IPosition shapeOut(4,1);
+
+// Output Vectors
+
+  Vector<Float> valuesOut(nChan);
+  Vector<Bool> maskOut(nChan);
+
+// Loop over rows in Table
+
+  for (uInt ri=0; ri < in.nRow(); ++ri) {
+
+// Get copy of data
+    
+    const MaskedArray<Float>& dataIn(in.rowAsMaskedArray(ri));
+    AlwaysAssert(dataIn.shape()(chanAxis)==nChan, AipsError);
+//
+    Array<Float> valuesIn = dataIn.getArray();
+    Array<Bool> maskIn = dataIn.getMask();
+
+// Branch depending on whether we smooth all locations or just
+// those pointed at by the current selection cursor
+
+    if (doAll) {
+       uInt axis = 3;
+       VectorIterator<Float> itValues(valuesIn, axis);
+       VectorIterator<Bool> itMask(maskIn, axis);
+       while (!itValues.pastEnd()) {
+
+// Smooth
+          if (kernelType==VectorKernel::HANNING) {
+             mathutil::hanning(valuesOut, maskOut, itValues.vector(), itMask.vector());
+             itMask.vector() = maskOut;
+          } else {
+             mathutil::replaceMaskByZero(itValues.vector(), itMask.vector());
+             conv.linearConv(valuesOut, itValues.vector());
+          }
+//
+          itValues.vector() = valuesOut;
+//
+          itValues.next();
+          itMask.next();
+       }
+    } else {
+
+// Set multi-dim Vector shape
+
+       shapeOut(chanAxis) = valuesIn.shape()(chanAxis);
+
+// Stuff about with shapes so that we don't have conformance run-time errors
+
+       Vector<Float> valuesIn2 = valuesIn(start,end).nonDegenerate();
+       Vector<Bool> maskIn2 = maskIn(start,end).nonDegenerate();
+
+// Smooth
+
+       if (kernelType==VectorKernel::HANNING) {
+          mathutil::hanning(valuesOut, maskOut, valuesIn2, maskIn2);
+          maskIn(start,end) = maskOut.reform(shapeOut);
+       } else {
+          mathutil::replaceMaskByZero(valuesIn2, maskIn2);
+          conv.linearConv(valuesOut, valuesIn2);
+       }
+//
+       valuesIn(start,end) = valuesOut.reform(shapeOut);
+    }
+
+// Create and put back
+
+    SDContainer sc = in.getSDContainer(ri);
+    putDataInSDC (sc, valuesIn, maskIn);
+//
+    pTabOut->putSDContainer(sc);
+  }
+//
+  return pTabOut;
+}
+
 
 
@@ -967 +1002 @@
     sc.putFlags(outflags);
 }
-
-

trunk/src/SDMath.h

@@ -61 +61 @@
    casa::CountedPtr<SDMemTable>  average(const casa::Block<casa::CountedPtr<SDMemTable> >& in,
                                          const casa::Vector<casa::Bool>& mask,
-                                         bool scanAverage, const std::string& weightStr);
+                                         casa::Bool scanAverage, const std::string& weightStr);
 
 // Statistics
    std::vector<float> statistic(const casa::CountedPtr<SDMemTable>& in, 
-                                const std::vector<bool>& mask, const std::string& which);
-
-// Hanning
-   SDMemTable* hanning(const SDMemTable& in, casa::Bool doAll);
+                                const std::vector<bool>& mask, const casa::String& which);
 
 // Bin up spectra
    SDMemTable* bin(const SDMemTable& in, casa::Int width);
+
+// Smooth
+   SDMemTable* smooth (const SDMemTable& in, const casa::String& kernel,
+                       casa::Float width, casa::Bool doAll);
 
 // Simple mathematical operations.  what=0 (mul) or 1 (add)
@@ -124 +125 @@
 
    void convertWeightString (WeightType& wt, const std::string& weightStr);
-
 };