Changeset 1074 for trunk/python

Timestamp:

07/06/06 11:22:45 (18 years ago)

Author:

mar637

Message:

Ticket #50 - arbitrary quotient

File:

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

trunk/python/asapmath.py

@@ -75 +75 @@
     return s
 
-# def quotient(source, reference, preserve=True):
-#     """
-#     Return the quotient of a 'source' (signal) scan and a 'reference' scan.
-#     The reference can have just one row, even if the signal has many. Otherwise
-#     they must have the same number of rows.
-#     The cursor of the output scan is set to 0
-#     Parameters:
-#         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
-#     """
-#     varlist = vars()
-#     from asap._asap import quotient as _quot
-#     s = scantable(_quot(source, reference, preserve))
-#     s._add_history("quotient",varlist)
-#     print_log()
-#     return s
+def quotient(source, reference, preserve=True):
+    """
+    Return the quotient of a 'source' (signal) scan and a 'reference' scan.
+    The reference can have just one scan, even if the signal has many. Otherwise
+    they must have the same number of scans.
+    The cursor of the output scan is set to 0
+    Parameters:
+        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
+    """
+    varlist = vars()
+    from asap._asap import stmath
+    stm = stmath()
+    stm._setinsitu(False)
+    s = scantable(stm._quotient(source, reference, preserve))
+    s._add_history("quotient",varlist)
+    print_log()
+    return s
 
 def simple_math(left, right, op='add', tsys=True):
@@ -150 +152 @@
     print_log()
     return s
+