diff --git a/omas/machine_mappings/d3d.json b/omas/machine_mappings/d3d.json index 63ee928b..92809b6c 100644 --- a/omas/machine_mappings/d3d.json +++ b/omas/machine_mappings/d3d.json @@ -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})" }, 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])