Changeset 1333 for trunk/src/STMath.cpp

Timestamp:

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

Author:

mar637

Message:

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

File:

• trunk/src/STMath.cpp (modified) (3 diffs)

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;