Changeset 1857 for trunk/python

Timestamp:

08/05/10 11:45:38 (14 years ago)

Author:

Malte Marquarding

Message:

auto_quotient is the first method to use @preserve_selection

File:

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

trunk/python/scantable.py

@@ -22 +22 @@
     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
@@ -1475 +1477 @@
         for h in hist:
             if h.startswith("---"):
-                out += "\n"+h
+                out = "\n".join([out, h])
             else:
                 items = h.split("##")
@@ -1486 +1488 @@
                     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 "":
@@ -2363 +2365 @@
 
     @print_log_dec
+    @preserve_selection
     def auto_quotient(self, preserve=True, mode='paired', verify=False):
         """\
@@ -2373 +2376 @@
             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
 
@@ -2385 +2390 @@
                             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 = self.get_selection()
             sel.set_query("SRCTYPE==1")
             self.set_selection(sel)
@@ -2402 +2408 @@
             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))