Changeset 829 for trunk/src/MathUtils.cc

Timestamp:

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

Author:

mar637

Message:

asap2 integration

File:

• trunk/src/MathUtils.cc (modified) (6 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());