Changeset 700

Timestamp:

10/20/05 16:44:18 (19 years ago)

Author:

mar637

Message:

merger from Release-1-fixes

Location:

trunk/python

Files:

• __init__.py (modified) (23 diffs)
• asapplotter.py (modified) (1 diff)

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.stacking'    : ['p', str],
     'plotter.panelling'   : ['s', str],
+    'plotter.colours'     : ['', str],
+    'plotter.linestyles'  : ['', str],
 
     # scantable
@@ -71 +73 @@
 
 def list_rcparameters():
-
+    
     print """
     # general
@@ -82 +84 @@
     # apply operations on the input scantable or return new one
     insitu                     : True
-
+    
     # plotting
     # default mode for colour stacking
@@ -89 +91 @@
     # default mode for panelling
     plotter.panelling          : scan
+
+    # default colours/linestyles
+    plotter.colours            :
+    plotter.linestyles         : 
 
     # scantable
@@ -101 +107 @@
 
     # apply action to all axes not just the cursor location
-    scantable.allaxes          : True
+    scantable.allaxes          : True 
 
     # use internal plotter
@@ -108 +114 @@
     # 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'
@@ -122 +128 @@
         #print message
         return ret
-
+        
     cnt = 0
     for line in file(fname):
@@ -133 +139 @@
             print ('Illegal line #%d\n\t%s\n\tin file "%s"' % (cnt, line, fname))
             continue
-
+        
         key, val = tup
         key = key.strip()
@@ -139 +145 @@
             print ('Bad key "%s" on line %d in %s' % (key, cnt, fname))
             continue
-
+        
         default, converter =  defaultParams[key]
 
@@ -161 +167 @@
 
 # this is the instance used by the asap classes
-rcParams = rc_params()
+rcParams = rc_params() 
 
 rcParamsDefault = dict(rcParams.items()) # a copy
@@ -175 +181 @@
 
     sets the current rc params and is equivalent to
-
+    
       rcParams['scantable.save'] = 'SDFITS'
 
@@ -182 +188 @@
 
     aliases = {}
-
+    
     for k,v in kwargs.items():
         name = aliases.get(k) or k
@@ -188 +194 @@
         if not rcParams.has_key(key):
             raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' % (key, group, name))
-
+        
         rcParams[key] = v
 
@@ -224 +230 @@
     if os.environ.has_key('DISPLAY'):
         print "Initialising asapplotter with the name 'plotter' ..."
-        import asapplotter
+        import asapplotter 
         plotter = asapplotter.asapplotter()
     else:
         print "No $DISPLAY set. Disabling plotter.\n"
 
+
 __date__ = '$Date$'.split()[1]
-__version__  = '1.2'
+__version__  = '1.1'
 
 def list_scans(t = scantable):
     import sys, types
-    #meta_t = type(t)
-    #if meta_t == types.InstanceType:
-    #    t = t.__class__
-    #elif meta_t not in [types.ClassType, types.TypeType]:
-    #    t = meta_t
     globs = sys.modules['__main__'].__dict__.iteritems()
     print "The user created scantables are:"
@@ -245 +247 @@
 
 def commands():
-    x = """
+    x = """    
     [The scan container]
         scantable           - a container for integrations/scans
@@ -284 +286 @@
             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.
@@ -294 +296 @@
             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
@@ -310 +312 @@
      [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
@@ -348 +350 @@
             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
@@ -368 +370 @@
         mask_not            - boolean operations on masks created with
                               scantable.create_mask
-
+        
     Note:
         How to use this with help:
@@ -374 +376 @@
         [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

trunk/python/asapplotter.py

@@ -359 +359 @@
                     if self._title and len(self._title) > 0:
                         tlab = self._title[ii]
-                    else:
-                        if self._panelling == 'p':
-                            tlab = self._get_pollabel(scan, polmode)
-                        else:
-                            tlab = self._ldict.get(self._panelling)+' '+str(i)
+                    else:                        
+                        tlab = self._ldict.get(self._panelling)+' '+str(i)
                     if self._lmap and len(self._lmap) > 0:
                         llab = self._lmap[jj]