Changeset 489 for trunk/python/scantable.py

Timestamp:

02/21/05 11:38:19 (19 years ago)

Author:

mar637

Message:

• added history to all functions, which modify the data

File:

• trunk/python/scantable.py (modified) (5 diffs)

trunk/python/scantable.py

@@ -27 +27 @@
                          (input rpfits/sdfits/ms) or replaces the value
                          in existing scantables
-        """
+        """        
+        if average is None or type(average) is not bool:
+            average = rcParams['scantable.autoaverage']            
+
         varlist = vars()
         self._vb = rcParams['verbose']
         self._p = None
-        
-        if average is None or type(average) is not bool:
-            autoav = rcParams['scantable.autoaverage']            
 
         if isinstance(filename,sdtable):
@@ -64 +64 @@
                 if unit is not None:
                     tbl.set_fluxunit(unit)
-                if autoav:
-                    from asap._asap import average
+                if average:
+                    from asap._asap import average as _av
                     tmp = tuple([tbl])
                     print 'Auto averaging integrations...'
-                    tbl2 = average(tmp,(),True,'none')
+                    tbl2 = _av(tmp,(),True,'none')
                     sdtable.__init__(self,tbl2)
                     del r,tbl
@@ -81 +81 @@
         Parameters:
             name:        the name of the outputfile. For format="FITS" this
-                         is the directory file name into which all the files will
-                         be written (default is 'asap_FITS')
+                         is the directory file name into which all the files
+                         will be written (default is 'asap_FITS')
             format:      an optional file format. Default is ASAP.
                          Allowed are - 'ASAP' (save as ASAP [aips++] Table),
@@ -90 +90 @@
                                        'MS2' (saves as an aips++
                                               MeasurementSet V2)
-            stokes:      Convert to Stokes parameters.  Default is False.
+            stokes:      Convert to Stokes parameters (only available
+                         currently with FITS and ASCII formats.
+                         Default is False.
             overwrite:   If the file should be overwritten if it exists.
                          The default False is to return with warning
@@ -711 +713 @@
         print "-"*80
         for h in hist:
-            items = h.split("##")
-            date = items[0]
-            func = items[1]
-            items = items[2:]
-            print date            
-            print "Function: %s\n  Parameters:" % (func)
-            for i in items:
-                s = i.split("=")
-                print "   %s: %s" % (s[0],s[1])
-            print "-"*80
+            if h.startswith("---"):
+                print h
+            else:
+                items = h.split("##")
+                date = items[0]
+                func = items[1]
+                items = items[2:]
+                print date            
+                print "Function: %s\n  Parameters:" % (func)
+                for i in items:
+                    s = i.split("=")
+                    print "   %s = %s" % (s[0],s[1])
+                print "-"*80
         return