Changeset 3010 for trunk

Timestamp:

10/31/14 21:26:51 (9 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6599

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: modified so that sd.scantable.stats() returns None for flagged rows and rows with all channels flagged.

Location:

trunk

Files:

• python/scantable.py (modified) (3 diffs)
• src/STMath.cpp (modified) (4 diffs)
• src/Scantable.cpp (modified) (1 diff)

trunk/python/scantable.py

@@ -959 +959 @@
             statunit= ''
             if getchan:
-                qx, qy = self.chan2data(rowno=i, chan=chan[i])
-                if rtnabc:
-                    statvals.append(qx['value'])
-                    refstr = ('(value: %'+form) % (qy['value'])+' ['+qy['unit']+'])'
-                    statunit= '['+qx['unit']+']'
+                if self._is_all_chan_flagged(i):
+                    if rtnabc:
+                        statvals.append(None)
                 else:
-                    refstr = ('(@ %'+form) % (qx['value'])+' ['+qx['unit']+'])'
-
-            if skip_flaggedrow and self._getflagrow(i):
-                statvals[i] = None
-                continue
+                    qx, qy = self.chan2data(rowno=i, chan=chan[i])
+                    if rtnabc:
+                        statvals.append(qx['value'])
+                        refstr = ('(value: %'+form) % (qy['value'])+' ['+qy['unit']+'])'
+                        statunit= '['+qx['unit']+']'
+                    else:
+                        refstr = ('(@ %'+form) % (qx['value'])+' ['+qx['unit']+'])'
+
+            if self._is_all_chan_flagged(i):
+                if not rtnabc:
+                    statvals[i] = None
+                if skip_flaggedrow:
+                    continue
 
             tm = self._gettime(i)
@@ -981 +987 @@
             if len(rows) > 1:
                 # out += ('= %'+form) % (outvec[i]) +'   '+refstr+'\n'
-                out += ('= %'+form) % (statvals[i]) +'   '+refstr+'\n'
+                if statvals[i] is None:
+                    out += ('= None(flagged)') + '   '+refstr+'\n'
+                else:
+                    out += ('= %'+form) % (statvals[i]) +'   '+refstr+'\n'
             else:
                 # out += ('= %'+form) % (outvec[0]) +'   '+refstr+'\n'
-                out += ('= %'+form) % (statvals[0]) +'   '+refstr+'\n'
+                if statvals[0] is None:
+                    out += ('= None(flagged)') + '   '+refstr+'\n'
+                else:
+                    out += ('= %'+form) % (statvals[0]) +'   '+refstr+'\n'
             out +=  sep+"\n"
 
@@ -1005 +1017 @@
         asaplog.push(''.join(x), False)
 
+        if skip_flaggedrow:
+            nstatvals = len(statvals)
+            for i in reversed(xrange(nstatvals)):
+                if statvals[i] is None:
+                    del statvals[i]
         return statvals
 

trunk/src/STMath.cpp

@@ -11 +11 @@
 //
 
+//#include <math.h>
+//#include <bits/nan.h>
 #include <sstream>
 #include <iostream>
@@ -1993 +1995 @@
                                         const std::string& which )
 {
-
   Vector<Bool> m(mask);
   const Table& tab = in->table();
@@ -1999 +2000 @@
   ROArrayColumn<uChar> flagCol(tab, "FLAGTRA");
   std::vector<float> out;
-  for (uInt i=0; i < tab.nrow(); ++i ) {
-    Vector<Float> spec; specCol.get(i, spec);
-    Vector<uChar> flag; flagCol.get(i, flag);
-    MaskedArray<Float> ma  = maskedArray(spec, flag);
-    float outstat = 0.0;
-    if ( spec.nelements() == m.nelements() ) {
-      outstat = mathutil::statistics(which, ma(m));
+  for (uInt i = 0; i < tab.nrow(); ++i) {
+    if (in->isAllChannelsFlagged(i)) {
+      out.push_back(NAN);
     } else {
-      outstat = mathutil::statistics(which, ma);
-    }
-    out.push_back(outstat);
+      float outstat = 0.0;
+      Vector<Float> spec; specCol.get(i, spec);
+      Vector<uChar> flag; flagCol.get(i, flag);
+      MaskedArray<Float> ma  = maskedArray(spec, flag);
+      if (spec.nelements() == m.nelements()) {
+        outstat = mathutil::statistics(which, ma(m));
+      } else {
+        outstat = mathutil::statistics(which, ma);
+      }
+      out.push_back(outstat);
+    }
   }
   return out;
@@ -2051 +2056 @@
   std::vector<int> out;
   for (uInt i=0; i < tab.nrow(); ++i ) {
-    Vector<Float> spec; specCol.get(i, spec);
-    Vector<uChar> flag; flagCol.get(i, flag);
-    MaskedArray<Float> ma  = maskedArray(spec, flag);
-    if (ma.ndim() != 1) {
-      throw (ArrayError(
-          "std::vector<int> STMath::minMaxChan("
-          "ContedPtr<Scantable> &in, std::vector<bool> &mask, "
-          " std::string &which)"
-          " - MaskedArray is not 1D"));
-    }
-    IPosition outpos(1,0);
-    if ( spec.nelements() == m.nelements() ) {
-      outpos = mathutil::minMaxPos(which, ma(m));
+    if (in->isAllChannelsFlagged(i)) {
+      out.push_back(NAN);
     } else {
-      outpos = mathutil::minMaxPos(which, ma);
-    }
-    out.push_back(outpos[0]);
+      Vector<Float> spec; specCol.get(i, spec);
+      Vector<uChar> flag; flagCol.get(i, flag);
+      MaskedArray<Float> ma  = maskedArray(spec, flag);
+      if (ma.ndim() != 1) {
+        throw (ArrayError(
+                          "std::vector<int> STMath::minMaxChan("
+                          "ContedPtr<Scantable> &in, std::vector<bool> &mask, "
+                          " std::string &which)"
+                          " - MaskedArray is not 1D"));
+      }
+      IPosition outpos(1,0);
+      if ( spec.nelements() == m.nelements() ) {
+        outpos = mathutil::minMaxPos(which, ma(m));
+      } else {
+        outpos = mathutil::minMaxPos(which, ma);
+      }
+      out.push_back(outpos[0]);
+    }
   }
   return out;

trunk/src/Scantable.cpp

@@ -5004 +5004 @@
   lineFinder.setData(getSpectrum(whichrow));
   lineFinder.findLines(getCompositeChanMask(whichrow, inMask), currEdge, whichrow);
-
   return lineFinder.getMask();
 }