Changeset 1689 for trunk/python

Timestamp:

02/10/10 11:59:23 (15 years ago)

Author:

Malte Marquarding

Message:

Ticket #177: added skydip function to determine opacities. This resulted in a slight interface change to accept lists of opacities in the scantable.opacity function

Location:

trunk/python

Files:

• __init__.py (modified) (1 diff)
• asapfitter.py (modified) (1 diff)
• opacity.py (added)
• scantable.py (modified) (4 diffs)

trunk/python/__init__.py

@@ -389 +389 @@
 from simplelinefinder import simplelinefinder
 from linecatalog import linecatalog
+from opacity import skydip
 
 if rcParams['useplotter']:

trunk/python/asapfitter.py

@@ -485 +485 @@
 
     @print_log_dec
-    def plot(self, residual=False, components=None, plotparms=False, filename=None):
+    def plot(self, residual=False, components=None, plotparms=False,
+             filename=None):
         """
         Plot the last fit.

trunk/python/scantable.py

@@ +1 @@
+import functools
 from asap._asap import Scantable
 from asap import rcParams
@@ -7 +8 @@
 from asap.coordinate import coordinate
 from asap import _n_bools, mask_not, mask_and, mask_or
+
+
+def preserve_selection(func):
+    @functools.wraps(func)
+    def wrap(obj, *args, **kw):
+        basesel = obj.get_selection()
+        val = func(obj, *args, **kw)
+        obj.set_selection(basesel)
+        return val
+    return wrap
+
 
 class scantable(Scantable):
@@ -1104 +1116 @@
         and Tsys are multiplied by the correction factor.
         Parameters:
-            tau:         Opacity from which the correction factor is
+            tau:         (list of) opacity from which the correction factor is
                          exp(tau*ZD)
-                         where ZD is the zenith-distance
+                         where ZD is the zenith-distance.
+                         If a list is provided, it has to be of length nIF,
+                         nIF*nPol or 1 and in order of IF/POL, e.g.
+                         [opif0pol0, opif0pol1, opif1pol0 ...]
             insitu:      if False a new scantable is returned.
                          Otherwise, the scaling is done in-situ
@@ -1114 +1129 @@
         self._math._setinsitu(insitu)
         varlist = vars()
+        if not hasattr(tau, "__len__"):
+            tau = [tau]
         s = scantable(self._math._opacity(self, tau))
         s._add_history("opacity", varlist)