Changeset 1153 for trunk/python/scantable.py

Timestamp:

08/21/06 10:48:45 (18 years ago)

Author:

mar637

Message:

lots of changes to support soft refresh, for things like text overlays, linecatlogs etc. reworked plot_lines to to auto-peak detection. added forwarding functions to matplotlib.axes. drawing functions

File:

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

trunk/python/scantable.py

@@ -5 +5 @@
 from asap import selector
 from asap import NUM
+from asap import linecatalog
 
 class scantable(Scantable):
@@ -707 +708 @@
         E.g. 'freqs=[1e9, 2e9]'  would mean IF 0 gets restfreq 1e9 and
         IF 1 gets restfreq 2e9.
-        You can also specify the frequencies via known line names
-        from the built-in Lovas table.
+        You can also specify the frequencies via a linecatalog/
+
         Parameters:
             freqs:   list of rest frequency values or string idenitfiers
@@ -738 +739 @@
         t = type(freqs)
         if isinstance(freqs, int) or isinstance(freqs, float):
-            self._setrestfreqs(freqs, unit)
+            self._setrestfreqs(freqs, "",unit)
         elif isinstance(freqs, list) or isinstance(freqs, tuple):
             if isinstance(freqs[-1], int) or isinstance(freqs[-1], float):
@@ -746 +747 @@
                     sel.set_ifs([i])
                     self._setselection(sel)
-                    self._setrestfreqs(freqs[i], unit)
+                    self._setrestfreqs(freqs[i], "",unit)
                 self._setselection(savesel)
             elif isinstance(freqs[-1], str):
                 # not yet implemented
                 pass
+        elif isinstance(freqs, linecatalog):
+            sel = selector()
+            savesel = self._getselection()
+            for i in xrange(freqs.nrow()):
+                sel.set_ifs([i])
+                self._setselection(sel)
+                self._setrestfreqs(freqs.get_frequency(i),
+                                   freqs.get_name(i), "MHz")
+                # ensure that we are not iterating past nIF
+                if i == self.nif()-1: break
+            self._setselection(savesel)
         else:
             return