Changeset 715

Timestamp:

11/17/05 14:33:14 (18 years ago)

Author:

mar637

Message:

updated logging

File:

• trunk/python/__init__.py (modified) (4 diffs)

trunk/python/__init__.py

@@ -226 +226 @@
     return False
 
-from asap._asap import LogSink as _asaplog
-# use null sink if verbose==False
-#asaplog=_asaplog(rcParams['verbose'])
+
+# workaround for ipython, which redirects this if banner=0 in ipythonrc
+sys.stdout = sys.__stdout__
+sys.stderr = sys.__stderr__
+
+# Logging
+from asap._asap import Log as _asaplog
+global asaplog
 asaplog=_asaplog()
-global asaplog
+if rcParams['verbose']:
+    asaplog.enable()
+else:
+    asaplog.disable()
+
+def print_log():
+    log = asaplog.pop()
+    if len(log) and rcParams['verbose']: print log
+    return
+
 from asapfitter import *
 from asapreader import reader
 
 from asapmath import *
-from asap._asap import _math_setlog
-_math_setlog(asaplog)
-
 from scantable import *
 from asaplinefind import *
@@ -248 +259 @@
 if rcParams['useplotter']:
     from  asapplotter import *
-    if rcParams['verbose']:
-        print "Initialising GUI asapplotter with the name 'plotter' ..."
     gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
     plotter = asapplotter(gui)
+    del gui
 
 __date__ = '$Date$'.split()[1]
@@ -264 +274 @@
         print filter(lambda x: not x.startswith('_'), sts)
         return
-else:
-    pass
-
-def commands():
-    x = """
+
+    def commands():
+        x = """
     [The scan container]
         scantable           - a container for integrations/scans
@@ -403 +411 @@
             ASAP> help average_time
 
-    """
-    print x
-    return
+            """
+        print x
+        return
 
 def welcome():