Changeset 489 for trunk

Timestamp:

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

Author:

mar637

Message:

• added history to all functions, which modify the data

Location:

trunk/python

Files:

• asapmath.py (modified) (17 diffs)
• scantable.py (modified) (5 diffs)

trunk/python/asapmath.py

@@ -31 +31 @@
     if kwargs.has_key('mask'):
         mask = kwargs.get('mask')
+    varlist = vars()
     lst = tuple(args)
+    del varlist["kwargs"]
+    varlist["args"] = "%d scantables" % len(lst)
+    # need special formatting her for history...
+    
     from asap._asap import average as _av
     for s in lst:
@@ -37 +42 @@
             print "Please give a list of scantables"
             return
-    return scantable(_av(lst, mask, scanAv, weight))
+    s = scantable(_av(lst, mask, scanAv, weight))
+    s._add_history("average_time",varlist)
+    return s
 
 def quotient(source, reference, preserve=True):
@@ -69 +76 @@
                        as well as the data
     """
+    varlist = vars()
     if not isinstance(left,scantable) and not isinstance(right,scantable):
         print "Please provide two scantables as input"
         return
     from asap._asap import b_operate as _bop
-    return scantable(_bop(left, right, op, tsys))
+    s = scantable(_bop(left, right, op, tsys))
+    s._add_history("simple_math", varlist)
+    return s
 
 def scale(scan, factor, insitu=None, allaxes=None, tsys=True):
@@ -92 +102 @@
     if allaxes is None: allaxes = rcParams['scantable.allaxes']
     if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if not insitu:
         from asap._asap import scale as _scale
-        return scantable(_scale(scan, factor, allaxes, tsys))
+        s = scantable(_scale(scan, factor, allaxes, tsys))
+        s._add_history("scale",varlist)
+        return s
     else:
         from asap._asap import scale_insitu as _scale
         _scale(scan, factor, allaxes, tsys)
+        scan._add_history("scale",varlist)
         return
         
-
 def add(scan, offset, insitu=None, allaxes=None):
     """
@@ -124 +137 @@
         return
         
-def convert_flux(scan, jyperk=None, eta=None, d=None, insitu=None, allaxes=None):
+def convert_flux(scan, jyperk=None, eta=None, d=None, insitu=None,
+                 allaxes=None):
     """
     Return a scan where all spectra are converted to either Jansky or Kelvin
@@ -146 +160 @@
     if allaxes is None: allaxes = rcParams['scantable.allaxes']
     if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if jyperk is None: jyperk = -1.0
     if d is None: d = -1.0
@@ -151 +166 @@
     if not insitu:
         from asap._asap import convertflux as _convert
-        return scantable(_convert(scan, d, eta, jyperk, allaxes))
+        s = scantable(_convert(scan, d, eta, jyperk, allaxes))
+        s._add_history("convert_flux", varlist)
+        return s
     else:
         from asap._asap import convertflux_insitu as _convert
         _convert(scan, d, eta, jyperk, allaxes)
+        scan._add_history("convert_flux", varlist)
         return
 
@@ -200 +218 @@
     """
     if allaxes is None: allaxes = rcParams['scantable.allaxes']
+    if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if poly is None:
        poly = ()
-    if insitu is None: insitu = rcParams['insitu']
     from os.path import expandvars
     filename = expandvars(filename)
     if not insitu:
         from asap._asap import gainel as _gainEl
-        return scantable(_gainEl(scan, poly, filename, method, allaxes))
+        s = scantable(_gainEl(scan, poly, filename, method, allaxes))
+        s._add_history("gain_el", varlist)
+        return s
     else:
         from asap._asap import gainel_insitu as _gainEl
         _gainEl(scan, poly, filename, method, allaxes)
+        scan._add_history("gain_el", varlist)
         return
         
