more changes with TQ

Author: arunkannawadi

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

@@ -268,8 +268,8 @@ def makeTableFromSourceCatalogs(icSrcs: dict[int, SourceCatalog], visitInfo: Vis
     table["coma1"] = table["ext_shapeHSM_HigherOrderMomentsSource_30"] + table["ext_shapeHSM_HigherOrderMomentsSource_12"]
     table["coma2"] = table["ext_shapeHSM_HigherOrderMomentsSource_21"] + table["ext_shapeHSM_HigherOrderMomentsSource_03"]
     table["coma"] = np.hypot(table["coma1"], table["coma2"])
-    table["trefoil1"] = table["ext_shapeHSM_HigherOrderMomentsSource_30"] + table["ext_shapeHSM_HigherOrderMomentsSource_12"]
-    table["trefoil2"] = table["ext_shapeHSM_HigherOrderMomentsSource_21"] - table["ext_shapeHSM_HigherOrderMomentsSource_03"]
+    table["trefoil1"] = table["ext_shapeHSM_HigherOrderMomentsSource_30"] - 3*table["ext_shapeHSM_HigherOrderMomentsSource_12"]
+    table["trefoil2"] = 3*table["ext_shapeHSM_HigherOrderMomentsSource_21"] - table["ext_shapeHSM_HigherOrderMomentsSource_03"]
     table["trefoil"] = np.hypot(table["trefoil1"], table["trefoil2"])
     table["kurtosis"] = table["ext_shapeHSM_HigherOrderMomentsSource_40"] + table["ext_shapeHSM_HigherOrderMomentsSource_04"] + 2*table["ext_shapeHSM_HigherOrderMomentsSource_22"]
     table["x"] = table["base_FPPosition_x"]
@@ -349,10 +349,10 @@ def makeFigureAndAxes() -> tuple[Figure, Any]:
         The created axes.
     """
     # Note, tuning params here manually.  Be careful if adjusting.
-    fig = make_figure(figsize=(10, 6))
+    fig = make_figure(figsize=(10, 8))
 
     scatterSpec = GridSpec(
-        nrows=2,
+        nrows=3,
         ncols=2,
         figure=fig,
         left=0.05,
@@ -364,7 +364,7 @@ def makeFigureAndAxes() -> tuple[Figure, Any]:
         width_ratios=[1, 1.07],  # Room for colorbar on right side
     )
     histSpec = GridSpec(
-        nrows=2,
+        nrows=3,
         ncols=1,
         figure=fig,
         left=0.65,
@@ -375,13 +375,16 @@ def makeFigureAndAxes() -> tuple[Figure, Any]:
         hspace=0.15,
     )
 
-    axs = np.empty((2, 3), dtype=object)
+    axs = np.empty((3, 3), dtype=object)
     axs[0, 0] = fig.add_subplot(scatterSpec[0, 0])
     axs[0, 1] = fig.add_subplot(scatterSpec[0, 1])
     axs[1, 0] = fig.add_subplot(scatterSpec[1, 0])
     axs[1, 1] = fig.add_subplot(scatterSpec[1, 1])
+    axs[2, 0] = fig.add_subplot(scatterSpec[2, 0])
+    axs[2, 1] = fig.add_subplot(scatterSpec[2, 1])
     axs[0, 2] = fig.add_subplot(histSpec[0, 0])
     axs[1, 2] = fig.add_subplot(histSpec[1, 0])
+    axs[2, 2] = fig.add_subplot(histSpec[2, 0])
 
     for ax in axs[0, :2].ravel():
         ax.set_xticks([])
@@ -412,7 +415,14 @@ 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 = {
@@ -436,11 +446,11 @@ def plotData(
     Q_coma = axs[2, 0].quiver(
         x,
         y,
-        coma * np.cos(coma_angle)
+        coma * np.cos(coma_angle),
         coma * np.sin(coma_angle),
         **quiver_kwargs,
     )
-    
+
     trefoil_angle = np.arctan2(trefoil2, trefoil1) / 3  # spin-3
     Q_trefoil = axs[2, 1].quiver(
         x,
@@ -502,6 +512,22 @@ def plotData(
     axs[1, 2].axvline(eQuartiles[1], color="k", lw=2)
     axs[1, 2].axvline(eQuartiles[2], color="grey", lw=1)
 
+    # Kurtosis hist
+    axs[2, 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(
+        s=s,
+        transform=axs[2, 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)
+
 
 def outlineDetectors(
     axs: npt.NDArray[np.object_],