Changes in trunk/python/scantable.py [1846:1948]

File:

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

trunk/python/scantable.py

@@ -2 +2 @@
 
 import os
+import numpy
 try:
     from functools import wraps as wraps_dec
@@ -11 +12 @@
 from asap._asap import filler
 from asap.parameters import rcParams
-from asap.logging import asaplog, print_log, print_log_dec
+from asap.logging import asaplog, asaplog_post_dec
 from asap.selector import selector
 from asap.linecatalog import linecatalog
 from asap.coordinate import coordinate
-from asap.utils import _n_bools, mask_not, mask_and, mask_or
+from asap.utils import _n_bools, mask_not, mask_and, mask_or, page
+from asap.asapfitter import fitter
 
 
@@ -22 +24 @@
     def wrap(obj, *args, **kw):
         basesel = obj.get_selection()
-        val = func(obj, *args, **kw)
-        obj.set_selection(basesel)
+        try:
+            val = func(obj, *args, **kw)
+        finally:
+            obj.set_selection(basesel)
         return val
     return wrap
@@ -35 +39 @@
 
     """
-    return (os.path.isdir(filename)
-            and not os.path.exists(filename+'/table.f1')
-            and os.path.exists(filename+'/table.info'))
-
-
+    if ( os.path.isdir(filename)
+         and os.path.exists(filename+'/table.info')
+         and os.path.exists(filename+'/table.dat') ):
+        f=open(filename+'/table.info')
+        l=f.readline()
+        f.close()
+        #if ( l.find('Scantable') != -1 ):
+        if ( l.find('Measurement Set') == -1 ):
+            return True
+        else:
+            return False
+    else:
+        return False
+##     return (os.path.isdir(filename)
+##             and not os.path.exists(filename+'/table.f1')
+##             and os.path.exists(filename+'/table.info'))
+
+def is_ms(filename):
+    """Is the given file a MeasurementSet?
+
+    Parameters:
+
+        filename: the name of the file/directory to test
+
+    """
+    if ( os.path.isdir(filename)
+         and os.path.exists(filename+'/table.info')
+         and os.path.exists(filename+'/table.dat') ):
+        f=open(filename+'/table.info')
+        l=f.readline()
+        f.close()
+        if ( l.find('Measurement Set') != -1 ):
+            return True
+        else:
+            return False
+    else:
+        return False
+    
 class scantable(Scantable):
     """\
@@ -45 +82 @@
     """
 
-    @print_log_dec
-    def __init__(self, filename, average=None, unit=None, getpt=None,
-                 antenna=None, parallactify=None):
+    @asaplog_post_dec
+    #def __init__(self, filename, average=None, unit=None, getpt=None,
+    #             antenna=None, parallactify=None):
+    def __init__(self, filename, average=None, unit=None, parallactify=None, **args):
         """\
         Create a scantable from a saved one or make a reference
@@ -73 +111 @@
                           the MS data faster in some cases.
 
-            antenna:      Antenna selection. integer (id) or string (name or id).
+            antenna:      for MeasurementSet input data only:
+                          Antenna selection. integer (id) or string (name or id).
 
             parallactify: Indicate that the data had been parallatified. Default
@@ -81 +120 @@
         if average is None:
             average = rcParams['scantable.autoaverage']
-        if getpt is None:
-            getpt = True
-        if antenna is not None:
-            asaplog.push("Antenna selection currently unsupported."
-                         "Using '0'")
-            print_log('WARN')
-        if antenna is None:
-            antenna = ''
-        elif type(antenna) == int:
-            antenna = '%s' % antenna
-        elif type(antenna) == list:
-            tmpstr = ''
-            for i in range( len(antenna) ):
-                if type(antenna[i]) == int:
-                    tmpstr = tmpstr + ('%s,'%(antenna[i]))
-                elif type(antenna[i]) == str:
-                    tmpstr=tmpstr+antenna[i]+','
-                else:
-                    asaplog.push('Bad antenna selection.')
-                    print_log('ERROR')
-                    return
-            antenna = tmpstr.rstrip(',')
+        #if getpt is None:
+        #    getpt = True
+        #if antenna is not None:
+        #    asaplog.push("Antenna selection currently unsupported."
+        #                 "Using ''")
+        #    asaplog.post('WARN')
+        #if antenna is None:
+        #    antenna = ''
+        #elif type(antenna) == int:
+        #    antenna = '%s' % antenna
+        #elif type(antenna) == list:
+        #    tmpstr = ''
+        #    for i in range( len(antenna) ):
+        #        if type(antenna[i]) == int:
+        #            tmpstr = tmpstr + ('%s,'%(antenna[i]))
+        #        elif type(antenna[i]) == str:
+        #            tmpstr=tmpstr+antenna[i]+','
+        #        else:
+        #            raise TypeError('Bad antenna selection.')
+        #    antenna = tmpstr.rstrip(',')
         parallactify = parallactify or rcParams['scantable.parallactify']
         varlist = vars()
@@ -115 +152 @@
                 if not os.path.exists(filename):
                     s = "File '%s' not found." % (filename)
-                    if rcParams['verbose']:
-                        asaplog.push(s)
-                        print_log('ERROR')
-                        return
                     raise IOError(s)
                 if is_scantable(filename):
@@ -127 +160 @@
                     # do not reset to the default freqframe
                     #self.set_freqframe(rcParams['scantable.freqframe'])
-                elif os.path.isdir(filename) \
-                         and not os.path.exists(filename+'/table.f1'):
+                #elif os.path.isdir(filename) \
+                #         and not os.path.exists(filename+'/table.f1'):
+                elif is_ms(filename):
+                    # Measurement Set
+                    opts={'ms': {}}
+                    mskeys=['getpt','antenna']
+                    for key in mskeys:
+                        if key in args.keys():
+                            opts['ms'][key] = args[key]
+                    #self._fill([filename], unit, average, getpt, antenna)
+                    self._fill([filename], unit, average, opts)
+                elif os.path.isfile(filename):
+                    #self._fill([filename], unit, average, getpt, antenna)
+                    self._fill([filename], unit, average)
+                else:
                     msg = "The given file '%s'is not a valid " \
                           "asap table." % (filename)
-                    if rcParams['verbose']:
-                        #print msg
-                        asaplog.push( msg )
-                        print_log( 'ERROR' )
-                        return
-                    else:
-                        raise IOError(msg)
-                else:
-                    self._fill([filename], unit, average, getpt, antenna)
+                    raise IOError(msg)
             elif (isinstance(filename, list) or isinstance(filename, tuple)) \
                   and isinstance(filename[-1], str):
-                self._fill(filename, unit, average, getpt, antenna)
+                #self._fill(filename, unit, average, getpt, antenna)
+                self._fill(filename, unit, average)
         self.parallactify(parallactify)
         self._add_history("scantable", varlist)
