Changeset 3010 for trunk/python

Timestamp:

10/31/14 21:26:51 (10 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.

File:

• trunk/python/scantable.py (modified) (3 diffs)

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