Updated PF numbering in outputs

process/core/io/plot/summary.py

@@ -8066,10 +8066,10 @@ def plot_pf_coils(
     noc = number_of_coils - 1 if iohcl == 1 else number_of_coils
 
     for coil in range(noc):
-        coils_r.append(mfile.get(f"r_pf_coil_middle[{coil:01}]", scan=scan))
-        coils_z.append(mfile.get(f"z_pf_coil_middle[{coil:01}]", scan=scan))
-        coils_dr.append(mfile.get(f"pfdr({coil:01})", scan=scan))
-        coils_dz.append(mfile.get(f"pfdz({coil:01})", scan=scan))
+        coils_r.append(mfile.get(f"r_pf_coil_middle[{coil + 1:01}]", scan=scan))
+        coils_z.append(mfile.get(f"z_pf_coil_middle[{coil + 1:01}]", scan=scan))
+        coils_dr.append(mfile.get(f"pfdr({coil + 1:01})", scan=scan))
+        coils_dz.append(mfile.get(f"pfdz({coil + 1:01})", scan=scan))
         coil_text.append(str(coil + 1))
 
     r_points, z_points, central_coil = pfcoil_geometry(
@@ -15694,17 +15694,13 @@ def plot_pf_cs_plasma_mutual_inductance(
     axis.set_title("PF/CS Plasma Mutual Inductance")
     axis.set_xticks(range(n_pf_cs_plasma_circuits))
     axis.set_yticks(range(n_pf_cs_plasma_circuits))
-    x_labels = list(range(n_pf_cs_plasma_circuits))
+    labels = list(range(1, n_pf_cs_plasma_circuits + 1))
 
     if iohcl == 1:
-        x_labels[-2] = "CS"
-    x_labels[-1] = "Plasma"
-    y_labels = list(range(n_pf_cs_plasma_circuits))
-    if iohcl == 1:
-        y_labels[-2] = "CS"
-    y_labels[-1] = "Plasma"
-    axis.set_xticklabels(x_labels)
-    axis.set_yticklabels(y_labels)
+        labels[-2] = "CS"
+    labels[-1] = "Plasma"
+    axis.set_xticklabels(labels)
+    axis.set_yticklabels(labels)
 
     # Add boxes around each cell
     for i in range(n_pf_cs_plasma_circuits):
@@ -16351,11 +16347,13 @@ def plot_pf_dimensions(
     z_pf_coil_middle = []
     radial_thicknesses = []
     vertical_thicknesses = []
-    for coil in range(int(mfile.get("n_pf_cs_plasma_circuits", scan=scan) - 2)):
-        r_pf_coil_middle.append(mfile.get(f"r_pf_coil_middle[{coil}]", scan=scan))
-        z_pf_coil_middle.append(mfile.get(f"z_pf_coil_middle[{coil}]", scan=scan))
-        radial_thicknesses.append(mfile.get(f"pfdr({coil})", scan=scan))
-        vertical_thicknesses.append(mfile.get(f"pfdz({coil})", scan=scan))
+    iohcl = mfile.get("iohcl", scan=scan) if "iohcl" in mfile.data else 1
+    x = 1 if iohcl == 0 else 2
+    for coil in range(int(mfile.get("n_pf_cs_plasma_circuits", scan=scan) - x)):
+        r_pf_coil_middle.append(mfile.get(f"r_pf_coil_middle[{coil + 1}]", scan=scan))
+        z_pf_coil_middle.append(mfile.get(f"z_pf_coil_middle[{coil + 1}]", scan=scan))
+        radial_thicknesses.append(mfile.get(f"pfdr({coil + 1})", scan=scan))
+        vertical_thicknesses.append(mfile.get(f"pfdz({coil + 1})", scan=scan))
 
     plot_pf_coils(axis=axis, mfile=mfile, scan=scan, colour_scheme=colour_scheme)