Changeset 2315 for trunk

Timestamp:

09/29/11 17:08:47 (13 years ago)

Author:

Malte Marquarding

Message:

Ticket #247: Make new summary work in standard asap by handling logger i/o

Location:

trunk/python

Files:

• logging.py (modified) (2 diffs)
• scantable.py (modified) (5 diffs)

trunk/python/logging.py

@@ -19 +19 @@
     create its own casa log sink.
 
-    .. note:: Do instantiate a new one - use the :obj:`asaplog` instead.
+    .. note:: Do not instantiate a new one - use the :obj:`asaplog` instead.
 
     """
@@ -58 +58 @@
         self._log = ""
 
+    def clear(self):
+        if isinstance(self.logger, LogSink):
+            logs = self.logger.pop()
+            
     def push(self, msg, newline=True):
         """Push logs into the buffer. post needs to be called to send them.

trunk/python/scantable.py

@@ -2 +2 @@
 
 import os
+import tempfile
 import numpy
 try:
@@ -181 +182 @@
     #def __init__(self, filename, average=None, unit=None, getpt=None,
     #             antenna=None, parallactify=None):
-    def __init__(self, filename, average=None, unit=None, parallactify=None, **args):
+    def __init__(self, filename, average=None, unit=None, parallactify=None,
+                 **args):
         """\
         Create a scantable from a saved one or make a reference
@@ -302 +304 @@
                             * 'ASCII' (saves as ascii text file)
                             * 'MS2' (saves as an casacore MeasurementSet V2)
-                            * 'FITS' (save as image FITS - not readable by class)
+                            * 'FITS' (save as image FITS - not readable by 
+                                      class)
                             * 'CLASS' (save as FITS readable by CLASS)
 
@@ -370 +373 @@
         from asap import unique
         if not _is_valid(scanid):
-            raise RuntimeError( 'Please specify a scanno to drop from the scantable' )
+            raise RuntimeError( 'Please specify a scanno to drop from the'
+                                ' scantable' )
         scanid = _to_list(scanid)
         allscans = unique([ self.getscan(i) for i in range(self.nrow())])
@@ -433 +437 @@
 
     def __str__(self):
-        return Scantable._summary(self)
-
+        tempFile = tempfile.NamedTemporaryFile()
+        Scantable._summary(self, tempFile.name)
+        tempFile.seek(0)
+        asaplog.clear()
+        return tempFile.file.read()
+
+    @asaplog_post_dec
     def summary(self, filename=None):
         """\