Changeset 1603 for branches/alma/src/RowAccumulator.cpp

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

• branches/alma/src/RowAccumulator.cpp (modified) (7 diffs)

branches/alma/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;
@@ -50 +50 @@
   // add spectrum related weights, so far it is variance only.
   Float totalweight = 1.0;
-  totalweight *= addTsys(tsys);
+
   // only add these if not everything masked
   if ( !allEQ(m, False) ) {
+    totalweight *= addTsys(tsys);
     totalweight *= addInterval(interval);
     addTime(time);
@@ -79 +80 @@
   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 +126 @@
 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 +138 @@
 {
   // Return the "total" mask - False where no points have been accumulated.
-  return (n_.getArray() > Float(0.0));
+  return (n_.getArray() > uInt(0));
 }
 
@@ -144 +144 @@
 {
   // @fixme this assumes tsys.nelements() == 1
-  return tsysSum_/max(n_);
+  return tsysSum_/Float(max(n_));
 }
 
@@ -158 +158 @@
   return initialized_;
 }
+