Changeset 1175 for trunk

Timestamp:

08/23/06 13:15:32 (18 years ago)

Author:

mar637

Message:

various changes to support the pylab plotter 'xyplotter'

Location:

trunk/python

Files:

• __init__.py (modified) (2 diffs)
• asapplotter.py (modified) (2 diffs)
• scantable.py (modified) (2 diffs)

trunk/python/__init__.py

@@ -349 +349 @@
     from  asapplotter import asapplotter
     gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
+    if gui:
+        import pylab as xyplotter
     plotter = asapplotter(gui)
     del gui
@@ -528 +530 @@
             axhline,axvline - draw horizontal/vertical lines
             axhspan,axvspan - draw horizontal/vertical regions
-            
+
+        xyplotter           - matplotlib/pylab plotting functions
+
     [Reading files]
         reader              - access rpfits/sdfits files

trunk/python/asapplotter.py

@@ -580 +580 @@
         # convert this into lengths
         n0,nstack0 = self._get_selected_n(scan)
-        n = len(n0)
         if isinstance(n0, int): n = n0
-        nstack = len(nstack0)
+        else: n = len(n0)
         if isinstance(nstack0, int): nstack = nstack0
+        else: nstack = len(nstack0)
         maxpanel, maxstack = 16,8
         if n > maxpanel or nstack > maxstack:
@@ -731 +731 @@
              'i': "IF"+str(scan.getif(row)),
              'p': poleval,
-             't': scan._gettime(row) }
+             't': str(scan.get_time(row)) }
         return userlabel or d[mode]
 

trunk/python/scantable.py

@@ -411 +411 @@
             print "--------------------------------------------------"
             print out
-        retval = {'axesnames': axesnames, 'axes': axes, 'data': outvec}
-        return retval
+        # disabled because the vector seems more useful
+        #retval = {'axesnames': axesnames, 'axes': axes, 'data': outvec}
+        return outvec
 
     def _get_column(self, callback, row=-1):
@@ -433 +434 @@
             none
         """
-        return self._get_column(self._gettime, row)
+        from time import strptime
+        from datetime import datetime
+        times = self._get_column(self._gettime, row)
+        format = "%Y/%m/%d/%H:%M:%S"
+        if isinstance(times, list):
+            return [datetime(*strptime(i, format)[:6]) for i in times]
+        else:
+            return datetime(*strptime(times, format)[:6])
 
     def get_sourcename(self, row=-1):