Changeset 1696

Timestamp:

02/11/10 11:45:38 (14 years ago)

Author:

Malte Marquarding

Message:

Tidy up plotazel and plotpointing

File:

• trunk/python/asapplotter.py (modified) (5 diffs)

trunk/python/asapplotter.py

@@ -876 +876 @@
     def plotazel(self):
         """
-        plot azimuth and elevation  versus time of a scantable
-        """
-        import pylab as PL
-        from matplotlib.dates import DateFormatter, timezone, HourLocator, MinuteLocator, DayLocator
+        plot azimuth and elevation versus time of a scantable
+        """
+        from matplotlib import pylab as PL
+        from matplotlib.dates import DateFormatter, timezone
+        from matplotlib.dates import HourLocator, MinuteLocator,SecondLocator, DayLocator
         from matplotlib.ticker import MultipleLocator
         from matplotlib.numerix import array, pi
@@ -899 +900 @@
             minloc = HourLocator(range(0,23,12))
             timefmt = DateFormatter("%b%d")
+        elif tdel > 24./60.:
+            timefmt = DateFormatter('%H:%M')
+            majloc = HourLocator()
+            minloc = MinuteLocator(30)
         else:
-            timefmt = DateFormatter('%H')
-            majloc = HourLocator()
-            minloc = MinuteLocator(20)
+            timefmt = DateFormatter('%H:%M')
+            majloc = MinuteLocator(interval=5)
+            minloc = SecondLocator(30)
+
         PL.title(dstr)
         PL.plot_date(t,el,'b,', tz=tz)
-        #ax.grid(True)
         ax.yaxis.grid(True)
-        yloc = MultipleLocator(30)
-        ax.set_ylim(0,90)
-        ax.xaxis.set_major_formatter(timefmt)
-        ax.xaxis.set_major_locator(majloc)
-        ax.xaxis.set_minor_locator(minloc)
-        ax.yaxis.set_major_locator(yloc)
+
         if tdel > 1.0:
             labels = ax.get_xticklabels()
@@ -923 +923 @@
                 if az[irow] < 0: az[irow] += 360.0
 
-        ax = PL.subplot(2,1,2)
-        PL.xlabel('Time (UT)')
-        PL.ylabel('Az [deg.]')
-        PL.plot_date(t,az,'b,', tz=tz)
-        ax.set_ylim(0,360)
-        #ax.grid(True)
-        ax.yaxis.grid(True)
-        #hfmt = DateFormatter('%H')
-        #hloc = HourLocator()
-        yloc = MultipleLocator(60)
+        ax2 = ax.figure.add_subplot(2,1,2, sharex=ax)
+        ax2.set_xlabel('Time (UT)')
+        ax2.set_ylabel('Az [deg.]')
+        ax2.plot_date(t,az,'b,', tz=tz)
+        ax2.yaxis.grid(True)
+        # set this last as x axis is shared
         ax.xaxis.set_major_formatter(timefmt)
         ax.xaxis.set_major_locator(majloc)
         ax.xaxis.set_minor_locator(minloc)
-        ax.yaxis.set_major_locator(yloc)
-        if tdel > 1.0:
-            labels = ax.get_xticklabels()
-            PL.setp(labels, fontsize=10)
         PL.ion()
         PL.draw()
@@ -947 +939 @@
         plot telescope pointings
         """
-        import pylab as PL
-        from matplotlib.dates import DateFormatter, timezone
-        from matplotlib.ticker import MultipleLocator
-        from matplotlib.numerix import array, pi, zeros
+        from matplotlib import pylab as PL
+        from matplotlib.numerix import array
         dir = array(self._data.get_directionval()).transpose()
         ra = dir[0]*180./pi
@@ -960 +950 @@
         ax = PL.axes([0.1,0.1,0.8,0.8])
         ax.set_aspect('equal')
-        PL.plot(ra,dec, 'b,')
+        PL.plot(ra, dec, 'b,')
         PL.xlabel('RA [deg.]')
         PL.ylabel('Declination [deg.]')