Changeset 2718 for trunk/python

Timestamp:

01/09/13 14:27:57 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No (a bug fix)

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asapplotter and sdplot

Description:

fixed a bug in increment.
better log messages.

File:

• trunk/python/asapplotter.py (modified) (1 diff)

trunk/python/asapplotter.py

@@ -1837 +1837 @@
             asaplog.post("WARN")
 
-#         # Center and spacing
-#         dirarr = array(self._data.get_directionval()).transpose()
-#         print "Pointing range: (x, y) = (%f - %f, %f - %f)" %\
-#               (dirarr[0].min(),dirarr[0].max(),dirarr[1].min(),dirarr[1].max())
-#         dircent = [0.5*(dirarr[0].max() + dirarr[0].min()),
-#                    0.5*(dirarr[1].max() + dirarr[1].min())]
-#         del dirarr
-#         if center is None:
-#             #asaplog.post()
-#             asaplog.push("Grid center is not specified. Automatically calculated from pointing center.")
-#             #asaplog.post("WARN")
-#             #center = [dirarr[0].mean(), dirarr[1].mean()]
-#             center = dircent
-#         elif (type(center) in (list, tuple)) and len(center) > 1:
-#             from numpy import pi
-#             # make sure center_x is in +-pi of pointing center
-#             # (assumes dirs are in rad)
-#             rotnum = round(abs(center[0] - dircent[0])/(2*pi))
-#             if center[0] < dircent[0]: rotnum *= -1
-#             cenx = center[0] - rotnum*2*pi
-#             center = [cenx, center[1]]
-#         else:
-#             msg = "Direction of grid center should be a list of float (R.A., Dec.)"
-#             raise ValueError, msg
-#         asaplog.push("Grid center: (%f, %f) " % (center[0],center[1]))
-
-#         if spacing is None:
-#             #asaplog.post()
-#             asaplog.push("Grid spacing not specified. Automatically calculated from map coverage")
-#             #asaplog.post("WARN")
-#             # automatically get spacing
-#             dirarr = array(self._data.get_directionval()).transpose()
-#             wx = 2. * max(abs(dirarr[0].max()-center[0]),
-#                           abs(dirarr[0].min()-center[0]))
-#             wy = 2. * max(abs(dirarr[1].max()-center[1]),
-#                           abs(dirarr[1].min()-center[1]))
-#             ## slightly expand area to plot the edges
-#             #wx *= 1.1
-#             #wy *= 1.1
-#             xgrid = wx/max(self._cols-1.,1.)
-#             #xgrid = wx/float(max(self._cols,1.))
-#             xgrid *= cos(center[1])
-#             ygrid = wy/max(self._rows-1.,1.)
-#             #ygrid = wy/float(max(self._rows,1.))
-#             # single pointing (identical R.A. and/or Dec. for all spectra.)
-#             if xgrid == 0:
-#                 xgrid = 1.
-#             if ygrid == 0:
-#                 ygrid = 1.
-#             # spacing should be negative to transpose plot
-#             spacing = [- xgrid, - ygrid]
-#             del dirarr, xgrid, ygrid
-#         #elif isinstance(spacing, str):
-#         #    # spacing is a quantity
-#         elif (type(spacing) in (list, tuple)) and len(spacing) > 1:
-#             for i in xrange(2):
-#                 val = spacing[i]
-#                 if not isinstance(val, float):
-#                     raise TypeError("spacing should be a list of float")
-#                 if val > 0.:
-#                     spacing[i] = -val
-#             spacing = spacing[0:2]
-#         else:
-#             msg = "Invalid spacing."
-#             raise TypeError(msg)
-#         asaplog.push("Spacing: (%f, %f) (projected)" % (spacing[0],spacing[1]))
-
         # Prepare plotter
         self._assert_plotter(action="reload")