Changeset 1422 for trunk

Timestamp:

05/22/08 16:38:44 (16 years ago)

Author:

Malte Marquarding

Message:

added scantable.history rc parameter to optionally suppress history generation. Fixed warning in matplotlib re backend import

Location:

trunk/python

Files:

• __init__.py (modified) (7 diffs)
• asaplotgui.py (modified) (1 diff)

trunk/python/__init__.py

@@ -105 +105 @@
     'scantable.freqframe' : ['LSRK', str],  #default frequency frame
     'scantable.verbosesummary'   : [False, _validate_bool],
-    'scantable.storage'   : ['memory', str]
+    'scantable.storage'   : ['memory', str],
+    'scantable.history'   : [True, _validate_bool]
     # fitter
     }
@@ -154 +155 @@
 # default storage of scantable ('memory'/'disk')
 scantable.storage          : memory
+
+# write history of each call to scantable
+scantable.history          : True
+
 # default ouput format when saving
 scantable.save             : ASAP
+
 # auto averaging on read
 scantable.autoaverage      : True
@@ -242 +248 @@
     for k,v in kwargs.items():
         name = aliases.get(k) or k
-        key = '%s.%s' % (group, name)
+        if len(group):
+            key = '%s.%s' % (group, name)
+        else:
+            key = name
         if not rcParams.has_key(key):
             raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' % (key, group, name))
@@ -351 +360 @@
 if rcParams['useplotter']:
     try:
-        from  asapplotter import asapplotter
-        gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
-        if gui:
+            from asapplotter import asapplotter
+            gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
+            if gui:
+            import matplotlib
+            matplotlib.use("TkAgg")
             import pylab
-            xyplotter = pylab
+        xyplotter = pylab
             plotter = asapplotter(gui)
             del gui
     except ImportError:
-        print "Matplotlib not installed. No plotting available"
+            print "Matplotlib not installed. No plotting available"
 
 __date__ = '$Date$'.split()[1]
@@ -368 +379 @@
 if is_ipython():
     def version(): print  "ASAP %s(%s)"% (__version__, __date__)
+    
     def list_scans(t = scantable):
         import types
@@ -420 +432 @@
             get_restfreqs   - get the current list of rest frequencies
             set_restfreqs   - set a list of rest frequencies
-            shift_refpix    - shift the reference pixel of the IFs
+                shift_refpix    - shift the reference pixel of the IFs
             flag            - flag selected channels in the data
             lag_flag        - flag specified frequency in the data
@@ -427 +439 @@
             nbeam,nif,nchan,npol - the number of beams/IFs/Pols/Chans
             nscan           - the number of scans in the scantable
-            nrow            - te number of spectra in the scantable
+            nrow            - the number of spectra in the scantable
             history         - print the history of the scantable
             get_fit         - get a fit which has been stored witnh the data

trunk/python/asaplotgui.py

@@ -5 +5 @@
 from asap.asaplotbase import *
 import Tkinter as Tk
+import matplotlib
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, \
         FigureManagerTkAgg
 # Force use of the newfangled toolbar.
-import matplotlib
-matplotlib.use("TkAgg")
 matplotlib.rcParams['toolbar'] = 'toolbar2'