Skip to content

Fix DIII-D mapping for ec_launchers with the top system #405

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

Open
torrinba wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix DIII-D mapping for ec_launchers with the top system #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 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 @@ -555,6 +555,7 @@ def coils_non_axisymmetric_current_data(ods, pulse):
@machine_mapping_function(__regression_arguments__, pulse=170325)
def ec_launcher_active_hardware(ods, pulse):
from omas.omas_core import CodeParameters
import re
setup = '.ECH.'

# We need three queries in order to retrieve only the fields we need
Expand Down Expand Up @@ -630,7 +631,7 @@ def ec_launcher_active_hardware(ods, pulse):
beam['launching_position.r'] = np.atleast_1d(systems[f'LAUNCH_R_{system_no}'])[0] * np.ones(ntime)
beam['launching_position.z'] = np.atleast_1d(systems[f'LAUNCH_Z_{system_no}'])[0] * np.ones(ntime)

phi = np.deg2rad(float(systems[f'PORT_{system_no}'].split(' ')[0]))
phi = np.deg2rad(float(re.sub(r'[^0-9.+]', '', systems[f'PORT_{system_no}']).split('+')[0]))
beam['launching_position.phi'] = phi * np.ones(ntime)

beam['frequency.time'] = np.atleast_1d(0)
Expand Down
2 changes: 1 addition & 1 deletion omas/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.96.0
0.96.1
Loading