@@ -229 +251 @@
                      The default is taken from .asaprc (False)
     """
+    if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if reftime is None: reftime = ''
-    if insitu is None: insitu = rcParams['insitu']
     perfreqid = not perif
     if not insitu:
         from asap._asap import freq_align as _align
-        return scantable(_align(scan, reftime, method, perfreqid))
+        s = scantable(_align(scan, reftime, method, perfreqid))
+        s._add_history("freq_align", varlist)
+        return s
     else:
         from asap._asap import freq_align_insitu as _align
         _align(scan, reftime, method, perfreqid)
+        scan._add_history("freq_align", varlist)
         return
         
@@ -257 +283 @@
     if allaxes is None: allaxes = rcParams['scantable.allaxes']
     if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if not insitu:
         from asap._asap import opacity as _opacity
-        return scantable(_opacity(scan, tau, allaxes))
+        s = scantable(_opacity(scan, tau, allaxes))
+        s._add_history("opacity", varlist)
+        return s
     else:
         from asap._asap import opacity_insitu as _opacity
         _opacity(scan, tau, allaxes)
+        scan._add_history("opacity", varlist)
         return
         
@@ -274 +304 @@
     """
     if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if not insitu:
         from asap._asap import bin as _bin
-        return scantable(_bin(scan, width))
+        s = scantable(_bin(scan, width))
+        s._add_history("bin",varlist)
+        return s
     else:
         from asap._asap import bin_insitu as _bin
         _bin(scan, width)
+        scan._add_history("bin",varlist)
         return
 
@@ -293 +327 @@
     """
     if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if not insitu:
         from asap._asap import resample as _resample
-        return scantable(_resample(scan, method, width))
+        s = scantable(_resample(scan, method, width))
+        s._add_history("resample",varlist)
+        return s
     else:
         from asap._asap import resample_insitu as _resample
         _resample(scan, method, width)
+        scan._add_history("resample",varlist)
         return
 
@@ -318 +356 @@
         polav = average_pols(myscan)
     """
+    if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
+
     if mask is None:
         mask = ()
-    if insitu is None: insitu = rcParams['insitu']
     if not insitu:
         from asap._asap import averagepol as _avpol
-        return scantable(_avpol(scan, mask, weight))
+        s = scantable(_avpol(scan, mask, weight))
+        s._add_history("average_pol",varlist)
+        return s
     else:
         from asap._asap import averagepol_insitu as _avpol
         _avpol(scan, mask, weight)
+        scan._add_history("average_pol",varlist)
         return
     
@@ -352 +395 @@
     if allaxes is None: allaxes = rcParams['scantable.allaxes']
     if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     if not insitu:
         from asap._asap import smooth as _smooth
-        return scantable(_smooth(scan,kernel,width,allaxes))
+        s = scantable(_smooth(scan,kernel,width,allaxes))
+        s._add_history("smooth", varlist)
+        return s
     else:
         from asap._asap import smooth_insitu as _smooth
         _smooth(scan,kernel,width,allaxes)
+        scan._add_history("smooth", varlist)
         return
     
@@ -375 +422 @@
         bscan = poly_baseline(scan, order=3)
     """
+    if insitu is None: insitu = rcParams['insitu']
+    varlist = vars()
     from asap.asapfitter import fitter
     if mask is None:
@@ -384 +433 @@
     f.set_function(poly=order)    
     sf = f.auto_fit(insitu)
+    sf._add_history("poly_baseline", varlist)
     return sf
 
-def rotate_xyphase (scan, angle, allaxes=None):
+def rotate_xyphase(scan, angle, allaxes=None):
     """
     Rotate the phase of the XY correlation.  This is always done in situ
@@ -400 +450 @@
     """
     if allaxes is None: allaxes = rcParams['scantable.allaxes']
+    varlist = vars()
     from asap._asap import rotate_xyphase as _rotate_xyphase
     _rotate_xyphase(scan, angle, allaxes)
+    s._add_history("rotate_xyphase", varlist)
     return
-

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