Changeset 3007

Timestamp:

10/16/14 20:06:50 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6582

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fix for asap unit test failure.

File:

• trunk/src/RowAccumulator.cpp (modified) (2 diffs)

trunk/src/RowAccumulator.cpp

@@ -207 +207 @@
   Float totalWeight = 1.0;
   Vector<Bool> m = data.getMask();
-  Float tsysWeight = addTsys(tsys, inverseMask);
-  Float intervalWeight = addInterval(interval, inverseMask);
-  addTime(time, inverseMask);
   if (!allEQ(m, False)) {  // only add these if not everything masked
-    totalWeight *= tsysWeight; 
-    totalWeight *= intervalWeight; 
+    totalWeight *= addTsys(tsys, inverseMask);
+    totalWeight *= addInterval(interval, inverseMask);
+    addTime(time, inverseMask);
 
     if (weightType_ == W_VAR) {
@@ -321 +319 @@
   weightSum_.setData(w, Vector<Bool>(w.nelements(), True));
 
-  tsysSum_ = tsysSumNoMask_;
-  intervalSum_ = intervalSumNoMask_;
-}
+  if (allEQ(tsysSum_, 0.0f))
+    tsysSum_ = tsysSumNoMask_;
+  if (intervalSum_ == 0.0)
+    intervalSum_ = intervalSumNoMask_;
+}