Changeset 1256 for tags

Timestamp:

09/11/06 14:17:47 (18 years ago)

Author:

mar637

Message:

turned return without warning into exceptions. changed default rotation to 90 degrees. Added habdling of all 'Hz' based units.

File:

• tags/Release2.1.0b/python/asapplotter.py (modified) (4 diffs)

tags/Release2.1.0b/python/asapplotter.py

@@ -412 +412 @@
         if self._data: self.plot(self._data)
 
-    def plot_lines(self, linecat=None, doppler=0.0, deltachan=10, rotate=0.0,
+    def plot_lines(self, linecat=None, doppler=0.0, deltachan=10, rotate=90.0,
                    location=None):
         """
@@ -421 +421 @@
             deltachan:    the number of channels to include each side of the
                           line to determine a local maximum/minimum
-            rotate:       the rotation for the text label
+            rotate:       the rotation (in degrees) )for the text label (default 90.0)
             location:     the location of the line annotation from the 'top',
                           'bottom' or alternate (None - the default)
@@ -427 +427 @@
         If the spectrum is flagged no line will be drawn in that location.
         """
-        if not self._data: return
+        if not self._data:
+            raise RuntimeError("No scantable has been plotted yet.")
         from asap._asap import linecatalog
-        if not isinstance(linecat, linecatalog): return
-        if not self._data.get_unit().endswith("GHz"): return
+        if not isinstance(linecat, linecatalog):
+            raise ValueError("'linecat' isn't of type linecatalog.")
+        if not self._data.get_unit().endswith("Hz"):
+            raise RuntimeError("Can only overlay linecatalogs when data is in frequency.")
         from matplotlib.numerix import ma
         for j in range(len(self._plotter.subplots)):
@@ -436 +439 @@
             lims = self._plotter.axes.get_xlim()
             for row in range(linecat.nrow()):
-                restf = linecat.get_frequency(row)/1000.0
+                # get_frequency returns MHz
+                base = { "GHz": 1000.0, "MHz": 1.0, "Hz": 1.0e-6 }
+                restf = linecat.get_frequency(row)/base[self._data.get_unit()]
                 c = 299792.458
                 freq = restf*(1.0-doppler/c)