Changeset 452 for trunk/src

Timestamp:

02/16/05 12:26:03 (21 years ago)

Author:

mar637

Message:

• Added extendLastArrayAxis

Location:

trunk/src

Files:

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

trunk/src/MathUtils.cc

@@ -78 +78 @@
 
 
-void mathutil::scanBoundaries (Vector<uInt>& startInt,
-                               Vector<uInt>& endInt,
-                               const Vector<Int>& scanIDs) 
-// 
-// FInd integrations start and end for each Scan
-//
+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);
+  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);
 }

trunk/src/MathUtils.h

@@ -59 +59 @@
 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);
+
 };
 

trunk/src/MathUtils2.cc

@@ -31 +31 @@
 
 #include <casa/aips.h>
+#include <casa/Arrays/Array.h>
+#include <casa/Arrays/ArrayIter.h>
 #include <casa/Arrays/Vector.h>
 #include <casa/Arrays/VectorSTLIterator.h>
@@ -108 +110 @@
 }
 
-
- 
-
-
-
+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();
+  }
+}