Changeset 1560

Timestamp:

03/31/09 12:13:51 (16 years ago)

Author:

Malte Marquarding

Message:

minor doc fixes; fixed list_scans, which seems brokrn in latest ipython; rc parameter xaxisformatting -> axesformatting; fixed font settings for matplotlib rc parameters

Location:

trunk/python

Files:

• __init__.py (modified) (9 diffs)
• asaplotbase.py (modified) (5 diffs)

trunk/python/__init__.py

@@ -107 +107 @@
     'plotter.histogram'  : [False, _validate_bool],
     'plotter.papertype'  : ['A4', str],
-    'plotter.xaxisformatting' : ['asap', str],
+    'plotter.axesformatting' : ['mpl', str],
 
     # scantable
@@ -144 +144 @@
 plotter.panelling          : scan
 
-# push panels together, to share axislabels
+# push panels together, to share axis labels
 plotter.ganged             : True
 
@@ -162 +162 @@
 
 # The formatting style of the xaxis
-plotter.xaxisformatting    : 'asap' or 'mpl'
+plotter.axesformatting    : 'mpl' (default) or 'asap' (for old versions of matplotlib)
 
 # scantable
@@ -188 +188 @@
 # This is has to be a regular expression
 scantable.reference         : .*(e|w|_R)$
+
 # Fitter
 """
@@ -389 +390 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '$Revision:$'
+__version__  = '$Revision$'
 
 def is_ipython():
@@ -396 +397 @@
     def version(): print  "ASAP %s(%s)"% (__version__, __date__)
     
-    def list_scans(t = scantable):
-        import types
-        globs = sys.modules['__main__'].__dict__.iteritems()
-        print "The user created scantables are:"
-        sts = map(lambda x: x[0], filter(lambda x: isinstance(x[1], t), globs))
-        print filter(lambda x: not x.startswith('_'), sts)
-        return
+    def list_scans(t = scantable):        
+        import inspect
+        print "The user created scantables are: ",
+        globs=inspect.currentframe().f_back.f_locals.copy()
+        out = [ k for k,v in globs.iteritems() \
+                     if isinstance(v, scantable) and not k.startswith("_") ]
+        print out
+        return out
 
     def commands():
@@ -472 +474 @@
             mx_quotient     - Form a quotient using MX data (off beams)
             scale, *, /     - return a scan scaled by a given factor
-            add, +, -       - return a scan with given value added
+            add, +          - return a scan with given value added
+            sub, -          - return a scan with given value subtracted
             bin             - return a scan with binned channels
             resample        - return a scan with resampled channels
@@ -579 +582 @@
             axhline,axvline - draw horizontal/vertical lines
             axhspan,axvspan - draw horizontal/vertical regions
+            annotate        - draw an arrow with label
+            create_mask     - create a scnatble mask interactively
 
         xyplotter           - matplotlib/pylab plotting functions
@@ -592 +597 @@
         commands            - this command
         print               - print details about a variable
-        list_scans          - list all scantables created bt the user
+        list_scans          - list all scantables created by the user
         list_files          - list all files readable by asap (default rpf)
         del                 - delete the given variable from memory

trunk/python/asaplotbase.py

@@ -14 +14 @@
 from asap import rcParams as asaprcParams
 from matplotlib.ticker import OldScalarFormatter
-from matplotlib.ticker import NullLocator
 
 # API change in mpl >= 0.98
@@ -20 +19 @@
     from matplotlib.transforms import blended_transform_factory
 except ImportError:
-    from matplotlib.transforms import blend_xy_sep_transform  as blended_transform_factory
+    from matplotlib.transforms import blend_xy_sep_transform as blended_transform_factory
 
 if int(matplotlib.__version__.split(".")[1]) < 87:
     print "Warning: matplotlib version < 0.87. This might cause errors. Please upgrade."
-
-#class MyFormatter(OldScalarFormatter):
-#    def __call__(self, x, pos=None):
-#        last = len(self.locs)-2
-#        if pos==0:
-#            return ''
-#        else: return OldScalarFormatter.__call__(self, x, pos)
 
 class asaplotbase:
@@ -645 +637 @@
                     self.subplots[i]['axes'] = self.figure.add_subplot(rows,
                                                 cols, i+1)
-                    if asaprcParams['plotter.xaxisformatting'] == 'mpl':
+                    if asaprcParams['plotter.axesformatting'] != 'mpl':
                         self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
                 else:
@@ -651 +643 @@
                         self.subplots[i]['axes'] = self.figure.add_subplot(rows,
                                                 cols, i+1)
-                        if asaprcParams['plotter.xaxisformatting'] != 'mpl':
+                        if asaprcParams['plotter.axesformatting'] != 'mpl':
                             
                             self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
@@ -733 +725 @@
                         sp['axes'].legend((' '))
 
+
             from matplotlib.artist import setp
-            fp = FP(size=rcParams['xtick.labelsize'])
-            xts = fp.get_size_in_points()- (self.cols)/2
-            fp = FP(size=rcParams['ytick.labelsize'])
-            yts = fp.get_size_in_points() - (self.rows)/2
+            fpx = FP(size=rcParams['xtick.labelsize'])
+            xts = fpx.get_size_in_points()- (self.cols)/2
+            fpy = FP(size=rcParams['ytick.labelsize'])
+            yts = fpy.get_size_in_points() - (self.rows)/2
+            fpa = FP(size=rcParams['axes.labelsize'])
+            fpat = FP(size=rcParams['axes.titlesize'])
+            axsize =  fpa.get_size_in_points()
+            tsize =  fpat.get_size_in_points()
             for sp in self.subplots:
                 ax = sp['axes']
-                s = ax.title.get_size()
-                tsize = s-(self.cols+self.rows)
-                ax.title.set_size(tsize)
-                fp = FP(size=rcParams['axes.labelsize'])
+                off = 0
+                if len(self.subplots) > 1:
+                    off = self.cols+self.rows
+                ax.title.set_size(tsize-off)
                 setp(ax.get_xticklabels(), fontsize=xts)
                 setp(ax.get_yticklabels(), fontsize=yts)
-                origx =  fp.get_size_in_points()
-                origy = origx
                 off = 0
-                if self.cols > 1: off = self.cols
-                xfsize = origx-off
-                ax.xaxis.label.set_size(xfsize)
-                off = 0
-                if self.rows > 1: off = self.rows
-                yfsize = origy-off
-                ax.yaxis.label.set_size(yfsize)
+                if self.cols > 1:
+                    off = self.cols
+                ax.xaxis.label.set_size(axsize-off)
+                if self.rows > 1:
+                    off = self.rows
+                ax.yaxis.label.set_size(axsize-off)
 
     def subplot(self, i=None, inc=None):