Changeset 720 for trunk

Timestamp:

11/18/05 11:16:23 (19 years ago)

Author:

mar637

Message:

added asaplog

File:

• trunk/python/asapmath.py (modified) (6 diffs)

trunk/python/asapmath.py

@@ -1 +1 @@
 from scantable import scantable
 from asap import rcParams
+from asap import print_log
 
 def average_time(*args, **kwargs):
@@ -11 +12 @@
         scanav:   True averages each scan separately.
                   False (default) averages all scans together,
-        weight:   Weighting scheme. 'none, 'var' (1/var(spec) 
+        weight:   Weighting scheme. 'none, 'var' (1/var(spec)
                   weighted), 'tsys' (1/Tsys**2 weighted), 'tint'
-                  (integration time weighted) or 'tintsys' (Tsys 
+                  (integration time weighted) or 'tintsys' (Tsys
                   and tint). The default is 'tint'
     Example:
@@ -39 +40 @@
     else:
         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:
         if not isinstance(s,scantable):
-            print "Please give a list of scantables"
-            return
+            msg = "Please give a list of scantables"
+            if rcParams['verbose']:
+                print msg
+                return
+            else:
+                raise TypeError(msg)
     s = scantable(_av(lst, mask, scanAv, weight))
     s._add_history("average_time",varlist)
+    print_log()
     return s
 
@@ -62 +68 @@
         source:        the 'on' scan
         reference:     the 'off' scan
-        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
+        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
     """
     varlist = vars()
@@ -71 +77 @@
     s = scantable(_quot(source, reference, preserve))
     s._add_history("quotient",varlist)
+    print_log()
     return s
 
 def simple_math(left, right, op='add', tsys=True):
     """
-    Apply simple mathematical binary operations to two 
+    Apply simple mathematical binary operations to two
     scan tables,  returning the result in a new scan table.
     The operation is applied to both the correlations and the TSys data
@@ -88 +95 @@
     varlist = vars()
     if not isinstance(left,scantable) and not isinstance(right,scantable):
-        print "Please provide two scantables as input"
-        return
+        msg = "Please provide two scantables as input"
+        if rcParams['verbose']:
+            print msg
+            return
+        else:
+            raise TypeError(msg)
     from asap._asap import b_operate as _bop
     s = scantable(_bop(left, right, op, tsys))
     s._add_history("simple_math", varlist)
+    print_log()
     return s
-    
-