final touches

Author: arunkannawadi

python/lsst/summit/extras/plotting/psfPlotting.py

@@ -356,7 +356,7 @@ def makeFigureAndAxes(nrows=2) -> tuple[Figure, Any]:
         The created axes.
     """
     # Note, tuning params here manually.  Be careful if adjusting.
-    fig = make_figure(figsize=(10, 8))
+    fig = make_figure(figsize=(10, 3 * nrows))
 
     scatterSpec = GridSpec(
         nrows=nrows,
@@ -417,14 +417,7 @@ def plotData(
     e1 = table[prefix + "e1"]
     e2 = table[prefix + "e2"]
     e = table["e"]
-    coma1 = table["coma1"]
-    coma2 = table["coma2"]
-    coma = table["coma"]
-    trefoil1 = table["trefoil1"]
-    trefoil2 = table["trefoil2"]
-    trefoil = table["trefoil"]
     fwhm = table["FWHM"]
-    kurtosis = table["kurtosis"]
 
     # Quiver plot
     quiver_kwargs = {
@@ -498,14 +491,30 @@ def plotData(
 
 
 def plot_triangle(ax, center=(0, 0), size=1.0, angle_deg=0.0, color='blue'):
+    """
+    Plot an equilateral triangle
+
+    Parameters
+    ----------
+    ax : `~matplotlib.axes.Axes`
+        The pane to plot on.
+    center : `tuple [`float`]`, optional
+        The (x, y) coordinates of the triangle center.
+    size : `float`, optional
+        The size of the triangle.
+    angle_deg : `float`, optional
+        The rotation angle of the triangle in degrees.
+    color : `str`, optional
+        The color of the triangle.
+    """
     # Define an equilateral triangle centered at origin
     theta = np.deg2rad(angle_deg)
 
     # Base triangle points (pointing upward, unit size)
     triangle = np.array([
         [0, 1],
-        [-np.sqrt(3)/2, -0.5],
-        [ np.sqrt(3)/2, -0.5]
+        [-0.5 * np.sqrt(3), -0.5],
+        [0.5 * np.sqrt(3), -0.5]
     ])
 
     # Scale
@@ -533,6 +542,19 @@ def plotHigherOrderMomentsData(
     prefix: str = "",
     bin_spacing: float = 0.06,
 ):
+    """Plot coma, trefoil and kurtosis from the table on the provided axes.
+
+    Parameters
+    ----------
+    axs : `numpy.ndarray`
+        The array of axes objects to plot on.
+    table : `Table`
+        The table containing the data to plot.
+    prefix : `str`, optional
+        The prefix to use for the column names in the table.
+    bin_spacing : `float`, optional
+        The spacing between arrows and triangles in the plot.
+    """
     x = table[prefix + "x"]
     y = table[prefix + "y"]
     kurtosis = table["kurtosis"]
@@ -555,14 +577,14 @@ def plotHigherOrderMomentsData(
 
     mean_coma_angle = np.arctan2(mean_coma[2], mean_coma[1])
     mean_coma_amplitude = np.hypot(mean_coma[2], mean_coma[2])
-    Q_coma = axs[2, 0].quiver(
+    Q_coma = axs[0].quiver(
         binning.coords0[:, 0],
         binning.coords0[:, 1],
         mean_coma_amplitude * np.cos(mean_coma_angle),
         mean_coma_amplitude * np.sin(mean_coma_angle),
         **quiver_kwargs,
     )
-    axs[2, 0].quiverkey(Q_coma, X=0.1, Y=0.88, U=0.05, label="0.05", labelpos="S")
+    axs[0].quiverkey(Q_coma, X=0.1, Y=0.88, U=0.05, label="0.05", labelpos="S")
 
     mean_trefoil = {}
     for i in (1, 2):
@@ -574,17 +596,23 @@ def plotHigherOrderMomentsData(
     mean_trefoil_angle = np.arctan2(mean_trefoil[2], mean_trefoil[1]) / 3  # spin-3
     mean_trefoil_amplitude = np.hypot(mean_trefoil[2], mean_trefoil[1])
     SCALE_TRIANGLE = 0.5
-    plot_triangle(axs[2, 1], center=(1.8, 1.7), size=0.1*SCALE_TRIANGLE, angle_deg=0.0, color='black')
-    axs[2, 1].text(1.6, 1.35, "0.1")
+    plot_triangle(axs[1], center=(1.8, 1.7), size=0.1 * SCALE_TRIANGLE, angle_deg=0.0, color='black')
+    axs[1].text(1.6, 1.35, "0.1")
     for idx in range(len(mean_trefoil_amplitude)):
         _t = mean_trefoil_amplitude[idx]
         _ta = mean_trefoil_angle[idx]
         _xcen = binning.coords0[idx, 0]
         _ycen = binning.coords0[idx, 1]
-        plot_triangle(axs[2, 1], center=(_xcen, _ycen), size=_t*SCALE_TRIANGLE, angle_deg=_ta*180/np.pi, color='black')
+        plot_triangle(
+            axs[1],
+            center=(_xcen, _ycen),
+            size=_t * SCALE_TRIANGLE,
+            angle_deg=_ta * 180.0 / np.pi,
+            color='black',
+        )
 
-    pos = axs[2, 1].get_position()  # get current position [left, bottom, width, height]
-    axs[2, 1].set_position([pos.x0, pos.y0, pos.width*0.931, pos.height])
+    pos = axs[1].get_position()  # get current position [left, bottom, width, height]
+    axs[1].set_position([pos.x0, pos.y0, pos.width * 0.931, pos.height])
 
     textKwargs = {
         "x": 0.95,
@@ -596,23 +624,23 @@ def plotHigherOrderMomentsData(
     }
 
     # Kurtosis hist
-    axs[2, 2].hist(kurtosis, bins=int(np.sqrt(len(table))), color="C3")
+    axs[2].hist(kurtosis, bins=int(np.sqrt(len(table))), color="C3")
     kurtosisQuartiles = np.nanpercentile(kurtosis, [25, 50, 75])
     s = "Kurtosis\n"
     s += f"25%: {kurtosisQuartiles[0]:.3f}\n"
     s += f"50%: {kurtosisQuartiles[1]:.3f}\n"
     s += f"75%: {kurtosisQuartiles[2]:.3f}\n"
-    axs[2, 2].text(
+    axs[2].text(
         s=s,
-        transform=axs[2, 2].transAxes,
+        transform=axs[2].transAxes,
         **textKwargs,
     )
-    axs[2, 2].axvline(kurtosisQuartiles[0], color="grey", lw=1)
-    axs[2, 2].axvline(kurtosisQuartiles[1], color="k", lw=2)
-    axs[2, 2].axvline(kurtosisQuartiles[2], color="grey", lw=1)
+    axs[2].axvline(kurtosisQuartiles[0], color="grey", lw=1)
+    axs[2].axvline(kurtosisQuartiles[1], color="k", lw=2)
+    axs[2].axvline(kurtosisQuartiles[2], color="grey", lw=1)
 
-    axs[2, 0].text(0.05, 0.92, "coma", transform=axs[2, 0].transAxes, fontsize=10)
-    axs[2, 1].text(0.82, 0.92, "trefoil", transform=axs[2, 1].transAxes, fontsize=10)
+    axs[0].text(0.05, 0.92, "coma", transform=axs[0].transAxes, fontsize=10)
+    axs[1].text(0.82, 0.92, "trefoil", transform=axs[1].transAxes, fontsize=10)
 
 
 def outlineDetectors(
@@ -945,7 +973,8 @@ def makeAzElPlot(
     if len(table) == 0:
         return
 
-    plotHigherOrderMomentsData(axs, table, prefix="aa_")
+    if axs.shape[0] > 2:
+        plotHigherOrderMomentsData(axs[2, :], table, prefix="aa_")
     table = randomRowsPerDetector(table, maxPointsPerDetector)
     plotData(axs[:2, :], table, prefix="aa_")
 
@@ -955,9 +984,9 @@ def makeAzElPlot(
     for ax in axs[:3, :2].ravel():
         ax.set_xlim(-plotLimit, plotLimit)
         ax.set_ylim(-plotLimit, plotLimit)
-    for ax in axs[2, :2]:
+    for ax in axs[-1, :2]:
         ax.set_xlabel("$\\Delta$ Azimuth [deg]")
-    for ax in axs[:3, 0]:
+    for ax in axs[:, 0]:
         ax.set_ylabel("$\\Delta$ Elevation [deg]")
 
     visitId = table.meta["LSST BUTLER DATAID VISIT"]