Changeset 1333 for trunk

Timestamp:

04/18/07 16:18:40 (18 years ago)

Author:

mar637

Message:

Fix for Ticket #104; protect the user from flagging the whole scantable. This has performance penalties.

Location:

trunk/src

Files:

• RowAccumulator.cpp (modified) (2 diffs)
• STMath.cpp (modified) (3 diffs)
• Scantable.cpp (modified) (1 diff)

trunk/src/RowAccumulator.cpp

@@ -125 +125 @@
 casa::Double asap::RowAccumulator::getTime( ) const
 {
-  return timeSum_/max(n_);
+  Float n = max(n_);
+  if (n < 1.0) n = 1.0; 
+  return timeSum_/n;
 }
 
@@ -135 +137 @@
 casa::Vector< casa::Bool > RowAccumulator::getMask( ) const
 {
+  // if no elements accumulated the mask is all True
+  // we have to return everything False
+  if (max(n_) < 1.0) return !spectrum_.getMask();
   return spectrum_.getMask();
 }

trunk/src/STMath.cpp

@@ -137 +137 @@
   ROScalarColumn<Double> mjdCol, intCol;
   ROScalarColumn<Int> scanIDCol;
+
+  Vector<uInt> rowstodelete;
 
   for (uInt i=0; i < tout.nrow(); ++i) {
@@ -180 +182 @@
       }
     }
+    const Vector<Bool>& msk = acc.getMask();
+    if ( allEQ(msk, False) ) {
+      uint n = rowstodelete.nelements();
+      rowstodelete.resize(n+1, True);
+      rowstodelete[n] = i;
+      continue;
+    }
+    cout << "write "<<  i << endl;
     //write out
-    specColOut.put(i, acc.getSpectrum());
-    const Vector<Bool>& msk = acc.getMask();
     Vector<uChar> flg(msk.shape());
     convertArray(flg, !msk);
     flagColOut.put(i, flg);
+    specColOut.put(i, acc.getSpectrum());
     tsysColOut.put(i, acc.getTsys());
     intColOut.put(i, acc.getInterval());
@@ -194 +203 @@
     cycColOut.put(i, uInt(0));
     acc.reset();
+  }
+  if (rowstodelete.nelements() > 0) {
+    cout << rowstodelete << endl;
+    tout.removeRow(rowstodelete);
+    if (tout.nrow() == 0) {
+      throw(AipsError("Can't average fully flagged data."));
+    }
   }
   return out;

trunk/src/Scantable.cpp

@@ -618 +618 @@
 void Scantable::flag(const std::vector<bool>& msk)
 {
-  if ( selector_.empty()  && msk.size() == 0 )
+  std::vector<bool>::const_iterator it;
+  uInt ntrue = 0;
+  for (it = msk.begin(); it != msk.end(); ++it) {
+    if ( *it ) {
+      ntrue++;
+    }
+  }
+  if ( selector_.empty()  && (msk.size() == 0 || msk.size() == ntrue) )
     throw(AipsError("Trying to flag whole scantable."));
   if ( msk.size() == 0 ) {