Changeset 690 for trunk

Timestamp:

09/26/05 10:19:05 (19 years ago)

Author:

mar637

Message:

• tidy up, version bump

File:

• trunk/python/__init__.py (modified) (22 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.stacking'    : ['p', str],
     'plotter.panelling'   : ['s', str],
-    
+
     # scantable
     'scantable.save'      : ['ASAP', str],
@@ -71 +71 @@
 
 def list_rcparameters():
-    
+
     print """
     # general
@@ -82 +82 @@
     # apply operations on the input scantable or return new one
     insitu                     : True
-    
+
     # plotting
     # default mode for colour stacking
@@ -101 +101 @@
 
     # apply action to all axes not just the cursor location
-    scantable.allaxes          : True 
+    scantable.allaxes          : True
 
     # use internal plotter
@@ -108 +108 @@
     # 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 +122 @@
         #print message
         return ret
-        
+
     cnt = 0
     for line in file(fname):
@@ -133 +133 @@
             print ('Illegal line #%d\n\t%s\n\tin file "%s"' % (cnt, line, fname))
             continue
-        
+
         key, val = tup
         key = key.strip()
@@ -139 +139 @@
             print ('Bad key "%s" on line %d in %s' % (key, cnt, fname))
             continue
-        
+
         default, converter =  defaultParams[key]
 
@@ -161 +161 @@
 
 # this is the instance used by the asap classes
-rcParams = rc_params() 
+rcParams = rc_params()
 
 rcParamsDefault = dict(rcParams.items()) # a copy
@@ -175 +175 @@
 
     sets the current rc params and is equivalent to
-    
+
       rcParams['scantable.save'] = 'SDFITS'
 
@@ -182 +182 @@
 
     aliases = {}
-    
+
     for k,v in kwargs.items():
         name = aliases.get(k) or k
@@ -188 +188 @@
         if not rcParams.has_key(key):
             raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' % (key, group, name))
-        
+
         rcParams[key] = v
 
@@ -224 +224 @@
     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"
 
-#from numarray ones,zeros
-
-
 __date__ = '$Date$'.split()[1]
-__version__  = '1.1'
+__version__  = '1.2'
 
 def list_scans(t = scantable):
@@ -248 +245 @@
 
 def commands():
-    x = """    
+    x = """
     [The scan container]
         scantable           - a container for integrations/scans
@@ -287 +284 @@
             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.
@@ -293 +290 @@
                               all polarisations will contain the
                               averaged spectrum.
+            auto_quotient   - return the on/off quotient with
+                              automatic detection of the on/off scans
             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
@@ -311 +310 @@
      [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
@@ -349 +348 @@
             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
@@ -369 +368 @@
         mask_not            - boolean operations on masks created with
                               scantable.create_mask
-        
+
     Note:
         How to use this with help:
@@ -375 +374 @@
         [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