Changeset 2957 for trunk/python

Timestamp:

06/26/14 17:42:59 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6599

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: function paramter

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: add a paramter to sd.scantable.stats() to skip outputting formatted statistical values to temporary text file.

File:

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

trunk/python/scantable.py

@@ -892 +892 @@
 
     @asaplog_post_dec
-    def stats(self, stat='stddev', mask=None, form='3.3f', row=None):
+    def stats(self, stat='stddev', mask=None, form='3.3f', row=None, skip_flaggedrow=False):
         """\
         Determine the specified statistic of the current beam/if/pol
@@ -910 +910 @@
             row:     row number of spectrum to process.
                      (default is None: for all rows)
+
+            skip_flaggedrow: if True, skip outputting text for flagged
+                             spectra. default is False.
 
         Example:
@@ -922 +925 @@
                              "number of channels. Please use setselection() "
                              "to select individual IFs")
-        rtnabc = False
-        if stat.lower().endswith('_abc'): rtnabc = True
         getchan = False
         if stat.lower().startswith('min') or stat.lower().startswith('max'):
@@ -929 +930 @@
             getchan = True
             statvals = []
-        if not rtnabc:
+
+        rtnabc = False
+        if stat.lower().endswith('_abc'):
+            rtnabc = True
+        else:
             if row == None:
                 statvals = self._math._stats(self, mask, stat)
@@ -952 +957 @@
 
         for i in rows:
-            print '@@@@@@@@'
-            print '['+str(i)+'/'+str(rows)+'] -- '+('RowFlagged' if self._getflagrow(i) else '')
-            print '@@@@@@@@'
-            #if self._getflagrow(i): continue
             refstr = ''
             statunit= ''
@@ -966 +967 @@
                 else:
                     refstr = ('(@ %'+form) % (qx['value'])+' ['+qx['unit']+'])'
+
+            if skip_flaggedrow and self._getflagrow(i): continue
 
             tm = self._gettime(i)