Changeset 706 for trunk/python

Timestamp:

11/02/05 13:17:39 (19 years ago)

Author:

mar637

Message:

various changes to enable non-gui plotting

File:

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

trunk/python/__init__.py

@@ -28 +28 @@
      * environ var ASAPRC
      * HOME/.asaprc
-     
+
     """
 
@@ -47 +47 @@
             return fname
     return None
-        
+
 
 defaultParams = {
@@ -54 +54 @@
     'useplotter'          : [True, _validate_bool],
     'insitu'              : [True, _validate_bool],
-    
+
     # plotting
+    'plotter.gui'         : [True, _validate_bool],
     'plotter.stacking'    : ['p', str],
     'plotter.panelling'   : ['s', str],
     'plotter.colours'     : ['', str],
     'plotter.linestyles'  : ['', str],
-
+    
     # scantable
     'scantable.save'      : ['ASAP', str],
@@ -73 +74 @@
 
 def list_rcparameters():
-    
+
     print """
     # general
@@ -84 +85 @@
     # apply operations on the input scantable or return new one
     insitu                     : True
+
+    # plotting
     
-    # plotting
+    # do we want a GUI or plot to a file
+    plotter.gui                : True
+    
     # default mode for colour stacking
     plotter.stacking           : Pol
@@ -94 +99 @@
     # default colours/linestyles
     plotter.colours            :
-    plotter.linestyles         : 
+    plotter.linestyles         :
 
     # scantable
@@ -107 +112 @@
 
     # apply action to all axes not just the cursor location
-    scantable.allaxes          : True 
+    scantable.allaxes          : True
 
     # use internal plotter
@@ -114 +119 @@
     # Control the level of information printed by summary
     scantable.verbosesummary   : False
-    
-    # Fitter    
-    """
-    
+
+    # Fitter
+    """
+
 def rc_params():
     'Return the default params updated from the values in the rc file'
-    
+
     fname = _asap_fname()
-    
+
     if fname is None or not os.path.exists(fname):
         message = 'could not find rc file; returning defaults'
@@ -128 +133 @@
         #print message
         return ret
-        
+
     cnt = 0
     for line in file(fname):
@@ -139 +144 @@
             print ('Illegal line #%d\n\t%s\n\tin file "%s"' % (cnt, line, fname))
             continue
-        
+
         key, val = tup
         key = key.strip()
@@ -145 +150 @@
             print ('Bad key "%s" on line %d in %s' % (key, cnt, fname))
             continue
-        
+
         default, converter =  defaultParams[key]
 
@@ -167 +172 @@
 
 # this is the instance used by the asap classes
-rcParams = rc_params() 
+rcParams = rc_params()
 
 rcParamsDefault = dict(rcParams.items()) # a copy
@@ -181 +186 @@
 
     sets the current rc params and is equivalent to
-    
+
       rcParams['scantable.save'] = 'SDFITS'
 
@@ -188 +193 @@
 
     aliases = {}
-    
+
     for k,v in kwargs.items():
         name = aliases.get(k) or k
@@ -194 +199 @@
         if not rcParams.has_key(key):
             raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' % (key, group, name))
-        
+
         rcParams[key] = v
 
@@ -228 +233 @@
 
 if rcParams['useplotter']:
-    if os.environ.has_key('DISPLAY'):
-        print "Initialising asapplotter with the name 'plotter' ..."
-        import asapplotter 
-        plotter = asapplotter.asapplotter()
-    else:
-        print "No $DISPLAY set. Disabling plotter.\n"
-
+    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)
 
 __date__ = '$Date$'.split()[1]
-__version__  = '1.1'
-
-def list_scans(t = scantable):
-    import sys, 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)
+__version__  = '1.2'
+
+if rcParams['verbose']:
+    def list_scans(t = scantable):
+        import sys, 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
+else:
+    pass
 
 def commands():
-    x = """    
+    x = """
     [The scan container]
         scantable           - a container for integrations/scans
@@ -286 +293 @@
             history         - print the history of the scantable
             get_fit         - get a fit which has been stored witnh the data
-            average_time    - return the (weighted) time average of a scan 
+            average_time    - return the (weighted) time average of a scan
                               or a list of scans
             average_pol     - average the polarisations together.
@@ -296 +303 @@
             quotient        - return the on/off quotient
             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
             bin             - return a scan with binned channels
             resample        - return a scan with resampled channels
             smooth          - return the spectrally smoothed scan
             poly_baseline   - fit a polynomial baseline to all Beams/IFs/Pols
-            auto_poly_baseline - automatically fit a polynomial baseline 
+            auto_poly_baseline - automatically fit a polynomial baseline
             gain_el         - apply gain-elevation correction
             opacity         - apply opacity correction
@@ -312 +319 @@
      [Math] Mainly functions which operate on more than one scantable
 
-            average_time    - return the (weighted) time average 
+            average_time    - return the (weighted) time average
                               of a list of scans
             quotient        - return the on/off quotient
@@ -350 +357 @@
             set_abcissa     - specify a user label for the abcissa
             set_layout      - specify the multi-panel layout (rows,cols)
-            
+
     [Reading files]
         reader              - access rpfits/sdfits files
@@ -370 +377 @@
         mask_not            - boolean operations on masks created with
                               scantable.create_mask
-        
+
     Note:
         How to use this with help:
@@ -376 +383 @@
         [xxx] is just a category
         Every 'sub-level' in this list should be replaces by a '.' Period when
-        using help 
+        using help
         Example:
             ASAP> help scantable # to get info on ths scantable
@@ -386 +393 @@
     return
 
-print """Welcome to ASAP v%s (%s) - the ATNF Spectral Analysis Package
+def welcome():
+    return """Welcome to ASAP v%s (%s) - the ATNF Spectral Analysis Package
 
 Please report any bugs to:
@@ -392 +400 @@
 
 [IMPORTANT: ASAP is 0-based]
-Type commands() to get a list of all available ASAP commands.
-""" % (__version__, __date__)
+Type commands() to get a list of all available ASAP commands.""" % (__version__, __date__)