From dc77ea884cc5600d005d361f2cf7df18dd512f5b Mon Sep 17 00:00:00 2001 From: arewedreaming Date: Tue, 28 Jul 2026 14:15:19 -0700 Subject: [PATCH 1/3] Use correct ods as source for r-value --- omas/machine_mappings/d3d.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/omas/machine_mappings/d3d.py b/omas/machine_mappings/d3d.py index 2c694551..e13c0cfc 100644 --- a/omas/machine_mappings/d3d.py +++ b/omas/machine_mappings/d3d.py @@ -1787,7 +1787,8 @@ def magnetics_floops_data(ods, pulse, store_differential=False, nref=0): # Relative uncertainty from EFIT (probably an overestimate for error in compensations) rel_error = 0.03 * abs(ods[f'magnetics.flux_loop.{k}.flux.data']) # Approximate error in the flux loop positions estimated with DIII-D parameters (often largest error term) - position_error = 1.e-9 * ods[f'magnetics.flux_loop.{k}.position.0.r'] * abs(Ip) + # Needs to use ods1 here since the position is not in ods + position_error = 1.e-9 * ods1[f'magnetics.flux_loop.{k}.position.0.r'] * abs(Ip) # Use whichever error source is largest (this is how it is treated in EFIT) ods[f'magnetics.flux_loop.{k}.flux.data_error_upper'] = np.fmax.reduce([digi_error, rel_error, position_error]) From 4625a72e7f3afbcc7cc0103b2c7c2292f9b0411c Mon Sep 17 00:00:00 2001 From: arewedreaming Date: Tue, 28 Jul 2026 14:27:56 -0700 Subject: [PATCH 2/3] Some d3d.json auto updates but they might be flip-flops --- omas/machine_mappings/d3d.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/omas/machine_mappings/d3d.json b/omas/machine_mappings/d3d.json index 63ee928b..d16caa43 100644 --- a/omas/machine_mappings/d3d.json +++ b/omas/machine_mappings/d3d.json @@ -712,7 +712,7 @@ "PYTHON": "magnetics_hardware(ods, {pulse})" }, "magnetics.flux_loop.:.type.index": { - "PYTHON": "magnetics_hardware(ods, {pulse})" + "PYTHON": "magnetics_floops_data(ods, {pulse}, {store_differential!r}, {nref!r})" }, "magnetics.ip.:": { "VALUE": 1 @@ -724,6 +724,9 @@ "magnetics.ip.:.data_error_upper": { "PYTHON": "ip_bt_dflux_data(ods, {pulse})" }, + "magnetics.ip.:.method_name": { + "PYTHON": "ip_bt_dflux_data(ods, {pulse})" + }, "magnetics.ip.:.time": { "PYTHON": "ip_bt_dflux_data(ods, {pulse})" }, From 63d774328b24285ffaddee32fb35865fcea5d33e Mon Sep 17 00:00:00 2001 From: Torrin <1843540+torrinba@users.noreply.github.com> Date: Tue, 28 Jul 2026 15:14:08 -0700 Subject: [PATCH 3/3] Update omas/machine_mappings/d3d.json --- omas/machine_mappings/d3d.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omas/machine_mappings/d3d.json b/omas/machine_mappings/d3d.json index d16caa43..92809b6c 100644 --- a/omas/machine_mappings/d3d.json +++ b/omas/machine_mappings/d3d.json @@ -712,7 +712,7 @@ "PYTHON": "magnetics_hardware(ods, {pulse})" }, "magnetics.flux_loop.:.type.index": { - "PYTHON": "magnetics_floops_data(ods, {pulse}, {store_differential!r}, {nref!r})" + "PYTHON": "magnetics_hardware(ods, {pulse})" }, "magnetics.ip.:": { "VALUE": 1