Changeset 137

Timestamp:

12/23/04 15:57:26 (19 years ago)

Author:

kil064

Message:

split MathUtils::hanning function into MathUtils2.cc as the
new MU::statistics function is not templated

Location:

trunk/src

Files:

• Makefile (modified) (1 diff)
• MathUtils.cc (modified) (2 diffs)
• MathUtils2.cc (added)
• SDTemplates.cc (modified) (1 diff)

trunk/src/Makefile

@@ -36 +36 @@
 
 OBJECTS   := MathUtils.o \
+             MathUtils2.o \
              SDContainer.o \
              SDMemTable.o \

trunk/src/MathUtils.cc

@@ -31 +31 @@
 
 #include <casa/aips.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/VectorSTLIterator.h>
+#include <casa/Arrays/MaskedArray.h>
 #include <casa/Arrays/MaskArrMath.h>
 #include <casa/BasicSL/String.h>
@@ -41 +40 @@
 //using namespace asap;
 
-template <class T>
-void mathutil::hanning(Vector<T>& out, Vector<Bool>& outmask, 
-             const Vector<T>& in, const Vector<Bool>& mask, 
-             Bool relaxed, Bool ignoreOther) {
-
-  Vector< Vector<T> > weights(8);
-  Vector<Float> vals(3);
-  vals = 0.0;weights[0] = vals;// FFF
-  vals[0] = 1.0; vals[1] = 0.0; vals[2] = 0.0; weights[1] = vals;// TFF
-  vals[0] = 0.0; vals[1] = 1.0; vals[2] = 0.0; weights[2] = vals;// FTF
-  vals[0] = 1.0/3.0; vals[1] = 2.0/3.0; vals[2] = 0.0; weights[3] = vals;// TTF
-  vals[0] = 0.0; vals[1] = 0.0; vals[2] = 1.0;weights[4] = vals;// FFT
-  vals[0] = 0.5; vals[1] = 0.0; vals[2] = 0.5; weights[5] = vals;// TFT
-  vals[0] = 0.0; vals[1] = 2.0/3.0; vals[2] = 1.0/3.0; weights[6] = vals;// FTT
-  vals[0] = 0.25; vals[1] = 0.5; vals[2] = 0.25; weights[7] = vals;// TTT  
-  // Chris' case
-  Vector<Bool> weighted(8); 
-  if (relaxed) {
-    weighted = False;
-    weighted[7] = True;
-
-  } else {
-    weighted = True;
-    weighted[0] = False;
-  }
-  
-  out.resize(in.nelements());
-  outmask.resize(mask.nelements());
-
-  // make special case for first and last
-  /// ...here
-  // loop from 1..n-2
-  uInt i = 1;
-  VectorSTLIterator<T> outit(out);
-  outit++;
-  VectorSTLIterator<Bool> outmit(outmask);outmit++;
-  uInt m;Vector<T>* w;
-  for (VectorSTLIterator<T> it = outit;it != out.end()-1;++it) {
-
-    m = mask[i-1] + 2*mask[i] + 4*mask[i+1];
-    w = &(weights[m]);
-    if (weighted[m]) {
-      (*it) = (*w)[0]*in[i-1] + (*w)[1]*in[i] + (*w)[2]*in[i+1];
-      (*outmit) = True;
-    } else { // mask it
-      (*outmit) = False;
-    }
-    ++i;
-    ++outmit;
-  }
-}
 
 

trunk/src/SDTemplates.cc

@@ -89 +89 @@
 template void LatticeUtilities::bin(MaskedArray<float>&, MaskedArray<float> const&, uInt, uInt);
 template class PtrHolder<Lattice<Float> >;
-#include "MathUtils.cc"
+#include "MathUtils2.cc"
 namespace mathutil {
   template void hanning(Vector<Float>&, Vector<Bool>&,