Changeset 484

Timestamp:

02/21/05 08:25:12 (19 years ago)

Author:

mar637

Message:

• added history
• added contructor argument for (auto) averaging
• tidying

File:

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

trunk/python/scantable.py

@@ -9 +9 @@
     """
     
-    def __init__(self, filename, unit=None):
+    def __init__(self, filename, average=None, unit=None):
         """
         Create a scantable from a saved one or make a reference
@@ -21 +21 @@
                          [advanced] a reference to an existing
                          scantable
-           unit:         brightness unit; must be consistent with K or Jy.
+            average:     average all integrations withinb a scan on read.
+                         The default (True) is taken from .asaprc.
+            unit:         brightness unit; must be consistent with K or Jy.
                          Over-rides the default selected by the reader
                          (input rpfits/sdfits/ms) or replaces the value
                          in existing scantables
         """
+        varlist = vars()
         self._vb = rcParams['verbose']
         self._p = None
-        from os import stat as st
-        import stat
+        
+        if average is None or type(average) is not bool:
+            autoav = rcParams['scantable.autoaverage']            
+
         if isinstance(filename,sdtable):
             sdtable.__init__(self, filename)            
@@ -49 +54 @@
                     print "The given file '%s'is not a valid asap table." % (filename)
                     return
-            else:
-                autoav = rcParams['scantable.autoaverage']
-
+            else:            
                 from asap._asap import sdreader
                 ifSel = -1
@@ -70 +73 @@
                 else:
                     sdtable.__init__(self,tbl)
+                self._add_history("scantable", varlist)
 
     def save(self, name=None, format=None, stokes=False, overwrite=False):
@@ -178 +182 @@
                 print "Illegal file name '%s'." % (filename)
         print info
-
+            
     def set_cursor(self, thebeam=0,theif=0,thepol=0):
         """
@@ -189 +193 @@
                                             # if=0, pol=1
         """
+        varlist = vars()
         self.setbeam(thebeam)
         self.setpol(thepol)
         self.setif(theif)
+        self._add_history("set_cursor",varlist)
         return
 
@@ -380 +386 @@
                      one of '*Hz','km/s','channel', ''
         """
-
+        varlist = vars()
         if unit in ['','pixel', 'channel']:
             unit = ''
@@ -387 +393 @@
         self._setcoordinfo(inf)
         if self._p: self.plot()
-
-    def set_instrument (self, instr):
+        self._add_history("set_unit",varlist)
+
+    def set_instrument(self, instr):
         """
         Set the instrument for subsequent processing
@@ -396 +403 @@
         """
         self._setInstrument(instr)
+        self._add_history("set_instument",vars())
 
     def set_doppler(self, doppler='RADIO'):
@@ -403 +411 @@
             doppler:    One of 'RADIO', 'OPTICAL', 'Z', 'BETA', 'GAMMA'
         """
-
+        varlist = vars()
         inf = list(self._getcoordinfo())
         inf[2] = doppler
         self._setcoordinfo(inf)
         if self._p: self.plot()
+        self._add_history("set_doppler",vars())
  
     def set_freqframe(self, frame=None):
@@ -417 +426 @@
             scan.set_freqframe('BARY')
         """
-        if not frame: frame = rcParams['scantable.freqframe']
+        if frame is None: frame = rcParams['scantable.freqframe']
+        varlist = vars()
         valid = ['REST','TOPO','LSRD','LSRK','BARY', \
                    'GEO','GALACTO','LGROUP','CMB']
@@ -424 +434 @@
             inf[1] = frame
             self._setcoordinfo(inf)
+            self._add_history("set_freqframe",varlist)
         else:
             print "Please specify a valid freq type. Valid types are:\n",valid
@@ -480 +491 @@
            
         """
+        varlist = vars()
         u = self._getcoordinfo()[0]
         if self._vb:
@@ -487 +499 @@
         data = self._getabcissa()
         msk = zeros(n)
-        for  window in args:
+        for window in args:
             if (len(window) != 2 or window[0] > window[1] ):
                 print "A window needs to be defined as [min,max]"
@@ -498 +510 @@
                 from numarray import logical_not
                 msk = logical_not(msk)
+        self._add_history("create_mask", varlist)
         return msk
     
@@ -517 +530 @@
         sdtable._lines(self)
 
-    def set_restfreqs(self, freqs=None, unit='Hz', lines=None, source=None, theif=None):
+    def set_restfreqs(self, freqs=None, unit='Hz', lines=None, source=None,
+                      theif=None):
         """
         Select the restfrequency for the specified source and IF OR
@@ -548 +562 @@
             scan.set_restfreqs(freqs=[1.4e9,1.67e9])
         """
+        varlist = vars()
         if source is None:
             source = ""
@@ -563 +578 @@
            lines = []
         sdtable._setrestfreqs(self, freqs, unit, lines, source, theif)
-        return
+        self._add_history("set_restfreqs", varlist)
+        
 
 
@@ -585 +601 @@
             sdtable.setpol(self, thepol)
             sdtable._flag(self)
+            self._add_history("flag_spectrum", vars())
         else:
             print "Please specify a valid (Beam/IF/Pol)"
@@ -683 +700 @@
                         if shp[2] > 1: out +=  ' %s[%d] ' % (a[2],l)
                         out += '= %3.3f\n' % (t[j,k,l])
-            out += "--------------------------------------------------\n"
-        print "--------------------------------------------------"
+            out += "-"*80
+            out += "\n"
+        print "-"*80
         print " ", label
-        print "--------------------------------------------------"
+        print "-"*80
         print out 
+
+    def history(self):
+        hist = list(self._gethistory())
+        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
+        return
+
+    def _add_history(self, funcname, parameters):
+        # create date
+        sep = "##"
+        from datetime import datetime
+        dstr = datetime.now().strftime('%Y/%m/%d %H:%M:%S')
+        hist = dstr+sep
+        hist += funcname+sep#cdate+sep
+        if parameters.has_key('self'): del parameters['self']
+        for k,v in parameters.iteritems():
+            if type(v) is dict:
+                for k2,v2 in v.iteritems():
+                    hist += k2
+                    hist += "="
+                    if isinstance(v2,scantable):
+                        hist += 'scantable'
+                    elif k2 == 'mask':
+                        hist += str(self._zip_mask(v2))
+                    else:
+                        hist += str(v2)                    
+            else:
+                hist += k
+                hist += "="
+                if isinstance(v,scantable):
+                    hist += 'scantable'
+                elif k == 'mask':
+                    hist += str(self._zip_mask(v))
+                else:
+                    hist += str(v)
+            hist += sep
+        hist = hist[:-2] # remove trailing '##'
+        self._addhistory(hist)
+        
+
+    def _zip_mask(self, mask):
+        mask = list(mask)
+        i = 0
+        segments = []
+        while mask[i:].count(1):
+            i += mask[i:].index(1)
+            if mask[i:].count(0):
+                j = i + mask[i:].index(0)
+            else:
+                j = len(mask)                
+            segments.append([i,j])
+            i = j
+        return segments