Changeset 2986 for trunk

Timestamp:

08/15/14 19:24:40 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6582

Ready for Test: Yes

Interface Changes: 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...

STMath::average is changed so that empty averaged result (data to be
averaged are all flagged) is kept with all channel flags of 128 and
row flag of 1.

Location:

trunk/src

Files:

• RowAccumulator.cpp (modified) (5 diffs)
• STMath.cpp (modified) (3 diffs)

trunk/src/RowAccumulator.cpp

@@ -20 +20 @@
 using namespace casa;
 using namespace asap;
+
+namespace {
+inline uInt nNominal(MaskedArray<uInt> nvalid, MaskedArray<uInt> ninvalid)
+{
+  return max((allEQ(nvalid, uInt(0))) ? ninvalid : nvalid);
+}
+} // anonymous namespace
 
 RowAccumulator::RowAccumulator(WeightType wt) : weightType_(wt), initialized_(False)
@@ -200 +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 *= addTsys(tsys, inverseMask);
-    totalWeight *= addInterval(interval, inverseMask);
-    addTime(time, inverseMask);
+    totalWeight *= tsysWeight; 
+    totalWeight *= intervalWeight; 
 
     if (weightType_ == W_VAR) {
@@ -263 +272 @@
 Double RowAccumulator::getTime() const
 {
-  return timeSum_/Double(max(n_));
+  return timeSum_/Double(nNominal(n_, nNoMask_));
 }
 
@@ -280 +289 @@
 {
   // @fixme this assumes tsys.nelements() == 1
-  return tsysSum_/Float(max(n_));
+  return tsysSum_/Float(nNominal(n_, nNoMask_));
 }
 
@@ -311 +320 @@
   spectrum_.setData(v, Vector<Bool>(v.nelements(), True));
   weightSum_.setData(w, Vector<Bool>(w.nelements(), True));
-}
+
+  tsysSum_ = tsysSumNoMask_;
+  intervalSum_ = intervalSumNoMask_;
+}

trunk/src/STMath.cpp

@@ -372 +372 @@
     }
     const Vector<Bool>& msk = acc.getMask();
+    uInt outFlagRow = 0;
     if ( allEQ(msk, False) ) {
       rowstodelB[nrowdel] = i ;
       nrowdel++ ;
-      outrowCount++;
-      acc.reset();
-      iter.next();
-      continue;
+      outFlagRow = 1;
     }
     //write out
@@ -406 +404 @@
       // which requires resetting this value
       cycColOut.put(i, uInt(0));
-      // completely flagged rows are removed anyway
-      flagRowColOut.put(i, uInt(0));
+      flagRowColOut.put(i, outFlagRow);
     } else {
       os << "For output row="<<i<<", all input rows of data are flagged. no averaging" << LogIO::POST;
@@ -420 +417 @@
 
   if ( nrowdel > 0 ) {
-    Vector<uInt> rowstodelete( IPosition(1,nrowdel), rowstodelB.storage(), SHARE ) ;
-    //os << rowstodelete << LogIO::POST ;
-    tout.removeRow(rowstodelete);
+    if (nrowdel == tout.nrow()) {
+      os << LogIO::WARN << "Output data are fully flagged." << LogIO::POST;
+    }
     if (tout.nrow() == 0) {
       throw(AipsError("Can't average fully flagged data."));