Changeset 1398 for trunk

Timestamp:

10/24/07 15:57:31 (17 years ago)

Author:

Malte Marquarding

Message:

made n_ unsigned integer (from float) to maybe speed things up a bit

Location:

trunk/src

Files:

• RowAccumulator.cpp (modified) (5 diffs)
• RowAccumulator.h (modified) (1 diff)

trunk/src/RowAccumulator.cpp

@@ -44 +44 @@
     Vector<Bool> dummymsk(m.nelements(), True);
     spectrum_.setData(dummy, dummymsk);
-    n_.setData(Vector<Float>(v.nelements(), 0.0), dummymsk);
+    n_.setData(Vector<uInt>(v.nelements(), 0), dummymsk);
     weightSum_.setData(Vector<Float>(v.nelements(), 0.0), dummymsk);
     tsysSum_.resize(tsys.nelements()); tsysSum_=0.0;
@@ -79 +79 @@
   weightSum_ += wadd;
   spectrum_ += data;
-  const MaskedArray<Float> inc(Vector<Float>(m.nelements(),1.0), m);
+  const MaskedArray<uInt> inc(Vector<uInt>(m.nelements(),1), m);
   n_ += inc;
 }
@@ -125 +125 @@
 casa::Double asap::RowAccumulator::getTime( ) const
 {
-  Float n = max(n_);
-  if (n < 1.0) n = 1.0; 
-  return timeSum_/n;
+  uInt n = max(n_);
+  return timeSum_/Float(n);
 }
 
@@ -138 +137 @@
 {
   // Return the "total" mask - False where no points have been accumulated.
-  return (n_.getArray() > Float(0.0));
+  return (n_.getArray() > uInt(0));
 }
 
@@ -144 +143 @@
 {
   // @fixme this assumes tsys.nelements() == 1
-  return tsysSum_/max(n_);
+  return tsysSum_/Float(max(n_));
 }
 

trunk/src/RowAccumulator.h

@@ -99 +99 @@
   //these are Vectors
   casa::MaskedArray<casa::Float> spectrum_;
-  casa::MaskedArray<casa::Float> n_, weightSum_;
+  casa::MaskedArray<casa::Float> weightSum_;
+  casa::MaskedArray<casa::uInt> n_;
 
   casa::Vector<casa::Bool> userMask_;