Changeset 296

Timestamp:

01/25/05 14:58:20 (19 years ago)

Author:

kil064

Message:

add arg. 'tsys' to simple_math and scale (optioanl application to Tsys)

File:

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

trunk/python/asapmath.py

@@ -57 +57 @@
     return scantable(_quot(source, reference, preserve))
 
-def simple_math(left, right, op='add'):
+def simple_math(left, right, op='add', tsys=True):
     """
     Apply simple mathematical binary operations to two 
@@ -66 +66 @@
         right:         the 'right' scan
         op:            the operation: 'add' (default), 'sub', 'mul', 'div'
+        tsys:          if True (default) then apply the operation to Tsys
+                       as well as the data
     """
     if not isinstance(left,scantable) and not isinstance(right,scantable):
@@ -71 +73 @@
         return
     from asap._asap import b_operate as _bop
-    return scantable(_bop(left, right, op))
-
-def scale(scan, factor, insitu=None, allaxes=None):
+    return scantable(_bop(left, right, op, tsys))
+
+def scale(scan, factor, insitu=None, allaxes=None, tsys=True):
     """
     Return a scan where all spectra are scaled by the give 'factor'
@@ -85 +87 @@
                      apply only to the selected (beam/pol/if)spectra only.
                      The default is taken from .asaprc (True)
+        tsys:        if True (default) then apply the operation to Tsys
+                     as well as the data
     """
     if allaxes is None: allaxes = rcParams['scantable.allaxes']
@@ -90 +94 @@
     if not insitu:
         from asap._asap import scale as _scale
-        return scantable(_scale(scan, factor, allaxes))
+        return scantable(_scale(scan, factor, allaxes, tsys))
     else:
         from asap._asap import scale_insitu as _scale
-        _scale(scan, factor, allaxes)
+        _scale(scan, factor, allaxes, tsys)
         return