Changeset 1314 for trunk/src

Timestamp:

12/18/06 16:37:04 (18 years ago)

Author:

mar637

Message:

fixed defect, where scantable averaging output failed if first row in ouput was all flagged

Location:

trunk/src

Files:

• RowAccumulator.cpp (modified) (4 diffs)
• STMath.cpp (modified) (1 diff)

trunk/src/RowAccumulator.cpp

@@ -13 +13 @@
 
 #include <casa/Arrays/MaskArrMath.h>
+#include <casa/Arrays/MaskArrLogi.h>
 #include <casa/Arrays/ArrayMath.h>
+#include <casa/Arrays/ArrayLogical.h>
 #include "RowAccumulator.h"
 
@@ -40 +42 @@
   if (!initialized_) {
     Vector<Float> dummy(v.nelements(), 0.0);
-    spectrum_.setData(dummy, Vector<Bool>(m.nelements(), True));
-    n_.setData(Vector<Float>(v.nelements(), 0.0), m);
-    weightSum_.setData(Vector<Float>(v.nelements(), 0.0), m);
+    Vector<Bool> dummymsk(m.nelements(), True);
+    spectrum_.setData(dummy, dummymsk);
+    n_.setData(Vector<Float>(v.nelements(), 0.0), dummymsk);
+    weightSum_.setData(Vector<Float>(v.nelements(), 0.0), dummymsk);
     tsysSum_.resize(tsys.nelements()); tsysSum_=0.0;
   }
@@ -48 +51 @@
   Float totalweight = 1.0;
   totalweight *= addTsys(tsys);
-  totalweight *= addInterval(interval);
-  addTime(time);
+  // only add these if not everything masked
+  if ( !allEQ(m, False) ) {
+    totalweight *= addInterval(interval);
+    addTime(time);
+  }
   addSpectrum(v, m, totalweight);
   initialized_ = True;
@@ -134 +140 @@
 casa::Vector< casa::Float > asap::RowAccumulator::getTsys( ) const
 {
-  // @fixme this assummes tsys.nelements() == 1
+  // @fixme this assumes tsys.nelements() == 1
   return tsysSum_/max(n_);
 }

trunk/src/STMath.cpp

@@ -167 +167 @@
         Vector<Bool> bflag(flag.shape());
         convertArray(bflag, flag);
+        /*
         if ( allEQ(bflag, True) ) {
-          continue;//don't accumulate
+        continue;//don't accumulate
         }
+        */
         specCol.get(k, spec);
         tsysCol.get(k, tsys);