Changeset 829

Timestamp:

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

Author:

mar637

Message:

asap2 integration

Location:

trunk/src

Files:

• MathUtils.cc (modified) (6 diffs)
• MathUtils.h (modified) (1 diff)
• MathUtils2.cc (modified) (4 diffs)

trunk/src/MathUtils.cc

@@ -41 +41 @@
 using namespace casa;
 
-float mathutil::statistics(const String& which,  
+float mathutil::statistics(const String& which,
                            const MaskedArray<Float>& data)
 {
@@ -47 +47 @@
    str.upcase();
    if (str.contains(String("MIN"))) {
-      return min(data); 
+      return min(data);
    } else if (str.contains(String("MAX"))) {
       return max(data);
@@ -57 +57 @@
       return mean(data);
    } else if (str.contains(String("VAR"))) {
-      return variance(data); 
+      return variance(data);
    } else if (str.contains(String("STDDEV"))) {
       return stddev(data);
@@ -69 +69 @@
    }
 }
-  
+
 
 void mathutil::replaceMaskByZero(Vector<Float>& data, const Vector<Bool>& mask)
@@ -79 +79 @@
 
 
-void mathutil::scanBoundaries(Vector<uInt>& startInt,
-                              Vector<uInt>& endInt,
-                              const Vector<Int>& scanIDs) 
-  // Find integrations start and end for each Scan
-{
-  uInt nInt = scanIDs.nelements();
-  startInt.resize(nInt);
-  endInt.resize(nInt);
-
-  startInt(0) = 0;
-  uInt j = 0;
-  Int currScanID = scanIDs(0);
-  for (uInt i=0; i<nInt; i++) {
-    if (scanIDs(i) != currScanID) {  
-      endInt(j) = i-1;
-      currScanID = scanIDs(i);
-
-      j += 1;
-      startInt(j) = i;
-      if (i==nInt-1) {
-        endInt(j) = i;
-      }   
-    } else {
-      if (i==nInt-1) endInt(j) = i;
-    }
-  }
-  startInt.resize(j+1,True);
-  endInt.resize(j+1,True);
-}
-
-std::vector<std::string> mathutil::tovectorstring(const Vector<String>& in) 
+std::vector<std::string> mathutil::tovectorstring(const Vector<String>& in)
 {
   std::vector<std::string> out;
@@ -119 +89 @@
 }
 
-Vector<String> mathutil::toVectorString(const std::vector<std::string>& in) 
+Vector<String> mathutil::toVectorString(const std::vector<std::string>& in)
 {
   Vector<String> out(in.size());

trunk/src/MathUtils.h

@@ -40 +40 @@
 namespace mathutil {
 
-// Add new entry to list
-template <class T>
-casa::uInt addEntry(casa::Vector<T>& list, T val);
-
-// Find the scan boundaries from a list of ScanIDs
-void scanBoundaries(casa::Vector<casa::uInt>& startInt,  
-                    casa::Vector<casa::uInt>& endInt,
-                    const casa::Vector<casa::Int>& scanIDs);
-
 // Hanning smoothing
 template <class T>
-void hanning(casa::Vector<T>& out, casa::Vector<casa::Bool>& outmask, 
-             const casa::Vector<T>& in, const casa::Vector<casa::Bool>& mask, 
-             casa::Bool relaxed=casa::False, 
+void hanning(casa::Vector<T>& out, casa::Vector<casa::Bool>& outmask,
+             const casa::Vector<T>& in, const casa::Vector<casa::Bool>& mask,
+             casa::Bool relaxed=casa::False,
              casa::Bool ignoreOther=casa::False);
 
 // Generate specified statistic
-float statistics(const casa::String& which,  
+float statistics(const casa::String& which,
                  const casa::MaskedArray<casa::Float>& data);
 
 // Replace masked value by zero
-void replaceMaskByZero(casa::Vector<casa::Float>& data, 
+void replaceMaskByZero(casa::Vector<casa::Float>& data,
                        const casa::Vector<casa::Bool>& mask);
 
-// Extend the 
-template <class T>
-void extendLastArrayAxis(casa::Array<T>& out, const casa::Array<T>& in,
-                         const T& initVal);
-  
 std::vector<std::string> tovectorstring(const casa::Vector<casa::String>& in);
 

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();
-  }
-}