From 90152e642af45f088d0fb57cdbe78272dad01229 Mon Sep 17 00:00:00 2001 From: Joseph McClenaghan Date: Fri, 8 Sep 2023 12:53:10 -0700 Subject: [PATCH 1/3] fix omas nstx flux loop machine mapping --- omas/machine_mappings/nstxu.json | 1 + omas/machine_mappings/nstxu.py | 62 ++++++++++++++++---------------- omas/omas_cocos.py | 4 +-- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/omas/machine_mappings/nstxu.json b/omas/machine_mappings/nstxu.json index ebac4835..4167f527 100644 --- a/omas/machine_mappings/nstxu.json +++ b/omas/machine_mappings/nstxu.json @@ -156,6 +156,7 @@ "PYTHON": "magnetics_hardware(ods, {pulse})" }, "magnetics.flux_loop.:.flux.data": { + "COCOSIO": 11, "PYTHON": "magnetics_floops_data(ods, {pulse})" }, "magnetics.flux_loop.:.flux.data_error_upper": { diff --git a/omas/machine_mappings/nstxu.py b/omas/machine_mappings/nstxu.py index fd9c1107..09173434 100644 --- a/omas/machine_mappings/nstxu.py +++ b/omas/machine_mappings/nstxu.py @@ -183,22 +183,21 @@ def magnetics_floops_data(ods, pulse): ods1 = ODS() unwrap(magnetics_hardware)(ods1, pulse) - with omas_environment(ods, cocosio=1): - fetch_assign( - ods, - ods1, - pulse, - channels='magnetics.flux_loop', - identifier='magnetics.flux_loop.{channel}.identifier', - time='magnetics.flux_loop.{channel}.flux.time', - data='magnetics.flux_loop.{channel}.flux.data', - validity='magnetics.flux_loop.{channel}.flux.validity', - mds_server='nstxu', - mds_tree='OPERATIONS', - tdi_expression='\\{signal}', - time_norm=1.0, - data_norm=1.0, - ) + fetch_assign( + ods, + ods1, + pulse, + channels='magnetics.flux_loop', + identifier='magnetics.flux_loop.{channel}.identifier', + time='magnetics.flux_loop.{channel}.flux.time', + data='magnetics.flux_loop.{channel}.flux.data', + validity='magnetics.flux_loop.{channel}.flux.validity', + mds_server='nstxu', + mds_tree='OPERATIONS', + tdi_expression='\\{signal}', + time_norm=1.0, + data_norm=1.0, + ) # handle uncertainties signals = get_support_file(OMFITnstxMHD, nstx_filenames('signals', pulse)) @@ -226,22 +225,21 @@ def magnetics_probes_data(ods, pulse): ods1 = ODS() unwrap(magnetics_hardware)(ods1, pulse) - with omas_environment(ods, cocosio=1): - fetch_assign( - ods, - ods1, - pulse, - channels='magnetics.b_field_pol_probe', - identifier='magnetics.b_field_pol_probe.{channel}.identifier', - time='magnetics.b_field_pol_probe.{channel}.field.time', - data='magnetics.b_field_pol_probe.{channel}.field.data', - validity='magnetics.b_field_pol_probe.{channel}.field.validity', - mds_server='nstxu', - mds_tree='OPERATIONS', - tdi_expression='\\{signal}', - time_norm=1.0, - data_norm=1.0, - ) + fetch_assign( + ods, + ods1, + pulse, + channels='magnetics.b_field_pol_probe', + identifier='magnetics.b_field_pol_probe.{channel}.identifier', + time='magnetics.b_field_pol_probe.{channel}.field.time', + data='magnetics.b_field_pol_probe.{channel}.field.data', + validity='magnetics.b_field_pol_probe.{channel}.field.validity', + mds_server='nstxu', + mds_tree='OPERATIONS', + tdi_expression='\\{signal}', + time_norm=1.0, + data_norm=1.0, + ) # handle uncertainties signals = get_support_file(OMFITnstxMHD, nstx_filenames('signals', pulse)) diff --git a/omas/omas_cocos.py b/omas/omas_cocos.py index 7269404c..53a14a43 100644 --- a/omas/omas_cocos.py +++ b/omas/omas_cocos.py @@ -83,7 +83,7 @@ _cocos_signals['camera_x_rays.filter_window.centre.phi']='?' #[ADD?]# 2.000000 # phi [rad] # CHARGE_EXCHANGE -_cocos_signals['charge_exchange.channel.:.ion.:.velocity_pol.data']='?' #[ADD?]# 2.666667 # velocity _pol [m.s^-1] +_cocos_signals['charge_exchange.channel.:.ion.:.velocity_pol.data']='TOR' #[ADD?]# 2.666667 # velocity _pol [m.s^-1] _cocos_signals['charge_exchange.channel.:.ion.:.velocity_tor.data']='?' #[ADD?]# 2.666667 # velocity _tor [m.s^-1] _cocos_signals['charge_exchange.channel.:.momentum_tor.data']='?' #[ADD?]# 2.500000 # momentum _tor [kg.m^-1.s^-1] _cocos_signals['charge_exchange.aperture.centre.phi']='TOR' # 2.000000 # phi [rad] @@ -1479,4 +1479,4 @@ _cocos_signals['waves.coherent_wave.:.profiles_2d.:.ion.:.state.:.power_density_thermal_n_tor']='?' #[ADD?]# 1.000000 # _tor _cocos_signals['waves.coherent_wave.:.profiles_2d.:.power_density_n_tor']='?' #[ADD?]# 1.000000 # _tor -# WORKFLOW \ No newline at end of file +# WORKFLOW From d1e05a6af2b6cee2b94a82df87c7504473c5595f Mon Sep 17 00:00:00 2001 From: Joseph McClenaghan Date: Fri, 8 Sep 2023 13:34:21 -0700 Subject: [PATCH 2/3] minor bug fix --- omas/omas_cocos.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omas/omas_cocos.py b/omas/omas_cocos.py index 53a14a43..e1c7bc90 100644 --- a/omas/omas_cocos.py +++ b/omas/omas_cocos.py @@ -83,8 +83,8 @@ _cocos_signals['camera_x_rays.filter_window.centre.phi']='?' #[ADD?]# 2.000000 # phi [rad] # CHARGE_EXCHANGE -_cocos_signals['charge_exchange.channel.:.ion.:.velocity_pol.data']='TOR' #[ADD?]# 2.666667 # velocity _pol [m.s^-1] -_cocos_signals['charge_exchange.channel.:.ion.:.velocity_tor.data']='?' #[ADD?]# 2.666667 # velocity _tor [m.s^-1] +_cocos_signals['charge_exchange.channel.:.ion.:.velocity_pol.data']='POL' #[ADD?]# 2.666667 # velocity _pol [m.s^-1] +_cocos_signals['charge_exchange.channel.:.ion.:.velocity_tor.data']='TOR' #[ADD?]# 2.666667 # velocity _tor [m.s^-1] _cocos_signals['charge_exchange.channel.:.momentum_tor.data']='?' #[ADD?]# 2.500000 # momentum _tor [kg.m^-1.s^-1] _cocos_signals['charge_exchange.aperture.centre.phi']='TOR' # 2.000000 # phi [rad] _cocos_signals['charge_exchange.channel.:.position.phi.data']='TOR' # 1.800000 # phi [rad] From 6a8e23353d5b9120ce09ef66d1bd8461dad5c95f Mon Sep 17 00:00:00 2001 From: Joseph McClenaghan Date: Fri, 8 Sep 2023 17:07:39 -0700 Subject: [PATCH 3/3] make cocos --- omas/omas_cocos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omas/omas_cocos.py b/omas/omas_cocos.py index e1c7bc90..f3c25299 100644 --- a/omas/omas_cocos.py +++ b/omas/omas_cocos.py @@ -83,8 +83,8 @@ _cocos_signals['camera_x_rays.filter_window.centre.phi']='?' #[ADD?]# 2.000000 # phi [rad] # CHARGE_EXCHANGE -_cocos_signals['charge_exchange.channel.:.ion.:.velocity_pol.data']='POL' #[ADD?]# 2.666667 # velocity _pol [m.s^-1] -_cocos_signals['charge_exchange.channel.:.ion.:.velocity_tor.data']='TOR' #[ADD?]# 2.666667 # velocity _tor [m.s^-1] +_cocos_signals['charge_exchange.channel.:.ion.:.velocity_pol.data']='POL' # 2.666667 # velocity _pol [m.s^-1] +_cocos_signals['charge_exchange.channel.:.ion.:.velocity_tor.data']='TOR' # 2.666667 # velocity _tor [m.s^-1] _cocos_signals['charge_exchange.channel.:.momentum_tor.data']='?' #[ADD?]# 2.500000 # momentum _tor [kg.m^-1.s^-1] _cocos_signals['charge_exchange.aperture.centre.phi']='TOR' # 2.000000 # phi [rad] _cocos_signals['charge_exchange.channel.:.position.phi.data']='TOR' # 1.800000 # phi [rad] @@ -1479,4 +1479,4 @@ _cocos_signals['waves.coherent_wave.:.profiles_2d.:.ion.:.state.:.power_density_thermal_n_tor']='?' #[ADD?]# 1.000000 # _tor _cocos_signals['waves.coherent_wave.:.profiles_2d.:.power_density_n_tor']='?' #[ADD?]# 1.000000 # _tor -# WORKFLOW +# WORKFLOW \ No newline at end of file