Changeset 829 for trunk/src/MathUtils2.cc

Timestamp:

02/17/06 15:04:14 (18 years ago)

Author:

mar637

Message:

asap2 integration

File:

• trunk/src/MathUtils2.cc (modified) (4 diffs)

trunk/src/MathUtils2.cc

@@ -41 +41 @@
 
 template <class T>
-void mathutil::hanning(Vector<T>& out, Vector<Bool>& outmask, 
-                       const Vector<T>& in, const Vector<Bool>& mask, 
+void mathutil::hanning(Vector<T>& out, Vector<Bool>& outmask,
+                       const Vector<T>& in, const Vector<Bool>& mask,
                        Bool relaxed, Bool ignoreOther) {
 
@@ -54 +54 @@
   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  
+  vals[0] = 0.25; vals[1] = 0.5; vals[2] = 0.25; weights[7] = vals;// TTT
   // Chris' case
-  Vector<Bool> weighted(8); 
+  Vector<Bool> weighted(8);
   if (relaxed) {
     weighted = False;
@@ -65 +65 @@
     weighted[0] = False;
   }
-  
+
   out.resize(in.nelements());
   outmask.resize(mask.nelements());
@@ -91 +91 @@
   }
 }
-
-template <class T>
-uInt mathutil::addEntry (Vector<T>& list, T val)
-{
-   uInt n = list.nelements();
-   if (n>0) {
-      for (uInt i=0; i<n; i++) {
-         if (near(list[i],val)) {
-            return i; 
-         }
-      }
-   }
-//
-   n++;
-   list.resize(n,True);
-   list(n-1) = val;
-   return n-1;
-}
-
-template <class T>
-void mathutil::extendLastArrayAxis(casa::Array<T>& out, 
-                                   const casa::Array<T>& in,
-                                   const T& initVal)
-{
-  
-  IPosition ipin = in.shape();
-  IPosition ipout = ipin; // copy?
-  // extend the axis by 1
-  uInt axis = in.ndim()-1;
-  ipout[axis] = ipin[axis]+1;
-  out.resize(ipout);
-  out = initVal;
-  ArrayIterator<T> itout(out,axis);
-  ReadOnlyArrayIterator<T> itin(in,axis);
-  while ( !itin.pastEnd() ) {
-    itout.array() = itin.array();  // copy vector by vector
-    itin.next(); itout.next();
-  }
-}