-        print_log()
-
-    @print_log_dec
+
+    @asaplog_post_dec
     def save(self, name=None, format=None, overwrite=False):
         """\
@@ -158 +196 @@
                          this is the root file name (data in 'name'.txt
                          and header in 'name'_header.txt)
+
             format:      an optional file format. Default is ASAP.
-                         Allowed are - 'ASAP' (save as ASAP [aips++] Table),
-                                       'SDFITS' (save as SDFITS file)
-                                       'ASCII' (saves as ascii text file)
-                                       'MS2' (saves as an aips++
-                                              MeasurementSet V2)
-                                       'FITS' (save as image FITS - not
-                                               readable by class)
-                                       'CLASS' (save as FITS readable by CLASS)
+                         Allowed are:
+
+                            * 'ASAP' (save as ASAP [aips++] Table),
+                            * 'SDFITS' (save as SDFITS file)
+                            * 'ASCII' (saves as ascii text file)
+                            * 'MS2' (saves as an casacore MeasurementSet V2)
+                            * 'FITS' (save as image FITS - not readable by class)
+                            * 'CLASS' (save as FITS readable by CLASS)
+
             overwrite:   If the file should be overwritten if it exists.
                          The default False is to return with warning
                          without writing the output. USE WITH CARE.
+
         Example::
 
@@ -187 +228 @@
             if not overwrite:
                 msg = "File %s exists." % name
-                if rcParams['verbose']:
-                    #print msg
-                    asaplog.push( msg )
-                    print_log( 'ERROR' )
-                    return
-                else:
-                    raise IOError(msg)
+                raise IOError(msg)
         format2 = format.upper()
         if format2 == 'ASAP':
@@ -201 +236 @@
             writer = stw(format2)
             writer.write(self, name)
-        print_log()
         return
 
@@ -233 +267 @@
         from asap import unique
         if not _is_valid(scanid):
-            if rcParams['verbose']:
-                #print "Please specify a scanno to drop from the scantable"
-                asaplog.push( 'Please specify a scanno to drop from the scantable' )
-                print_log( 'ERROR' )
-                return
-            else:
-                raise RuntimeError("No scan given")
-        try:
-            scanid = _to_list(scanid)
-            allscans = unique([ self.getscan(i) for i in range(self.nrow())])
-            for sid in scanid: allscans.remove(sid)
-            if len(allscans) == 0:
-                raise ValueError("Can't remove all scans")
-        except ValueError:
-            if rcParams['verbose']:
-                #print "Couldn't find any match."
-                print_log()
-                asaplog.push( "Couldn't find any match." )
-                print_log( 'ERROR' )
-                return
-            else: raise
-        try:
-            sel = selector(scans=allscans)
-            return self._select_copy(sel)
-        except RuntimeError:
-            if rcParams['verbose']:
-                #print "Couldn't find any match."
-                print_log()
-                asaplog.push( "Couldn't find any match." )
-                print_log( 'ERROR' )
-            else:
-                raise
+            raise RuntimeError( 'Please specify a scanno to drop from the scantable' )
+        scanid = _to_list(scanid)
+        allscans = unique([ self.getscan(i) for i in range(self.nrow())])
+        for sid in scanid: allscans.remove(sid)
+        if len(allscans) == 0:
+            raise ValueError("Can't remove all scans")
+        sel = selector(scans=allscans)
+        return self._select_copy(sel)
 
     def _select_copy(self, selection):
@@ -274 +284 @@
 
     def get_scan(self, scanid=None):
-        """
+        """\
         Return a specific scan (by scanno) or collection of scans (by
         source name) in a new scantable.
@@ -299 +309 @@
         """
         if scanid is None:
-            if rcParams['verbose']:
-                #print "Please specify a scan no or name to " \
-                #      "retrieve from the scantable"
-                asaplog.push( 'Please specify a scan no or name to retrieve'
-                             ' from the scantable' )
-                print_log( 'ERROR' )
-                return
-            else:
-                raise RuntimeError("No scan given")
-
+            raise RuntimeError( 'Please specify a scan no or name to '
+                                'retrieve from the scantable' )
         try:
             bsel = self.get_selection()
@@ -323 +325 @@
             else:
                 msg = "Illegal scanid type, use 'int' or 'list' if ints."
-                if rcParams['verbose']:
-                    #print msg
-                    asaplog.push( msg )
-                    print_log( 'ERROR' )
-                else:
-                    raise TypeError(msg)
+                raise TypeError(msg)
         except RuntimeError:
-            if rcParams['verbose']:
-                #print "Couldn't find any match."
-                print_log()
-                asaplog.push( "Couldn't find any match." )
-                print_log( 'ERROR' )
-            else: raise
+            raise
 
     def __str__(self):
@@ -362 +354 @@
             else:
                 msg = "Illegal file name '%s'." % (filename)
-                if rcParams['verbose']:
-                    #print msg
-                    asaplog.push( msg )
-                    print_log( 'ERROR' )
-                else:
-                    raise IOError(msg)
-        if rcParams['verbose']:
-            try:
-                from IPython.genutils import page as pager
-            except ImportError:
-                from pydoc import pager
-            pager(info)
-        else:
-            return info
+                raise IOError(msg)
+        return page(info)
 
     def get_spectrum(self, rowno):
@@ -398 +378 @@
 
     def set_spectrum(self, spec, rowno):
-        """Return the spectrum for the current row in the scantable as a list.
-
-        Parameters:
-
-             spec:   the spectrum
-             rowno:    the row number to set the spectrum for
+        """Set the spectrum for the current row in the scantable.
+
+        Parameters:
+
+             spec:   the new spectrum
+
+             rowno:  the row number to set the spectrum for
 
         """
@@ -517 +498 @@
             return workscan
 
-    #def stats(self, stat='stddev', mask=None):
-    def stats(self, stat='stddev', mask=None, form='3.3f'):
+    @asaplog_post_dec
+    def stats(self, stat='stddev', mask=None, form='3.3f', row=None):
         """\
         Determine the specified statistic of the current beam/if/pol
@@ -528 +509 @@
             stat:    'min', 'max', 'min_abc', 'max_abc', 'sumsq', 'sum',
                      'mean', 'var', 'stddev', 'avdev', 'rms', 'median'
+
             mask:    an optional mask specifying where the statistic
                      should be determined.
+
             form:    format string to print statistic values
 
-        Example::
-
+            row:     row number of spectrum to process.
+                     (default is None: for all rows)
+
+        Example:
             scan.set_unit('channel')
             msk = scan.create_mask([100, 200], [500, 600])
@@ -551 +536 @@
             getchan = True
             statvals = []
-        if not rtnabc: statvals = self._math._stats(self, mask, stat)
+        if not rtnabc:
+            if row == None:
+                statvals = self._math._stats(self, mask, stat)
+            else:
+                statvals = self._math._statsrow(self, mask, stat, int(row))
 
         #def cb(i):
@@ -563 +552 @@
         #outvec = []
         sep = '-'*50
