Skip to content

Fix error in floops position mapping #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
torrinba merged 3 commits into from
Jul 28, 2026
Merged

Fix error in floops position mapping #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc77ea8
Use correct ods as source for r-value
AreWeDreaming Jul 28, 2026
4625a72
Some d3d.json auto updates but they might be flip-flops
AreWeDreaming Jul 28, 2026
63d7743
Update omas/machine_mappings/d3d.json
torrinba Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions omas/machine_mappings/d3d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})"
},
Expand Down
3 changes: 2 additions & 1 deletion omas/machine_mappings/d3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
Loading