Changeset 1157 for trunk/python

Timestamp:

08/21/06 16:27:55 (18 years ago)

Author:

mar637

Message:

more argument types for scanatble.set_restfreqs; tidying.

Location:

trunk/python

Files:

• asapplotter.py (modified) (1 diff)
• scantable.py (modified) (2 diffs)

trunk/python/asapplotter.py

@@ -454 +454 @@
                             maxys.append(ma.maximum(y))
                     peak = max(maxys)
-                    self._plotter.vline_with_label(freq, peak, linecat.get_name(row),
-                                             location=loc, rotate=rotate)
+                    self._plotter.vline_with_label(freq, peak,
+                                                   linecat.get_name(row),
+                                                   location=loc, rotate=rotate)
         #        self._plotter.release()
         self._plotter.show(hardrefresh=False)

trunk/python/scantable.py

@@ -736 +736 @@
         """
         varlist = vars()
-
-        t = type(freqs)
+        from asap import linecatalog
+        # simple  value
         if isinstance(freqs, int) or isinstance(freqs, float):
             self._setrestfreqs(freqs, "",unit)
+        # list of values
         elif isinstance(freqs, list) or isinstance(freqs, tuple):
+            # list values are scalars
             if isinstance(freqs[-1], int) or isinstance(freqs[-1], float):
                 sel = selector()
@@ -749 +751 @@
                     self._setrestfreqs(freqs[i], "",unit)
                 self._setselection(savesel)
-            elif isinstance(freqs[-1], str):
-                # not yet implemented
-                pass
+            # list values are tuples, (value, name)
+            elif isinstance(freqs[-1], dict):
+                sel = selector()
+                savesel = self._getselection()
+                for i in xrange(len(freqs)):
+                    sel.set_ifs([i])
+                    self._setrestfreqs(freqs[i]["value"],
+                                       freqs[i]["name"], "MHz")
+                    self._setselection(sel)
+                self._setselection(savesel)
+        # freqs are to be taken from a linecatalog
         elif isinstance(freqs, linecatalog):
             sel = selector()