-        for i in range(self.nrow()):
+
+        if row == None:
+            rows = xrange(self.nrow())
+        elif isinstance(row, int):
+            rows = [ row ]
+
+        for i in rows:
             refstr = ''
             statunit= ''
@@ -579 +574 @@
             out += 'Scan[%d] (%s) ' % (self.getscan(i), src)
             out += 'Time[%s]:\n' % (tm)
-            if self.nbeam(-1) > 1:
-                out +=  ' Beam[%d] ' % (self.getbeam(i))
-            if self.nif(-1) > 1: out +=  ' IF[%d] ' % (self.getif(i))
-            if self.npol(-1) > 1: out +=  ' Pol[%d] ' % (self.getpol(i))
+            if self.nbeam(-1) > 1: out +=  ' Beam[%d] ' % (self.getbeam(i))
+            if self.nif(-1) > 1:   out +=  ' IF[%d] ' % (self.getif(i))
+            if self.npol(-1) > 1:  out +=  ' Pol[%d] ' % (self.getpol(i))
             #outvec.append(callback(i))
-            #out += ('= %'+form) % (outvec[i]) +'   '+refstr+'\n'
-            out += ('= %'+form) % (statvals[i]) +'   '+refstr+'\n'
+            if len(rows) > 1:
+                # out += ('= %'+form) % (outvec[i]) +'   '+refstr+'\n'
+                out += ('= %'+form) % (statvals[i]) +'   '+refstr+'\n'
+            else:
+                # out += ('= %'+form) % (outvec[0]) +'   '+refstr+'\n'
+                out += ('= %'+form) % (statvals[0]) +'   '+refstr+'\n'
             out +=  sep+"\n"
 
-        if rcParams['verbose']:
-            import os
-            if os.environ.has_key( 'USER' ):
-                usr=os.environ['USER']
-            else:
-                import commands
-                usr=commands.getoutput( 'whoami' )
-            tmpfile='/tmp/tmp_'+usr+'_casapy_asap_scantable_stats'
-            f=open(tmpfile,'w')
-            print >> f, sep
-            print >> f, ' %s %s' % (label, statunit)
-            print >> f, sep
-            print >> f, out
-            f.close()
-            f=open(tmpfile,'r')
-            x=f.readlines()
-            f.close()
-            blanc=''
-            asaplog.push(blanc.join(x), False)
-            #for xx in x:
-            #    asaplog.push( xx, False )
-            print_log()
+        import os
+        if os.environ.has_key( 'USER' ):
+            usr = os.environ['USER']
+        else:
+            import commands
+            usr = commands.getoutput( 'whoami' )
+        tmpfile = '/tmp/tmp_'+usr+'_casapy_asap_scantable_stats'
+        f = open(tmpfile,'w')
+        print >> f, sep
+        print >> f, ' %s %s' % (label, statunit)
+        print >> f, sep
+        print >> f, out
+        f.close()
+        f = open(tmpfile,'r')
+        x = f.readlines()
+        f.close()
+        asaplog.push(''.join(x), False)
+
         return statvals
 
@@ -621 +615 @@
             rowno:   a row number in the scantable. Default is the
                      first row, i.e. rowno=0
+
             chan:    a channel in the scantable. Default is the first
                      channel, i.e. pos=0
@@ -723 +718 @@
             out += '= %3.3f\n' % (outvec[i])
             out +=  sep+'\n'
-        if rcParams['verbose']:
-            asaplog.push(sep)
-            asaplog.push(" %s" % (label))
-            asaplog.push(sep)
-            asaplog.push(out)
-            print_log()
+
+        asaplog.push(sep)
+        asaplog.push(" %s" % (label))
+        asaplog.push(sep)
+        asaplog.push(out)
+        asaplog.post()
         return outvec
 
-    def _get_column(self, callback, row=-1):
+    def _get_column(self, callback, row=-1, *args):
         """
         """
         if row == -1:
-            return [callback(i) for i in range(self.nrow())]
+            return [callback(i, *args) for i in range(self.nrow())]
         else:
             if  0 <= row < self.nrow():
