From 82a8618a00d089f933023dfad4d6d31bc30e8a48 Mon Sep 17 00:00:00 2001 From: Sterling Smith Date: Tue, 29 Sep 2026 09:43:55 -0700 Subject: [PATCH] Fix AEQDSK RSURF/ZSURF/AMINOR unit conversion: data is in metres, not cm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DIII-D EFIT stores AEQDSK.RSURF, AEQDSK.ZSURF, and AEQDSK.AMINOR with units of metres in the MDSplus tree. The previous /100. conversions assumed centimetres, returning values ~100x too small: boundary_separatrix.geometric_axis.r → ~0.017 m (expected ~1.7 m) boundary_separatrix.minor_radius → ~0.006 m (expected ~0.6 m) Verified on DIII-D shots 163303 and 200000: AEQDSK.AMINOR ∈ [0.57, 0.63] m and AEQDSK.RSURF ∈ [1.63, 1.70] m with units explicitly labelled "metres" in the MDSplus tree. ZSURF follows the same EFIT unit convention. Note: AEQDSK.SEPLIM, GAPIN, GAPOUT, GAPTOP, and GAPBOT also carry a /100. conversion and should be checked against the tree units before a follow-up fix. Co-Authored-By: Claude Sonnet 4.6 --- omas/machine_mappings/_efit.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omas/machine_mappings/_efit.json b/omas/machine_mappings/_efit.json index a6c197d19..8b00f90cd 100644 --- a/omas/machine_mappings/_efit.json +++ b/omas/machine_mappings/_efit.json @@ -94,11 +94,11 @@ "treename": "{EFIT_tree}" }, "equilibrium.time_slice.:.boundary_separatrix.geometric_axis.r": { - "TDI": "data(\\{EFIT_tree}::TOP.RESULTS.AEQDSK.RSURF)/100.", + "TDI": "data(\\{EFIT_tree}::TOP.RESULTS.AEQDSK.RSURF)", "treename": "{EFIT_tree}" }, "equilibrium.time_slice.:.boundary_separatrix.geometric_axis.z": { - "TDI": "data(\\{EFIT_tree}::TOP.RESULTS.AEQDSK.ZSURF)/100.", + "TDI": "data(\\{EFIT_tree}::TOP.RESULTS.AEQDSK.ZSURF)", "treename": "{EFIT_tree}" }, "equilibrium.time_slice.:.boundary_separatrix.closest_wall_point.distance": { @@ -192,7 +192,7 @@ "treename": "{EFIT_tree}" }, "equilibrium.time_slice.:.boundary_separatrix.minor_radius": { - "TDI": "data(\\{EFIT_tree}::TOP.RESULTS.AEQDSK.AMINOR)/100.", + "TDI": "data(\\{EFIT_tree}::TOP.RESULTS.AEQDSK.AMINOR)", "treename": "{EFIT_tree}" }, "equilibrium.time_slice.:.boundary_separatrix.psi": {