-                return callback(row)
-
-
-    def get_time(self, row=-1, asdatetime=False):
+                return callback(row, *args)
+
+
+    def get_time(self, row=-1, asdatetime=False, prec=-1):
         """\
         Get a list of time stamps for the observations.
-        Return a datetime object for each integration time stamp in the scantable.
+        Return a datetime object or a string (default) for each
+        integration time stamp in the scantable.
 
         Parameters:
 
             row:          row no of integration. Default -1 return all rows
+
             asdatetime:   return values as datetime objects rather than strings
 
-        """
-        from time import strptime
+            prec:         number of digits shown. Default -1 to automatic calculation.
+                          Note this number is equals to the digits of MVTime,
+                          i.e., 0<prec<3: dates with hh:: only,
+                          <5: with hh:mm:, <7 or 0: with hh:mm:ss,
+                          and 6> : with hh:mm:ss.tt... (prec-6 t's added)
+
+        """
         from datetime import datetime
-        times = self._get_column(self._gettime, row)
+        if prec < 0:
+            # automagically set necessary precision +1
+            prec = 7 - numpy.floor(numpy.log10(min(self.get_inttime())))
+            prec = max(6, int(prec))
+        else:
+            prec = max(0, prec)
+        if asdatetime:
+            #precision can be 1 millisecond at max
+            prec = min(12, prec)
+
+        times = self._get_column(self._gettime, row, prec)
         if not asdatetime:
             return times
-        format = "%Y/%m/%d/%H:%M:%S"
+        format = "%Y/%m/%d/%H:%M:%S.%f"
+        if prec < 7:
+            nsub = 1 + (((6-prec)/2) % 3)
+            substr = [".%f","%S","%M"]
+            for i in range(nsub):
+                format = format.replace(substr[i],"")
         if isinstance(times, list):
-            return [datetime(*strptime(i, format)[:6]) for i in times]
-        else:
-            return datetime(*strptime(times, format)[:6])
+            return [datetime.strptime(i, format) for i in times]
+        else:
+            return datetime.strptime(times, format)
 
 
@@ -827 +844 @@
         Get a list of Positions on the sky (direction) for the observations.
         Return a string for each integration in the scantable.
-        Parameters:
+
+        Parameters:
+
             row:    row no of integration. Default -1 return all rows
-        Example:
-            none
+
         """
         return self._get_column(self._getdirection, row)
@@ -846 +864 @@
         return self._get_column(self._getdirectionvec, row)
 
-    @print_log_dec
+    @asaplog_post_dec
     def set_unit(self, unit='channel'):
         """\
@@ -865 +883 @@
         self._add_history("set_unit", varlist)
 
-    @print_log_dec
+    @asaplog_post_dec
     def set_instrument(self, instr):
         """\
@@ -878 +896 @@
         self._setInstrument(instr)
         self._add_history("set_instument", vars())
-        print_log()
-
-    @print_log_dec
+
+    @asaplog_post_dec
     def set_feedtype(self, feedtype):
         """\
@@ -892 +909 @@
         self._setfeedtype(feedtype)
         self._add_history("set_feedtype", vars())
-        print_log()
-
-    @print_log_dec
+
+    @asaplog_post_dec
     def set_doppler(self, doppler='RADIO'):
         """\
@@ -909 +925 @@
         self._setcoordinfo(inf)
         self._add_history("set_doppler", vars())
-        print_log()
-
-    @print_log_dec
+
+    @asaplog_post_dec
     def set_freqframe(self, frame=None):
         """\
@@ -942 +957 @@
         else:
             msg  = "Please specify a valid freq type. Valid types are:\n", valid
-            if rcParams['verbose']:
-                #print msg
-                asaplog.push( msg )
-                print_log( 'ERROR' )
-            else:
-                raise TypeError(msg)
-        print_log()
-
+            raise TypeError(msg)
+
+    @asaplog_post_dec
     def set_dirframe(self, frame=""):
         """\
@@ -965 +975 @@
         """
         varlist = vars()
-        try:
-            Scantable.set_dirframe(self, frame)
-        except RuntimeError, msg:
-            if rcParams['verbose']:
-                #print msg
-                print_log()
-                asaplog.push( str(msg) )
-                print_log( 'ERROR' )
-            else:
-                raise
+        Scantable.set_dirframe(self, frame)
         self._add_history("set_dirframe", varlist)
 
@@ -991 +992 @@
         return unit
 
+    @asaplog_post_dec
     def get_abcissa(self, rowno=0):
         """\
@@ -1008 +1010 @@
         abc = self._getabcissa(rowno)
         lbl = self._getabcissalabel(rowno)
-        print_log()
         return abc, lbl
 
+    @asaplog_post_dec
     def flag(self, mask=None, unflag=False):
         """\
@@ -1019 +1021 @@
             mask:   an optional channel mask, created with create_mask. Default
                     (no mask) is all channels.
+
             unflag:    if True, unflag the data
 
@@ -1024 +1027 @@
         varlist = vars()
         mask = mask or []
-        try:
-            self._flag(mask, unflag)
-        except RuntimeError, msg:
-            if rcParams['verbose']:
-                #print msg
-                print_log()
-                asaplog.push( str(msg) )
-                print_log( 'ERROR' )
-                return
-            else: raise
+        self._flag(mask, unflag)
         self._add_history("flag", varlist)
 
+    @asaplog_post_dec
     def flag_row(self, rows=[], unflag=False):
         """\
@@ -1044 +1039 @@
             rows:   list of row numbers to be flagged. Default is no row
                     (must be explicitly specified to execute row-based flagging).
+
             unflag: if True, unflag the data.
 
         """
         varlist = vars()
-        try:
-            self._flag_row(rows, unflag)
-        except RuntimeError, msg:
-            if rcParams['verbose']:
-                print_log()
-                asaplog.push( str(msg) )
-                print_log('ERROR')
-                return
-            else: raise
+        self._flag_row(rows, unflag)
         self._add_history("flag_row", varlist)
 
+    @asaplog_post_dec
     def clip(self, uthres=None, dthres=None, clipoutside=True, unflag=False):
         """\
@@ -1066 +1055 @@
 
             uthres:      upper threshold.
+
             dthres:      lower threshold
 
             clipoutside: True for flagging data outside the range [dthres:uthres].
-                         False for glagging data inside the range.
+                         False for flagging data inside the range.
+
             unflag:      if True, unflag the data.
 
         """
         varlist = vars()
-        try:
-            self._clip(uthres, dthres, clipoutside, unflag)
-        except RuntimeError, msg:
-            if rcParams['verbose']:
-                print_log()
-                asaplog.push(str(msg))
-                print_log('ERROR')
-                return
-            else: raise
+        self._clip(uthres, dthres, clipoutside, unflag)
         self._add_history("clip", varlist)
 
-    @print_log_dec
+    @asaplog_post_dec
     def lag_flag(self, start, end, unit="MHz", insitu=None):
         """\
@@ -1096 +1079 @@
             start:    the start frequency (really a period within the
                       bandwidth)  or period to remove
+
             end:      the end frequency or period to remove
+
             unit:     the frequency unit (default "MHz") or "" for
                       explicit lag channels
@@ -1112 +1097 @@
         if not (unit == "" or base.has_key(unit)):
             raise ValueError("%s is not a valid unit." % unit)
-        try:
-            if unit == "":
-                s = scantable(self._math._lag_flag(self, start, end, "lags"))
-            else:
-                s = scantable(self._math._lag_flag(self, start*base[unit],
-                                                   end*base[unit], "frequency"))
-        except RuntimeError, msg:
-            if rcParams['verbose']:
-                #print msg
-                print_log()
-                asaplog.push( str(msg) )
-                print_log( 'ERROR' )
-                return
-            else: raise
+        if unit == "":
+            s = scantable(self._math._lag_flag(self, start, end, "lags"))
+        else:
+            s = scantable(self._math._lag_flag(self, start*base[unit],
+                                               end*base[unit], "frequency"))
         s._add_history("lag_flag", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -1133 +1108 @@
             return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def create_mask(self, *args, **kwargs):
         """\
@@ -1145 +1120 @@
                 Pairs of start/end points (inclusive)specifying the regions
                 to be masked
+
             invert:     optional argument. If specified as True,
                         return an inverted mask, i.e. the regions
                         specified are EXCLUDED
+
             row:        create the mask using the specified row for
                         unit conversions, default is row=0
@@ -1173 +1150 @@
         data = self._getabcissa(row)
         u = self._getcoordinfo()[0]
-        if rcParams['verbose']:
-            if u == "": u = "channel"
-            msg = "The current mask window unit is %s" % u
-            i = self._check_ifs()
-            if not i:
-                msg += "\nThis mask is only valid for IF=%d" % (self.getif(i))
-            asaplog.push(msg)
+        if u == "":
+            u = "channel"
+        msg = "The current mask window unit is %s" % u
+        i = self._check_ifs()
+        if not i:
+            msg += "\nThis mask is only valid for IF=%d" % (self.getif(i))
+        asaplog.push(msg)
         n = self.nchan()
         msk = _n_bools(n, False)
@@ -1201 +1178 @@
             if kwargs.get('invert'):
                 msk = mask_not(msk)
-        print_log()
         return msk
 
-    def get_masklist(self, mask=None, row=0):
+    def get_masklist(self, mask=None, row=0, silent=False):
         """\
         Compute and return a list of mask windows, [min, max].
@@ -1211 +1187 @@
 
             mask:       channel mask, created with create_mask.
+
             row:        calcutate the masklist using the specified row
                         for unit conversions, default is row=0
@@ -1231 +1208 @@
         data = self._getabcissa(row)
         u = self._getcoordinfo()[0]
-        if rcParams['verbose']:
-            if u == "": u = "channel"
-            msg = "The current mask window unit is %s" % u
-            i = self._check_ifs()
-            if not i:
-                msg += "\nThis mask is only valid for IF=%d" % (self.getif(i))
+        if u == "":
+            u = "channel"
+        msg = "The current mask window unit is %s" % u
+        i = self._check_ifs()
+        if not i:
+            msg += "\nThis mask is only valid for IF=%d" % (self.getif(i))
+        if not silent:
             asaplog.push(msg)
         masklist=[]
@@ -1251 +1229 @@
         """\
         Compute and Return lists of mask start indices and mask end indices.
-         Parameters:
+
+        Parameters:
+
             mask:       channel mask, created with create_mask.
 
@@ -1326 +1306 @@
         """\
         Set or replace the restfrequency specified and
-        If the 'freqs' argument holds a scalar,
+        if the 'freqs' argument holds a scalar,
         then that rest frequency will be applied to all the selected
         data.  If the 'freqs' argument holds
@@ -1342 +1322 @@
 
             freqs:   list of rest frequency values or string idenitfiers
+
             unit:    unit for rest frequency (default 'Hz')
 
@@ -1452 +1433 @@
         Scantable.shift_refpix(self, delta)
 
+    @asaplog_post_dec
     def history(self, filename=None):
         """\
@@ -1458 +1440 @@
         Parameters:
 
-            filename:    The name  of the file to save the history to.
+            filename:    The name of the file to save the history to.
 
         """
@@ -1465 +1447 @@
         for h in hist:
             if h.startswith("---"):
-                out += "\n"+h
+                out = "\n".join([out, h])
             else:
                 items = h.split("##")
@@ -1474 +1456 @@
                 out += "Function: %s\n  Parameters:" % (func)
                 for i in items:
+                    if i == '':
+                        continue
                     s = i.split("=")
                     out += "\n   %s = %s" % (s[0], s[1])
-                out += "\n"+"-"*80
+                out = "\n".join([out, "-"*80])
         if filename is not None:
             if filename is "":
@@ -1488 +1472 @@
             else:
                 msg = "Illegal file name '%s'." % (filename)
-                if rcParams['verbose']:
-                    #print msg
-                    asaplog.push( msg )
-                    print_log( 'ERROR' )
-                else:
-                    raise IOError(msg)
-        if rcParams['verbose']:
-            try:
-                from IPython.genutils import page as pager
-            except ImportError:
-                from pydoc import pager
-            pager(out)
-        else:
-            return out
-        return
+                raise IOError(msg)
+        return page(out)
     #
     # Maths business
     #
-    @print_log_dec
+    @asaplog_post_dec
     def average_time(self, mask=None, scanav=False, weight='tint', align=False):
         """\
@@ -1519 +1490 @@
             mask:     an optional mask (only used for 'var' and 'tsys'
                       weighting)
+
             scanav:   True averages each scan separately
                       False (default) averages all scans together,
+
             weight:   Weighting scheme.
                       'none'     (mean no weight)
@@ -1529 +1502 @@
                       'median'   ( median averaging)
                       The default is 'tint'
+
             align:    align the spectra in velocity before averaging. It takes
                       the time of the first spectrum as reference time.
@@ -1543 +1517 @@
         scanav = (scanav and 'SCAN') or 'NONE'
         scan = (self, )
-        try:
-            if align:
-                scan = (self.freq_align(insitu=False), )
-            s = None
-            if weight.upper() == 'MEDIAN':
-                s = scantable(self._math._averagechannel(scan[0], 'MEDIAN',
-                                                         scanav))
-            else:
-                s = scantable(self._math._average(scan, mask, weight.upper(),
-                              scanav))
-        except RuntimeError, msg:
-            if rcParams['verbose']:
-                #print msg
-                print_log()
-                asaplog.push( str(msg) )
-                print_log( 'ERROR' )
-                return
-            else: raise
+
+        if align:
+            scan = (self.freq_align(insitu=False), )
+        s = None
+        if weight.upper() == 'MEDIAN':
+            s = scantable(self._math._averagechannel(scan[0], 'MEDIAN',
+                                                     scanav))
+        else:
+            s = scantable(self._math._average(scan, mask, weight.upper(),
+                          scanav))
         s._add_history("average_time", varlist)
-        print_log()
         return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def convert_flux(self, jyperk=None, eta=None, d=None, insitu=None):
         """\
@@ -1578 +1543 @@
 
             jyperk:      the Jy / K conversion factor
+
             eta:         the aperture efficiency
-            d:           the geomtric diameter (metres)
+
+            d:           the geometric diameter (metres)
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -1593 +1561 @@
         s = scantable(self._math._convertflux(self, d, eta, jyperk))
         s._add_history("convert_flux", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def gain_el(self, poly=None, filename="", method="linear", insitu=None):
         """\
@@ -1614 +1581 @@
                          gain-elevation correction as a function of
                          elevation (in degrees).
+
             filename:    The name of an ascii file holding correction factors.
                          The first row of the ascii file must give the column
@@ -1632 +1600 @@
                          0.5 80 0.8
                          0.6 90 0.75
+
             method:      Interpolation method when correcting from a table.
                          Values are  "nearest", "linear" (default), "cubic"
                          and "spline"
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -1649 +1619 @@
         s = scantable(self._math._gainel(self, poly, filename, method))
         s._add_history("gain_el", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -1655 +1624 @@
             return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def freq_align(self, reftime=None, method='cubic', insitu=None):
         """\
@@ -1663 +1632 @@
 
         Parameters:
+
             reftime:     reference time to align at. By default, the time of
                          the first row of data is used.
+
             method:      Interpolation method for regridding the spectra.
                          Choose from "nearest", "linear", "cubic" (default)
                          and "spline"
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -1679 +1651 @@
         s = scantable(self._math._freq_align(self, reftime, method))
         s._add_history("freq_align", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def opacity(self, tau=None, insitu=None):
         """\
@@ -1690 +1661 @@
 
         Parameters:
+
             tau:         (list of) opacity from which the correction factor is
                          exp(tau*ZD)
@@ -1698 +1670 @@
                          if tau is `None` the opacities are determined from a
                          model.
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -1710 +1683 @@
         s = scantable(self._math._opacity(self, tau))
         s._add_history("opacity", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def bin(self, width=5, insitu=None):
         """\
@@ -1722 +1694 @@
 
             width:       The bin width (default=5) in pixels
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -1732 +1705 @@
         s = scantable(self._math._bin(self, width))
         s._add_history("bin", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -1738 +1710 @@
             return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def resample(self, width=5, method='cubic', insitu=None):
         """\
@@ -1746 +1718 @@
 
             width:       The bin width (default=5) in pixels
+
             method:      Interpolation method when correcting from a table.
                          Values are  "nearest", "linear", "cubic" (default)
                          and "spline"
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -1759 +1733 @@
         s = scantable(self._math._resample(self, method, width))
         s._add_history("resample", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def average_pol(self, mask=None, weight='none'):
         """\
@@ -1773 +1746 @@
                          averaging will be applied. The output will have all
                          specified points masked.
+
             weight:      Weighting scheme. 'none' (default), 'var' (1/var(spec)
                          weighted), or 'tsys' (1/Tsys**2 weighted)
@@ -1781 +1755 @@
         s = scantable(self._math._averagepol(self, mask, weight.upper()))
         s._add_history("average_pol", varlist)
-        print_log()
         return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def average_beam(self, mask=None, weight='none'):
         """\
@@ -1793 +1766 @@
                          averaging will be applied. The output will have all
                          specified points masked.
+
             weight:      Weighting scheme. 'none' (default), 'var' (1/var(spec)
                          weighted), or 'tsys' (1/Tsys**2 weighted)
@@ -1801 +1775 @@
         s = scantable(self._math._averagebeams(self, mask, weight.upper()))
         s._add_history("average_beam", varlist)
-        print_log()
         return s
 
@@ -1810 +1783 @@
 
         Parameters:
+
             pflag:  Bool indicating whether to turn this on (True) or
                     off (False)
@@ -1818 +1792 @@
         self._add_history("parallactify", varlist)
 
-    @print_log_dec
+    @asaplog_post_dec
     def convert_pol(self, poltype=None):
         """\
@@ -1825 +1799 @@
 
         Parameters:
+
             poltype:    The new polarisation type. Valid types are:
                         "linear", "circular", "stokes" and "linpol"
@@ -1830 +1805 @@
         """
         varlist = vars()
-        try:
-            s = scantable(self._math._convertpol(self, poltype))
-        except RuntimeError, msg:
-            if rcParams['verbose']:
-                #print msg
-                print_log()
-                asaplog.push( str(msg) )
-                print_log( 'ERROR' )
-                return
-            else:
-                raise
+        s = scantable(self._math._convertpol(self, poltype))
         s._add_history("convert_pol", varlist)
-        print_log()
         return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def smooth(self, kernel="hanning", width=5.0, order=2, plot=False, insitu=None):
         """\
@@ -1855 +1819 @@
                         'hanning' (default), 'gaussian', 'boxcar', 'rmedian'
                         or 'poly'
+
             width:      The width of the kernel in pixels. For hanning this is
                         ignored otherwise it defauls to 5 pixels.
@@ -1860 +1825 @@
                         Maximum. For 'boxcar' it is the full width.
                         For 'rmedian' and 'poly' it is the half width.
+
             order:      Optional parameter for 'poly' kernel (default is 2), to
                         specify the order of the polnomial. Ignored by all other
                         kernels.
+
             plot:       plot the original and the smoothed spectra.
                         In this each indivual fit has to be approved, by
                         typing 'y' or 'n'
+
             insitu:     if False a new scantable is returned.
                         Otherwise, the scaling is done in-situ
@@ -1916 +1884 @@
             del orgscan
 
-        print_log()
         if insitu: self._assign(s)
         else: return s
 
-    @print_log_dec
-    def poly_baseline(self, mask=None, order=0, plot=False, uselin=False,
-                      insitu=None):
+    @asaplog_post_dec
+    def old_poly_baseline(self, mask=None, order=0, plot=False, uselin=False, insitu=None, rows=None):
         """\
         Return a scan which has been baselined (all rows) by a polynomial.
-
+        
         Parameters:
 
             mask:       an optional mask
+
             order:      the order of the polynomial (default is 0)
+
             plot:       plot the fit and the residual. In this each
                         indivual fit has to be approved, by typing 'y'
                         or 'n'
+
             uselin:     use linear polynomial fit
+
             insitu:     if False a new scantable is returned.
                         Otherwise, the scaling is done in-situ
                         The default is taken from .asaprc (False)
 
-        Example::
-
+            rows:       row numbers of spectra to be processed.
+                        (default is None: for all rows)
+        
+        Example:
             # return a scan baselined by a third order polynomial,
             # not using a mask
@@ -1952 +1924 @@
         varlist = vars()
         if mask is None:
-            mask = [True for i in xrange(self.nchan(-1))]
-
-        from asap.asapfitter import fitter
+            mask = [True for i in xrange(self.nchan())]
+
         try:
             f = fitter()
@@ -1962 +1933 @@
                 f.set_function(poly=order)
 
-            rows = range(workscan.nrow())
+            if rows == None:
+                rows = xrange(workscan.nrow())
+            elif isinstance(rows, int):
+                rows = [ rows ]
+            
             if len(rows) > 0:
                 self.blpars = []
-
+                self.masklists = []
+                self.actualmask = []
+            
             for r in rows:
-                # take into account flagtra info (CAS-1434)
-                flagtra = workscan._getmask(r)
-                actualmask = mask[:]
-                if len(actualmask) == 0:
-                    actualmask = list(flagtra[:])
-                else:
-                    if len(actualmask) != len(flagtra):
-                        raise RuntimeError, "Mask and flagtra have different length"
-                    else:
-                        for i in range(0, len(actualmask)):
-                            actualmask[i] = actualmask[i] and flagtra[i]
-                f.set_scan(workscan, actualmask)
                 f.x = workscan._getabcissa(r)
                 f.y = workscan._getspectrum(r)
+                f.mask = mask_and(mask, workscan._getmask(r))    # (CAS-1434)
                 f.data = None
                 f.fit()
@@ -1988 +1954 @@
                     if x.upper() == 'N':
                         self.blpars.append(None)
+                        self.masklists.append(None)
+                        self.actualmask.append(None)
                         continue
                 workscan._setspectrum(f.fitter.getresidual(), r)
                 self.blpars.append(f.get_parameters())
+                self.masklists.append(workscan.get_masklist(f.mask, row=r, silent=True))
+                self.actualmask.append(f.mask)
 
             if plot:
@@ -1996 +1966 @@
                 f._p = None
             workscan._add_history("poly_baseline", varlist)
-            print_log()
-            if insitu: self._assign(workscan)
-            else: return workscan
+            if insitu:
+                self._assign(workscan)
+            else:
+                return workscan
         except RuntimeError:
             msg = "The fit failed, possibly because it didn't converge."
-            if rcParams['verbose']:
-                #print msg
-                print_log()
-                asaplog.push( str(msg) )
-                print_log( 'ERROR' )
+            raise RuntimeError(msg)
+
+    @asaplog_post_dec
+    def poly_baseline(self, mask=None, order=0, plot=False, batch=False, insitu=None, rows=None):
+        """\
+        Return a scan which has been baselined (all rows) by a polynomial.
+        Parameters:
+            mask:       an optional mask
+            order:      the order of the polynomial (default is 0)
+            plot:       plot the fit and the residual. In this each
+                        indivual fit has to be approved, by typing 'y'
+                        or 'n'. Ignored if batch = True. 
+            batch:      if True a faster algorithm is used and logs
+                        including the fit results are not output
+                        (default is False) 
+            insitu:     if False a new scantable is returned.
+                        Otherwise, the scaling is done in-situ
+                        The default is taken from .asaprc (False)
+            rows:       row numbers of spectra to be baselined.
+                        (default is None: for all rows)
+        Example:
+            # return a scan baselined by a third order polynomial,
+            # not using a mask
+            bscan = scan.poly_baseline(order=3)
+        """
+        
+        varlist = vars()
+        
+        if insitu is None: insitu = rcParams["insitu"]
+        if insitu:
+            workscan = self
+        else:
+            workscan = self.copy()
+
+        nchan = workscan.nchan()
+        
+        if mask is None:
+            mask = [True for i in xrange(nchan)]
+
+        try:
+            if rows == None:
+                rows = xrange(workscan.nrow())
+            elif isinstance(rows, int):
+                rows = [ rows ]
+            
+            if len(rows) > 0:
+                workscan.blpars = []
+                workscan.masklists = []
+                workscan.actualmask = []
+
+            if batch:
+                workscan._poly_baseline_batch(mask, order)
+            elif plot:
+                f = fitter()
+                f.set_function(lpoly=order)
+                for r in rows:
+                    f.x = workscan._getabcissa(r)
+                    f.y = workscan._getspectrum(r)
+                    f.mask = mask_and(mask, workscan._getmask(r))    # (CAS-1434)
+                    f.data = None
+                    f.fit()
+                    
+                    f.plot(residual=True)
+                    accept_fit = raw_input("Accept fit ( [y]/n ): ")
+                    if accept_fit.upper() == "N":
+                        self.blpars.append(None)
+                        self.masklists.append(None)
+                        self.actualmask.append(None)
+                        continue
+                    workscan._setspectrum(f.fitter.getresidual(), r)
+                    workscan.blpars.append(f.get_parameters())
+                    workscan.masklists.append(workscan.get_masklist(f.mask, row=r))
+                    workscan.actualmask.append(f.mask)
+                    
+                f._p.unmap()
+                f._p = None
+            else:
+                for r in rows:
+                    fitparams = workscan._poly_baseline(mask, order, r)
+                    params = fitparams.getparameters()
+                    fmtd = ", ".join(["p%d = %3.6f" % (i, v) for i, v in enumerate(params)])
+                    errors = fitparams.geterrors()
+                    fmask = mask_and(mask, workscan._getmask(r))
+
+                    workscan.blpars.append({"params":params,
+                                            "fixed": fitparams.getfixedparameters(),
+                                            "formatted":fmtd, "errors":errors})
+                    workscan.masklists.append(workscan.get_masklist(fmask, r, silent=True))
+                    workscan.actualmask.append(fmask)
+                    
+                    asaplog.push(fmtd)
+            
+            workscan._add_history("poly_baseline", varlist)
+            
+            if insitu:
+                self._assign(workscan)
+            else:
+                return workscan
+            
+        except RuntimeError, e:
+            msg = "The fit failed, possibly because it didn't converge."
+            if rcParams["verbose"]:
+                asaplog.push(str(e))
+                asaplog.push(str(msg))
                 return
             else:
-                raise RuntimeError(msg)
-
-
-    def auto_poly_baseline(self, mask=[], edge=(0, 0), order=0,
+                raise RuntimeError(str(e)+'\n'+msg)
+
+
+    def auto_poly_baseline(self, mask=None, edge=(0, 0), order=0,
                            threshold=3, chan_avg_limit=1, plot=False,
-                           insitu=None):
+                           insitu=None, rows=None):
         """\
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -2054 +2124 @@
                         Otherwise, the scaling is done in-situ
                         The default is taken from .asaprc (False)
+            rows:       row numbers of spectra to be processed.
+                        (default is None: for all rows)
 
 
@@ -2063 +2135 @@
         if insitu is None: insitu = rcParams['insitu']
         varlist = vars()
-        from asap.asapfitter import fitter
         from asap.asaplinefind import linefinder
         from asap import _is_sequence_or_number as _is_valid
@@ -2087 +2158 @@
             curedge = edge;
 
+        if not insitu:
+            workscan = self.copy()
+        else:
+            workscan = self
+
         # setup fitter
         f = fitter()
-        f.set_function(poly=order)
+        f.set_function(lpoly=order)
 
         # setup line finder
@@ -2095 +2171 @@
         fl.set_options(threshold=threshold,avg_limit=chan_avg_limit)
 
-        if not insitu:
-            workscan = self.copy()
-        else:
-            workscan = self
-
         fl.set_scan(workscan)
 
-        rows = range(workscan.nrow())
+        if mask is None:
+            mask = _n_bools(workscan.nchan(), True)
+        
+        if rows is None:
+            rows = xrange(workscan.nrow())
+        elif isinstance(rows, int):
+            rows = [ rows ]
+        
         # Save parameters of baseline fits & masklists as a class attribute.
         # NOTICE: It does not reflect changes in scantable!
@@ -2108 +2186 @@
             self.blpars=[]
             self.masklists=[]
+            self.actualmask=[]
         asaplog.push("Processing:")
         for r in rows:
@@ -2122 +2201 @@
                     curedge = edge[workscan.getif(r)]
 
-            # take into account flagtra info (CAS-1434)
-            flagtra = workscan._getmask(r)
-            actualmask = mask[:]
-            if len(actualmask) == 0:
-                actualmask = list(flagtra[:])
-            else:
-                if len(actualmask) != len(flagtra):
-                    raise RuntimeError, "Mask and flagtra have different length"
-                else:
-                    for i in range(0, len(actualmask)):
-                        actualmask[i] = actualmask[i] and flagtra[i]
+            actualmask = mask_and(mask, workscan._getmask(r))    # (CAS-1434)
 
             # setup line finder
             fl.find_lines(r, actualmask, curedge)
-            outmask=fl.get_mask()
-            f.set_scan(workscan, fl.get_mask())
+            
             f.x = workscan._getabcissa(r)
             f.y = workscan._getspectrum(r)
+            f.mask = fl.get_mask()
             f.data = None
             f.fit()
 
             # Show mask list
-            masklist=workscan.get_masklist(fl.get_mask(),row=r)
+            masklist=workscan.get_masklist(f.mask, row=r, silent=True)
             msg = "mask range: "+str(masklist)
             asaplog.push(msg, False)
@@ -2154 +2223 @@
                     self.blpars.append(None)
                     self.masklists.append(None)
+                    self.actualmask.append(None)
                     continue
 
@@ -2159 +2229 @@
             self.blpars.append(f.get_parameters())
             self.masklists.append(masklist)
+            self.actualmask.append(f.mask)
         if plot:
             f._p.unmap()
@@ -2168 +2239 @@
             return workscan
 
-    @print_log_dec
+    @asaplog_post_dec
     def rotate_linpolphase(self, angle):
         """\
@@ -2187 +2258 @@
         self._math._rotate_linpolphase(self, angle)
         self._add_history("rotate_linpolphase", varlist)
-        print_log()
         return
 
-    @print_log_dec
+    @asaplog_post_dec
     def rotate_xyphase(self, angle):
         """\
@@ -2209 +2279 @@
         self._math._rotate_xyphase(self, angle)
         self._add_history("rotate_xyphase", varlist)
-        print_log()
         return
 
-    @print_log_dec
+    @asaplog_post_dec
     def swap_linears(self):
         """\
@@ -2221 +2290 @@
         self._math._swap_linears(self)
         self._add_history("swap_linears", varlist)
-        print_log()
         return
 
-    @print_log_dec
+    @asaplog_post_dec
     def invert_phase(self):
         """\
@@ -2234 +2302 @@
         return
 
-    @print_log_dec
+    @asaplog_post_dec
     def add(self, offset, insitu=None):
         """\
@@ -2242 +2310 @@
 
             offset:      the offset
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -2257 +2326 @@
             return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def scale(self, factor, tsys=True, insitu=None):
         """\
 
-        Return a scan where all spectra are scaled by the give 'factor'
+        Return a scan where all spectra are scaled by the given 'factor'
 
         Parameters:
 
             factor:      the scaling factor (float or 1D float list)
+
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
                          The default is taken from .asaprc (False)
+
             tsys:        if True (default) then apply the operation to Tsys
                          as well as the data
@@ -2287 +2358 @@
             s = scantable(self._math._unaryop(self.copy(), factor, "MUL", tsys))
         s._add_history("scale", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -2302 +2372 @@
 
             match:          a Unix style pattern, regular expression or selector
+
             matchtype:      'pattern' (default) UNIX style pattern or
                             'regex' regular expression
+
             sourcetype:     the type of the source to use (source/reference)
 
@@ -2332 +2404 @@
         self._add_history("set_sourcetype", varlist)
 
-    @print_log_dec
+    @asaplog_post_dec
+    @preserve_selection
     def auto_quotient(self, preserve=True, mode='paired', verify=False):
         """\
@@ -2343 +2416 @@
             preserve:       you can preserve (default) the continuum or
                             remove it.  The equations used are
+
                             preserve: Output = Toff * (on/off) - Toff
+
                             remove:   Output = Toff * (on/off) - Ton
+
             mode:           the on/off detection mode
                             'paired' (default)
@@ -2354 +2430 @@
                             finds the closest off in time
 
-        """
+        .. todo:: verify argument is not implemented
+
+        """
+        varlist = vars()
         modes = ["time", "paired"]
         if not mode in modes:
             msg = "please provide valid mode. Valid modes are %s" % (modes)
             raise ValueError(msg)
-        varlist = vars()
         s = None
         if mode.lower() == "paired":
-            basesel = self.get_selection()
-            sel = selector()+basesel
-            sel.set_query("SRCTYPE==1")
+            sel = self.get_selection()
+            sel.set_query("SRCTYPE==psoff")
             self.set_selection(sel)
             offs = self.copy()
-            sel.set_query("SRCTYPE==0")
+            sel.set_query("SRCTYPE==pson")
             self.set_selection(sel)
             ons = self.copy()
             s = scantable(self._math._quotient(ons, offs, preserve))
-            self.set_selection(basesel)
         elif mode.lower() == "time":
             s = scantable(self._math._auto_quotient(self, mode, preserve))
         s._add_history("auto_quotient", varlist)
-        print_log()
         return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def mx_quotient(self, mask = None, weight='median', preserve=True):
         """\
@@ -2386 +2461 @@
 
             mask:           an optional mask to be used when weight == 'stddev'
+
             weight:         How to average the off beams.  Default is 'median'.
+
             preserve:       you can preserve (default) the continuum or
-                            remove it.  The equations used are
-                            preserve: Output = Toff * (on/off) - Toff
-                            remove:   Output = Toff * (on/off) - Ton
+                            remove it.  The equations used are:
+
+                                preserve: Output = Toff * (on/off) - Toff
+
+                                remove:   Output = Toff * (on/off) - Ton
 
         """
@@ -2401 +2480 @@
         q = quotient(on, off, preserve)
         q._add_history("mx_quotient", varlist)
-        print_log()
         return q
 
-    @print_log_dec
+    @asaplog_post_dec
     def freq_switch(self, insitu=None):
         """\
@@ -2421 +2499 @@
         s = scantable(self._math._freqswitch(self))
         s._add_history("freq_switch", varlist)
-        print_log()
-        if insitu: self._assign(s)
-        else: return s
-
-    @print_log_dec
+        if insitu:
+            self._assign(s)
+        else:
+            return s
+
+    @asaplog_post_dec
     def recalc_azel(self):
         """Recalculate the azimuth and elevation for each position."""
@@ -2431 +2510 @@
         self._recalcazel()
         self._add_history("recalc_azel", varlist)
-        print_log()
         return
 
-    @print_log_dec
+    @asaplog_post_dec
     def __add__(self, other):
         varlist = vars()
@@ -2447 +2525 @@
         return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def __sub__(self, other):
         """
@@ -2463 +2541 @@
         return s
 
-    @print_log_dec
+    @asaplog_post_dec
     def __mul__(self, other):
         """
@@ -2480 +2558 @@
 
 
-    @print_log_dec
+    @asaplog_post_dec
     def __div__(self, other):
         """
@@ -2498 +2576 @@
         return s
 
+    @asaplog_post_dec
     def get_fit(self, row=0):
         """\
@@ -2511 +2590 @@
         from asap.asapfit import asapfit
         fit = asapfit(self._getfit(row))
-        if rcParams['verbose']:
-            #print fit
-            asaplog.push( '%s' %(fit) )
-            print_log()
-            return
-        else:
-            return fit.as_dict()
+        asaplog.push( '%s' %(fit) )
+        return fit.as_dict()
 
     def flag_nans(self):
@@ -2611 +2685 @@
         return (sum(nchans)/len(nchans) == nchans[0])
 
-    def _fill(self, names, unit, average, getpt, antenna):
+    @asaplog_post_dec
+    #def _fill(self, names, unit, average, getpt, antenna):
+    def _fill(self, names, unit, average, opts={}):
         first = True
         fullnames = []
@@ -2619 +2695 @@
             if not os.path.exists(name):
                 msg = "File '%s' does not exists" % (name)
-                if rcParams['verbose']:
-                    asaplog.push(msg)
-                    print_log( 'ERROR' )
-                    return
                 raise IOError(msg)
             fullnames.append(name)
@@ -2635 +2707 @@
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)
-            print_log()
-            r.open(name)# antenna, -1, -1, getpt)
+            #opts = {'ms': {'antenna' : antenna, 'getpt': getpt} }
+            r.open(name, opts)# antenna, -1, -1, getpt)
             r.fill()
             if average:
@@ -2646 +2718 @@
             del r, tbl
             first = False
+            #flush log
+        asaplog.post()
         if unit is not None:
             self.set_fluxunit(unit)