From a62c35deae757a1b25e90d82a07a00fb0d4337aa Mon Sep 17 00:00:00 2001 From: khalid Date: Fri, 13 Dec 2024 10:52:53 +0000 Subject: [PATCH] fix: more descriptive name --- src/api/models.py | 348 +++++++++++++++++++------------------- tests/api/test_graphql.py | 6 +- 2 files changed, 177 insertions(+), 177 deletions(-) diff --git a/src/api/models.py b/src/api/models.py index 9730d8c..e5935ac 100644 --- a/src/api/models.py +++ b/src/api/models.py @@ -342,14 +342,14 @@ class ShotModel(SQLModel, table=True): cpf_p12452: Optional[float] = Field(alias="mcs_cp5s_volts", description="(MCS Setup) CP5 set volts for MAST only") - cpf_p15200: Optional[float] = Field(alias="mcs_tg1_b_pressure", - description="(MCS Setup) TG1 Base Pressure for MAST only") - - cpf_p15202: Optional[float] = Field(alias="mcs_a_gas_pressure", + cpf_p15202: Optional[float] = Field(alias="mcs_additive_gas_pressure", description="(MCS Setup) Additive gas pressure of main fueling plenum for MAST only") cpf_p15203: Optional[float] = Field(alias="mcs_plenum_gas_pressure", description="(MCS Setup) Latest gas pressure of main fueling plenum for MAST only") + + cpf_p15209: Optional[float] = Field(alias="mcs_tg1_base_pressure", + description="(MCS Setup) TG1 Base Pressure for MAST only") cpf_p15659: Optional[float] = Field(alias="mcs_p3_direction", description="(MCS Setup) P3 Direction Monitored state of \ @@ -369,16 +369,16 @@ class ShotModel(SQLModel, table=True): cpf_p20204: Optional[float] = Field(alias="mcs_pshot_gdc_time", description="(MCS Setup) Pre-Shot GDC duration for MAST only") - cpf_p20205: Optional[float] = Field(alias="mcs_gdc_s_time", + cpf_p20205: Optional[float] = Field(alias="mcs_gdc_start_time", description="(MCS Setup) Last GDC start time for MAST only") - cpf_p20206: Optional[float] = Field(alias="mcs_igp_pressure", + cpf_p20206: Optional[float] = Field(alias="mcs_gas_puff_pressure", description="(MCS Setup) Inboard Gas Puff Pressure for MAST only") - cpf_p20207: Optional[float] = Field(alias="mcs_igp_s_time", + cpf_p20207: Optional[float] = Field(alias="mcs_gas_puff_start_time", description="(MCS Setup) Inboard Gas Puff Start Time Relative to 10s for MAST only") - cpf_p20208: Optional[float] = Field(alias="mcs_igp_duration", + cpf_p20208: Optional[float] = Field(alias="mcs_gas_puff_duration", description="(MCS Setup) Inboard Gas Puff Duration for MAST only") cpf_p21010: Optional[float] = Field(alias="mcs_p2xo", @@ -386,19 +386,19 @@ class ShotModel(SQLModel, table=True): (P2 Reversing Switch Mode: 0= +ve only, 1= -ve only, \ 2= +ve => -ve, 3= -ve => +ve) for MAST only") - cpf_p21011: Optional[float] = Field(alias="mcs_p2xo_s_forward", + cpf_p21011: Optional[float] = Field(alias="mcs_p2xo_start_forward", description="(MCS Setup) Param mim430 - P2XO Start Forward \ (Offset by 5s: enable +ve polarity at time-5s) for MAST only") - cpf_p21012: Optional[float] = Field(alias="mcs_p2xo_s_reverse", + cpf_p21012: Optional[float] = Field(alias="mcs_p2xo_start_reverse", description="(MCS Setup) Param mim430 - P2XO Start Reverse \ (Enable -ve polarity at 5s + time) for MAST only") - cpf_p21021: Optional[float] = Field(alias="mcs_tf_flat_top_value", + cpf_p21021: Optional[float] = Field(alias="mcs_tf_flattop_value", description="(MCS Setup) Param mim421 - TF Flat Top set value \ (Tesla @ R=0.7m) for MAST only") - cpf_p21022: Optional[float] = Field(alias="mcs_tf_flat_top_time", + cpf_p21022: Optional[float] = Field(alias="mcs_tf_flattop_time", description="(MCS Setup) Param mim421 - TF Flat Top set time (End of Flat Top) for MAST only") cpf_p21029: Optional[float] = Field(alias="mcs_tf_rise_time_value") @@ -411,49 +411,49 @@ class ShotModel(SQLModel, table=True): description="(MCS Setup) Required P2 Linkboard config \ number (must match setting in PLC) for MAST only") - cpf_p21041: Optional[float] = Field(alias="mcs_cp3s_s_time", + cpf_p21041: Optional[float] = Field(alias="mcs_cp3s_start_time", description="(MCS Setup) CP3s start time (Offset by 5s) for MAST only") - cpf_p21042: Optional[float] = Field(alias="mcs_cp3c_s_time", + cpf_p21042: Optional[float] = Field(alias="mcs_cp3c_start_time", description="(MCS Setup) CP3c start time (Offset by 5s) for MAST only") - cpf_p21043: Optional[float] = Field(alias="mcs_cp4_s_time", + cpf_p21043: Optional[float] = Field(alias="mcs_cp4_start_time", description="(MCS Setup) CP4 start time (Offset by 5s) for MAST only") - cpf_p21044: Optional[float] = Field(alias="mcs_p4_ign_s_time", + cpf_p21044: Optional[float] = Field(alias="mcs_p4_ignitron_start_time", description="(MCS Setup) Close P4 circuit \ ignitron start time (Offset by 5s) for MAST only") - cpf_p21045: Optional[float] = Field(alias="mcs_p4_thy_s_time", + cpf_p21045: Optional[float] = Field(alias="mcs_p4_thyristor_start_time", description="(MCS Setup) P4 Circuit \ thyristor start time (Offset by 5s) for MAST only") - cpf_p21046: Optional[float] = Field(alias="mcs_cp5_s_time", + cpf_p21046: Optional[float] = Field(alias="mcs_cp5_strat_time", description="(MCS Setup) CP5 Start time (Offset by 5s) for MAST only") - cpf_p21047: Optional[float] = Field(alias="mcs_p5_ign_s_time", + cpf_p21047: Optional[float] = Field(alias="mcs_p5_ignitron_start_time", description="(MCS Setup) P5 ignitron start time (Offset by 5s) for MAST only") - cpf_p21048: Optional[float] = Field(alias="mcs_p5_thy_s_time", + cpf_p21048: Optional[float] = Field(alias="mcs_p5_thyristor_start_time", description="(MCS Setup) P5 thyristor start time (Offset by 5s) for MAST only") cpf_p21051: Optional[float] = Field(alias="mcs_mfps_current_limit", description="(MCS Setup) MFPS Power supply current limit for MAST only") - cpf_p21052: Optional[float] = Field(alias="mcs_mfps_s_time", + cpf_p21052: Optional[float] = Field(alias="mcs_mfps_start_time", description="(MCS Setup) MFPS set enable start time (Offset by 5s) for MAST only") cpf_p21053: Optional[float] = Field(alias="mcs_efps_current_limit", description="(MCS Setup) EFPS Power supply current limit for MAST only") - cpf_p21054: Optional[float] = Field(alias="mcs_efps_s_time", + cpf_p21054: Optional[float] = Field(alias="mcs_efps_start_time", description="(MCS Setup) EFPS set enable start time (Offset by 5s) for MAST only") cpf_p21055: Optional[float] = Field(alias="mcs_sfps_current_limit", description="(MCS Setup) SFPS power supply current limit for MAST only") - cpf_p21056: Optional[float] = Field(alias="mcs_sfps_s_time", + cpf_p21056: Optional[float] = Field(alias="mcs_sfps_start_time", description="(MCS Setup) SFPS set enable start time (Offset by 5s) for MAST only") cpf_p21075: Optional[float] = Field(alias="mcs_mfps_duration", @@ -471,37 +471,37 @@ class ShotModel(SQLModel, table=True): cpf_p21079: Optional[float] = Field(alias="mcs_p1ps_neg_current_limit", description="(MCS Setup) P1PS maximum negative current limit for MAST only") - cpf_p21080: Optional[float] = Field(alias="mcs_p1ps_s_time", + cpf_p21080: Optional[float] = Field(alias="mcs_p1ps_start_time", description="(MCS Setup) P1PS enable start time (offset by 5s) for MAST only") cpf_p21081: Optional[float] = Field(alias="mcs_p1ps_duration", description="(MCS Setup) P1PS enable duration for MAST only") - cpf_p21082: Optional[float] = Field(alias="mcs_fa1_s_time", + cpf_p21082: Optional[float] = Field(alias="mcs_fa1_start_time", description="(MCS Setup) FA1 enable start time (offset by 5s) for MAST only") cpf_p21083: Optional[float] = Field(alias="mcs_fa1_duration", description="(MCS Setup) FA1 enable duration for MAST only") - cpf_p21084: Optional[float] = Field(alias="mcs_fa2_s_time", + cpf_p21084: Optional[float] = Field(alias="mcs_fa2_start_time", description="(MCS Setup) FA2 enable start time (offset by 5s) for MAST only") cpf_p21085: Optional[float] = Field(alias="mcs_fa2_duration", description="(MCS Setup) FA2 enable duration for MAST only") - cpf_p21086: Optional[float] = Field(alias="mcs_fa3_s_time", + cpf_p21086: Optional[float] = Field(alias="mcs_fa3_strat_time", description="(MCS Setup) FA3 enable start time (offset by 5s) for MAST only") cpf_p21087: Optional[float] = Field(alias="mcs_fa3_duration", description="(MCS Setup) FA3 enable duration for MAST only") - cpf_p21088: Optional[float] = Field(alias="mcs_fa4_s_time", + cpf_p21088: Optional[float] = Field(alias="mcs_fa4_start_time", description="(MCS Setup) FA4 enable start time (offset by 5s) for MAST only") cpf_p21089: Optional[float] = Field(alias="mcs_fa4_duration", description="(MCS Setup) FA4 enable duration for MAST only") - cpf_p21092: Optional[float] = Field(alias="mcs_scs4_s_time", + cpf_p21092: Optional[float] = Field(alias="mcs_scs4_strat_time", description="(MCS Setup) SCS4 enabled start time used by MBD for MAST only") cpf_p21093: Optional[float] = Field(alias="mcs_scs4_duration", @@ -510,83 +510,83 @@ class ShotModel(SQLModel, table=True): cpf_abort: Optional[float] = Field(alias="shot_abort", description="Shot aborted for MAST and MAST-U") - cpf_amin_ipmax: Optional[float] = Field(alias="gen_m_rad_ipmax", + cpf_amin_ipmax: Optional[float] = Field(alias="gen_min_radius_max_current", description="(Generic) Minor radius at time of peak plasma current for MAST and MAST-U") - cpf_amin_max: Optional[float] = Field(alias="gen_m_rad_max", + cpf_amin_max: Optional[float] = Field(alias="gen_min_radius", description="(Generic) Maximum value of minor radius for MAST and MAST-U") - cpf_amin_truby: Optional[float] = Field(alias="gen_m_rad_truby", + cpf_amin_truby: Optional[float] = Field(alias="gen_min_radius_ruby_time", description="(Generic) Minor radius at time of Ruby TS for MAST only") - cpf_area_ipmax: Optional[float] = Field(alias="gen_area_ipmax", + cpf_area_ipmax: Optional[float] = Field(alias="gen_poloidal_area_max_current", description="(Generic) poloidal cross-sectional area at time of \ peak plasma current for MAST and MAST-U") - cpf_area_max: Optional[float] = Field(alias="gen_area_max", + cpf_area_max: Optional[float] = Field(alias="gen_max_poloidal_area", description="(Generic) Maximum Poloidal Cross-Sectional Area for MAST and MAST-U") - cpf_area_truby: Optional[float] = Field(alias="gen_area_truby", + cpf_area_truby: Optional[float] = Field(alias="gen_poloidal_area_ruby_time", description="(Generic) Poloidal Cross-Sectional Area at time of Ruby TS for MAST only") - cpf_bepmhd_ipmax: Optional[float] = Field(alias="gen_be_poloidal_ipmax", + cpf_bepmhd_ipmax: Optional[float] = Field(alias="gen_beta_poloidal_max_current", description="(Generic) Beta poloidal at time of Peak Plasma Current for MAST and MAST-U") - cpf_bepmhd_max: Optional[float] = Field(alias="gen_be_poloidal_max", + cpf_bepmhd_max: Optional[float] = Field(alias="gen_max_beta_poloidal", description="(Generic) Maximum Beta poloidal for MAST and MAST-U") - cpf_bepmhd_truby: Optional[float] = Field(alias="gen_be_poloidal_truby", + cpf_bepmhd_truby: Optional[float] = Field(alias="gen_beta_poloidal_ruby_time", description="(Generic) Beta poloidal at time of Ruby TS for MAST only") - cpf_betmhd_ipmax: Optional[float] = Field(alias="gen_be_time_ipmax", + cpf_betmhd_ipmax: Optional[float] = Field(alias="gen_beta_time_max_current", description="(Generic) Beta at time of peak plasma current for MAST and MAST-U") - cpf_betmhd_max: Optional[float] = Field(alias="gen_be_time_max", + cpf_betmhd_max: Optional[float] = Field(alias="gen_max_beta_max_current", description="(Generic) Maximum beta at time of peak plasma current for MAST and MAST-U") - cpf_betmhd_truby: Optional[float] = Field(alias="gen_be_time_truby", + cpf_betmhd_truby: Optional[float] = Field(alias="gen_beta_ruby_time", description="(Generic) Beta at time of ruby TS for MAST only") - cpf_bt_ipmax: Optional[float] = Field(alias="gen_toroidal_ipmax", + cpf_bt_ipmax: Optional[float] = Field(alias="gen_toroidal_max_current", description="(Generic) Toroidal field strength at time of peak \ plasma current for MAST and MAST-U") - cpf_bt_max: Optional[float] = Field(alias="gen_toroidal_max", + cpf_bt_max: Optional[float] = Field(alias="gen_max_toroidal", description="(Generic) Maximum Toroidal field strength for MAST and MAST-U") - cpf_bt_truby: Optional[float] = Field(alias="gen_toroidal_truby", + cpf_bt_truby: Optional[float] = Field(alias="gen_toroidal_ruby_time", description="(Generic) Toroidal field strength at time of ruby TS for MAST only") cpf_c2ratio: Optional[float] = Field(alias="rad_c2ratio", description="(Radii) CII Line ratio averaged over Ip flat top from 150ms for MAST and MAST-U") cpf_column_temp_in: Optional[float] = Field(alias="gas_col_temp_in", - description="(Gas) centre column outlet temperature for MAST only") + description="(Gas) centre column inlet temperature for MAST only") cpf_column_temp_out: Optional[float] = Field(alias="gas_col_temp_out", - description="(Gas) centre column inlet temperature for MAST only") + description="(Gas) centre column outlet temperature for MAST only") - cpf_creation: Optional[datetime.datetime] = Field(alias="shot_creation_dt", + cpf_creation: Optional[datetime.datetime] = Field(alias="shot_creation_date", description="(Shot metdata) data dictionary entry creation \ date for MAST and MAST-U") - cpf_dwmhd_ipmax: Optional[float] = Field(alias="gen_dt_energy_ipmax", + cpf_dwmhd_ipmax: Optional[float] = Field(alias="gen_dt_energy_max_current", description="(Generic) rate of change of total stored energy at \ time of peak plasma current for MAST and MAST-U") - cpf_dwmhd_max: Optional[float] = Field(alias="gen_dt_energy_max", + cpf_dwmhd_max: Optional[float] = Field(alias="gen_dt_total_energy", description="(Generic) maximum rate of change of total stored energy \ for MAST and MAST-U") - cpf_dwmhd_truby: Optional[float] = Field(alias="gen_dt_energy_truby", + cpf_dwmhd_truby: Optional[float] = Field(alias="gen_dt_energy_ruby_time", description="(Generic) rate of change of MHD stored energy at \ time of ruby TS for MAST only") - cpf_enbi_max_ss: Optional[float] = Field(alias="nbi_energy_max_ss", + cpf_enbi_max_ss: Optional[float] = Field(alias="nbi_energy_ss_max_power", description="(NBI) injection energy from SS beam at time of peak power \ for MAST and MAST-U") - cpf_enbi_max_sw: Optional[float] = Field(alias="nbi_energy_max_sw", + cpf_enbi_max_sw: Optional[float] = Field(alias="nbi_energy_sw_max_power", description="(NBI) injection energy from SW beam at time of peak power \ for MAST and MAST-U") @@ -599,157 +599,157 @@ class ShotModel(SQLModel, table=True): cpf_exp_time: Optional[datetime.time] = Field(alias="shot_exp_time", description="MAST shot experiment pulse time for MAST and MAST-U") - cpf_gdc_duration: Optional[float] = Field(alias="shot_gdc_duration", + cpf_gdc_duration: Optional[float] = Field(alias="shot_glow_discharge_duration", description="Shot glow discharge duration for both") - cpf_gdc_time: Optional[float] = Field(alias="shot_gdc_time", + cpf_gdc_time: Optional[float] = Field(alias="shot_glow_discharge_time", description="Shot glow discharge time for both") - cpf_ibgas_pressure: Optional[float] = Field(alias="gas_ib_pressure_pp", + cpf_ibgas_pressure: Optional[float] = Field(alias="gas_inboard_pressure_pre_pulse", description="Inboard gas pressure prior to pulse for MAST only") - cpf_ip_av: Optional[float] = Field(alias="plasma_current_av", + cpf_ip_av: Optional[float] = Field(alias="plasma_t_avg_current", description="(Plasma) Time averaged plasma current during flat-top for MAST and MAST-U") - cpf_ip_max: Optional[float] = Field(alias="plasma_current_max", + cpf_ip_max: Optional[float] = Field(alias="plasma_max_current", description="(Plasma) Maximum value of plasma current for MAST and MAST-U") - cpf_jnbi_ipmax: Optional[float] = Field(alias="nbi_j_ipmax", + cpf_jnbi_ipmax: Optional[float] = Field(alias="nbi_injected_energy_max_current", description="(NBI) injected energy from \ SS+SW beams at time of peak current for MAST and MAST-U") - cpf_jnbi_ipmax_ss: Optional[float] = Field(alias="nbi_j_ipmax_ss", + cpf_jnbi_ipmax_ss: Optional[float] = Field(alias="nbi_injected_energy_ss_max_current", description="(NBI) injected energy from \ SS beams at time of peak current for MAST and MAST-U") - cpf_jnbi_ipmax_sw: Optional[float] = Field(alias="nbi_j_ipmax_sw", + cpf_jnbi_ipmax_sw: Optional[float] = Field(alias="nbi_injected_energy_ss_max_current", description="(NBI) injected energy from \ SW beams at time of peak current for MAST and MAST-U") - cpf_jnbi_max: Optional[float] = Field(alias="nbi_j_max", + cpf_jnbi_max: Optional[float] = Field(alias="nbi_injected_energy_max", description="(NBI) injected energy from SS+SW \ beams at time of peak power for MAST and MAST-U") - cpf_jnbi_max_ss: Optional[float] = Field(alias="nbi_j_max_ss", + cpf_jnbi_max_ss: Optional[float] = Field(alias="nbi_energy_ss_max_current", description="(NBI) injection energy from SS \ beam at time of peak power for MAST and MAST-U") - cpf_jnbi_max_sw: Optional[float] = Field(alias="nbi_j_max_sw", + cpf_jnbi_max_sw: Optional[float] = Field(alias="nbi_energy_sw_max_current", description="(NBI) injection energy from SW \ beam at time of peak power for MAST and MAST-U") - cpf_jnbi_total: Optional[float] = Field(alias="nbi_j_total", + cpf_jnbi_total: Optional[float] = Field(alias="nbi_total_injected_energy", description="Total NBI injected energy from \ SS+SW beams for MAST and MAST-U") - cpf_jnbi_total_ss: Optional[float] = Field(alias="nbi_j_total_ss", + cpf_jnbi_total_ss: Optional[float] = Field(alias="nbi_total_injected_energy_ss", description="Total NBI Injected Energy from SS Beam \ for MAST and MAST-U") - cpf_jnbi_total_sw: Optional[float] = Field(alias="nbi_j_total_sw", + cpf_jnbi_total_sw: Optional[float] = Field(alias="nbi_total_injected_energy_sw", description="Total NBI Injected Energy from SW Beam \ for MAST and MAST-U") - cpf_jnbi_truby: Optional[float] = Field(alias="nbi_j_truby", + cpf_jnbi_truby: Optional[float] = Field(alias="nbi_injected_energy_ruby_time", description="(NBI) Injected Energy from SS+SW Beams at \ time of Ruby TS for MAST only") - cpf_jnbi_truby_ss: Optional[float] = Field(alias="nbi_j_truby_ss", + cpf_jnbi_truby_ss: Optional[float] = Field(alias="nbi_injected_energy_ss_ruby_time", description="NBI Injected Energy from SW Beam at time \ of Ruby TS for MAST only") - cpf_jnbi_truby_sw: Optional[float] = Field(alias="nbi_j_truby_sw", + cpf_jnbi_truby_sw: Optional[float] = Field(alias="nbi_injected_energy_sw_ruby_time", description="(NBI) Injected Energy from SW Beam at time \ of Ruby TS for MAST only") - cpf_johm_ipmax: Optional[float] = Field(alias="johm_ipmax", + cpf_johm_ipmax: Optional[float] = Field(alias="ohm_energy_max_current", description="Ohmic Heating Energy Input at time of \ Peak Current for MAST and MAST-U") - cpf_johm_max: Optional[float] = Field(alias="johm_max", + cpf_johm_max: Optional[float] = Field(alias="ohm_energy_max_heating", description="Ohmic Heating Energy Input at time of \ Maximum Ohmic Heating for MAST and MAST-U") - cpf_johm_total: Optional[float] = Field(alias="johm_total", + cpf_johm_total: Optional[float] = Field(alias="ohm_energy_total", description="Total Ohmic Heating Energy Input \ for MAST and MAST-U") - cpf_johm_truby: Optional[float] = Field(alias="johm_truby", + cpf_johm_truby: Optional[float] = Field(alias="ohm_energy_ruby_time", description="Ohmic Heat Energy Input at time \ of Ruby TS for MAST only") - cpf_kappa_ipmax: Optional[float] = Field(alias="gen_elong_ipmax", + cpf_kappa_ipmax: Optional[float] = Field(alias="gen_plasma_elongation_max_current", description="(Generic) Plasma Elongation at time of Peak \ Plasma Current for MAST and MAST-U") - cpf_kappa_max: Optional[float] = Field(alias="gen_elong_max", + cpf_kappa_max: Optional[float] = Field(alias="gen_plasma_elongation_max", description="(Generic) Maximum value of Plasma Elongation \ for MAST and MAST-U") - cpf_kappa_truby: Optional[float] = Field(alias="gen_elong_truby", + cpf_kappa_truby: Optional[float] = Field(alias="gen_plasma_elongation_ruby_time", description="(Generic) Plasma Elongation at time of Ruby TS for MAST only") - cpf_li_2_ipmax: Optional[float] = Field(alias="equi_li2_ipmax", + cpf_li_2_ipmax: Optional[float] = Field(alias="equi_li2_max_current", description="(Equilibrium) li(2) at time of Peak Current for MAST and MAST-U") - cpf_li_2_max: Optional[float] = Field(alias="equi_li2_max", + cpf_li_2_max: Optional[float] = Field(alias="equi_max_li2", description="(Equilibrium) li(2) Maximum value for MAST and MAST-U") - cpf_li_2_truby: Optional[float] = Field(alias="equi_li2_truby", + cpf_li_2_truby: Optional[float] = Field(alias="equi_li2_ruby_time", description="(Equilibrium) li(2) Maximum value for MAST and MAST-U") - cpf_li_3_ipmax: Optional[float] = Field(alias="equi_li3_ipmax", + cpf_li_3_ipmax: Optional[float] = Field(alias="equi_li3_max_current", description="(Equilibrium) li(3) at time of Peak Current for MAST and MAST-U") - cpf_li_3_max: Optional[float] = Field(alias="equi_li3_max", + cpf_li_3_max: Optional[float] = Field(alias="equi_max_li3", description="(Equilibrium) li(3) Maximum value for MAST and MAST-U") - cpf_li_3_truby: Optional[float] = Field(alias="equi_li3_truby", + cpf_li_3_truby: Optional[float] = Field(alias="equi_li3_ruby_time", description="(Equilibrium) li(3) at time of Ruby TS for MAST only") cpf_log_base_pressure: Optional[float] = Field(alias="gas_tg1_pressure_ps", description="(Gas) TG1 Base Pressure prior to Shot for MAST only") - cpf_ndl_co2_ipmax: Optional[float] = Field(alias="thom_e_dens_ipmax", + cpf_ndl_co2_ipmax: Optional[float] = Field(alias="thom_e_dens_line_max_current", description="(Thomson) Electron Density Line Integral at time \ of Peak Plasma Current for MAST and MAST-U") - cpf_ndl_co2_max: Optional[float] = Field(alias="thom_e_dens_max", + cpf_ndl_co2_max: Optional[float] = Field(alias="thom_max_e_dens_line", description="(Thomson) Maximum Electron Density Line Integral \ observed by CO2 Interferometer for MAST and MAST-U") - cpf_ndl_co2_truby: Optional[float] = Field(alias="thom_e_dens_truby", + cpf_ndl_co2_truby: Optional[float] = Field(alias="thom_e_dens_line_ruby_time", description="(Thomson) Electron Density Line Integral at time \ of Ruby TS for MAST only") - cpf_ne0_ipmax: Optional[float] = Field(alias="thom_e_dens_ipmax", + cpf_ne0_ipmax: Optional[float] = Field(alias="thom_e_dens_max_current", description="(Thomson) Core Electron Density (Nd.YAG) at time of \ Peak Current for MAST and MAST-U") cpf_ne0_max: Optional[float] = Field(alias="thom_e_dens_max", description="(Thomson) Peak Core Electron Density (Nd.YAG) for MAST and MAST-U") - cpf_ne0_truby: Optional[float] = Field(alias="thom_e_dens_truby", + cpf_ne0_truby: Optional[float] = Field(alias="thom_e_dens_ruby_time", description="(Thomson) Core Electron Density (Nd.YAG) at time of Ruby TS for MAST only") - cpf_ne0ratio_ipmax: Optional[float] = Field(alias="thom_ne0ratio_ipmax", + cpf_ne0ratio_ipmax: Optional[float] = Field(alias="thom_ne0_rat_line_avg_ne", description="(Thomson) Ratio of ne0 to line average ne for MAST and MAST-U") - cpf_ne0ruby: Optional[float] = Field(alias="thom_e_dens_ruby", + cpf_ne0ruby: Optional[float] = Field(alias="thom_e_dens_ruby_time", description="(Thomson) Core Electron Density (Nd.YAG) at time of Ruby TS for MAST only") - cpf_ne_bar_ipmax: Optional[float] = Field(alias="thom_av_e_dens_co2", + cpf_ne_bar_ipmax: Optional[float] = Field(alias="thom_line_avg_e_dens_co2", description="(Thomson) Mid-plane line average electron density \ from CO2 interferometer for MAST and MAST-U") - cpf_ne_yag_bar_ipmax: Optional[float] = Field(alias="thom_av_e_dens_ipmax", + cpf_ne_yag_bar_ipmax: Optional[float] = Field(alias="thom_line_avg_e_dens_co2", description="(Thomson) Mid-plane line average electron density from CO2 \ interferometer for MAST and MAST-U") cpf_ngreenwald_ipmax: Optional[float] = Field(alias="thom_greenwald_dens_limit", description="(Thomson) Greenwald Density Limit for MAST and MAST-U") - cpf_ngreenwaldratio_ipmax: Optional[float] = Field(alias="thom_greenwald_den_rat_av_e_den", + cpf_ngreenwaldratio_ipmax: Optional[float] = Field(alias="thom_greenwald_den_rat_line_avd_e_dens", description="(Thomson) Ratio of Greenwald density limit to mid-plane \ line averaged electron density for MAST and MAST-U") @@ -760,7 +760,7 @@ class ShotModel(SQLModel, table=True): cpf_objective: Optional[str] = Field(alias="shot_objective", description="Shot Scientific Objective for MAST and MAST-U") - cpf_pe0_ipmax: Optional[float] = Field(alias="thom_e_pressure_ipmax", + cpf_pe0_ipmax: Optional[float] = Field(alias="thom_e_pressure_max_current", description="(Thomsom) Core Electron Pressure (Nd.YAG) at time of Peak \ Plasma Current for MAST and MAST-U") @@ -768,69 +768,69 @@ class ShotModel(SQLModel, table=True): description="(Thomsom) Maximum value of Core Electron Pressure (Nd.YAG) \ for MAST and MAST-U") - cpf_pe0_truby: Optional[float] = Field(alias="thom_e_pressure_truby", + cpf_pe0_truby: Optional[float] = Field(alias="thom_e_pressure_ruby_time", description="(Thomsom) Core Electron Pressure (Nd.YAG) at time of Ruby TS \ for MAST only") cpf_pe0ruby: Optional[float] = Field(alias="thom_e_pressure_ruby", description="(Thomsom) Ruby TS Core Electron Pressure for MAST only") - cpf_pic: Optional[str] = Field(alias="shot_physicist_ic", + cpf_pic: Optional[str] = Field(alias="shot_physicist", description="(Shot) physicist in charge for MAST and MAST-U") - cpf_pnbi_ipmax: Optional[float] = Field(alias="nbi_p_max_current", + cpf_pnbi_ipmax: Optional[float] = Field(alias="nbi_power_max_current", description="(NBI) Power from SS+SW Beams at time of Peak Current \ for MAST and MAST-U") - cpf_pnbi_ipmax_ss: Optional[float] = Field(alias="nbi_p_max_current_ss", + cpf_pnbi_ipmax_ss: Optional[float] = Field(alias="nbi_power_ss_max_current", description="(NBI) Power from SS Beam at time of Peak Current \ for MAST and MAST-U") - cpf_pnbi_ipmax_sw: Optional[float] = Field(alias="nbi_p_max_current_sw", + cpf_pnbi_ipmax_sw: Optional[float] = Field(alias="nbi_power_max_current", description="(NBI) Power from SW Beam at time of Peak Current \ for MAST and MAST-U") - cpf_pnbi_max: Optional[float] = Field(alias="nbi_p_max_pow", + cpf_pnbi_max: Optional[float] = Field(alias="nbi_power_max_power", description="(NBI) Power from SS+SW Beams at time of Peak power \ for MAST and MAST-U") - cpf_pnbi_max_ss: Optional[float] = Field(alias="nbi_p_max_ss", + cpf_pnbi_max_ss: Optional[float] = Field(alias="nbi_power_max_ss", description="Peak NBI Power from SS Beam for MAST and MAST-U") - cpf_pnbi_max_sw: Optional[float] = Field(alias="nbi_p_max_sw", + cpf_pnbi_max_sw: Optional[float] = Field(alias="nbi_power_max_sw", description="Peak NBI Power from SW Beam for MAST and MAST-U") - cpf_pnbi_truby: Optional[float] = Field(alias="nbi_p_truby", + cpf_pnbi_truby: Optional[float] = Field(alias="nbi_power_ruby_time", description="(NBI) Power from SS+SW Beams at time of Ruby TS for MAST and MAST-U") - cpf_pnbi_truby_ss: Optional[float] = Field(alias= "nbi_p_truby_ss", + cpf_pnbi_truby_ss: Optional[float] = Field(alias= "nbi_power_truby_ss", description="(NBI) Power from SS Beam at time of Ruby TS for MAST and MAST-U") - cpf_pnbi_truby_sw: Optional[float] = Field(alias = "nbi_p_truby_sw", + cpf_pnbi_truby_sw: Optional[float] = Field(alias = "nbi_power_truby_sw", description="(NBI) Power from SW Beam at time of Ruby TS for MAST and MAST-U") - cpf_pohm_ipmax: Optional[float] = Field(alias = "ohm_hr_max_current", + cpf_pohm_ipmax: Optional[float] = Field(alias = "ohm_heating_max_current", description="Ohmic Heating Rate at time of Peak Current for MAST and MAST-U") - cpf_pohm_max: Optional[float] = Field(alias="ohm_hr_max", description="Maximum Ohmic Heating Rate for MAST and MAST-U") + cpf_pohm_max: Optional[float] = Field(alias="ohm_max_heating", description="Maximum Ohmic Heating Rate for MAST and MAST-U") - cpf_pohm_truby: Optional[float] = Field(alias="ohm_hr_truby", + cpf_pohm_truby: Optional[float] = Field(alias="ohm_heating_ruby_time", description="Ohmic Heating Rate at time of Ruby TS for MAST only") cpf_postshot: Optional[str] = Field(alias="shot_postshot", description="Session Leaders Post-Shot Comment for MAST and MAST-U") - cpf_prad_ipmax: Optional[float] = Field(alias="gen_rad_pow_loss_ipmax", + cpf_prad_ipmax: Optional[float] = Field(alias="gen_rad_power_loss_max_current", description="(Generic) Total Radiated Power Loss at time of \ Peak Plasma Current for MAST and MAST-U") cpf_prad_max: Optional[float] = Field(alias="gen_rad_pow_loss_max", description="(Generic) Maximum Total Radiated Power Loss for MAST and MAST-U") - cpf_prad_truby: Optional[float] = Field(alias="gen_rad_pow_loss_truby", + cpf_prad_truby: Optional[float] = Field(alias="gen_rad_power_loss_ruby_time", description="(Generic) Total Radiated Power Loss at time of Ruby TS for MAST only") - cpf_pradne2: Optional[float] = Field(alias="rad_ft_pow_rat_av_den", + cpf_pradne2: Optional[float] = Field(alias="rad_flattop_power_rat_avg_den", description="(Radii) Flat Top Ratio of Power Radiated to Line Density squared \ averaged over Ip flat top from 150ms for MAST and MAST-U") @@ -840,61 +840,61 @@ class ShotModel(SQLModel, table=True): cpf_program: Optional[str] = Field(alias="shot_program", description="(Shot) Scientific Program for MAST and MAST-U") - cpf_pulno: Optional[float] = Field(alias="shot_pul_number", + cpf_pulno: Optional[float] = Field(alias="shot_pulse_number", description="(Ghot) MAST Experiment Pulse Number for MAST and MAST-U") - cpf_q95_ipmax: Optional[float] = Field(alias="gen_q95_ipmax", + cpf_q95_ipmax: Optional[float] = Field(alias="gen_q95_max_current", description="(Generic) q-95 at time of Peak Plasma Current for MAST and MAST-U") cpf_q95_min: Optional[float] = Field(alias="gen_min_q95", description="(Generic) Minimum value of q-95 for MAST and MAST-U") - cpf_q95_truby: Optional[float] = Field(alias="gen_q95_truby", + cpf_q95_truby: Optional[float] = Field(alias="gen_q95_ruby_time", description="(Generic) q-95 at time of Ruby TS") cpf_reference: Optional[float] = Field(alias="shot_reference", description="(Shot) Reference shot for MAST and MAST-U") - cpf_rgeo_ipmax: Optional[float] = Field(alias="gen_geo_rad_ipmax", + cpf_rgeo_ipmax: Optional[float] = Field(alias="gen_geo_radius_max_current", description="(Generic) geometrical center major radius at time of \ peak plasma current for MAST and MAST-U") - cpf_rgeo_max: Optional[float] = Field(alias="gen_geo_rad_max", + cpf_rgeo_max: Optional[float] = Field(alias="gen_geo_radius_max", description="(Generic) Maximum value of Geometrical Center \ Major Radius for MAST and MAST-U") - cpf_rgeo_truby: Optional[float] = Field(alias="gen_geo_rad_truby", + cpf_rgeo_truby: Optional[float] = Field(alias="gen_geo_radius_ruby_time", description="(Generic) geometrical Center Major Radius at time \ of Ruby TS for MAST and MAST-U") - cpf_rinner_da: Optional[float] = Field(alias="rad_rinner_da", + cpf_rinner_da: Optional[float] = Field(alias="rad_rinner_radius_d_alpha", description="(Radii) rinner major Radius from Visible D_Alpha Light \ for MAST and MAST-U") - cpf_rinner_efit: Optional[float] = Field(alias="rad_rinner_efit", + cpf_rinner_efit: Optional[float] = Field(alias="rad_rinner_radius_efit", description="(Radii) rinner major Radius from EFIT Equilibrium \ for MAST and MAST-U") - cpf_rmag_efit: Optional[float] = Field(alias="rad_mag_efit", + cpf_rmag_efit: Optional[float] = Field(alias="rad_magnetic__radius_efit", description="(Radii) magnetic Axis major Radius from EFIT Equilibrium \ for MAST and MAST-U") - cpf_router_da: Optional[float] = Field(alias="rad_router_da", + cpf_router_da: Optional[float] = Field(alias="rad_router_radius_d_alpha", description="(Radii) router major Radius from Visible D_Alpha Light \ for MAST and MAST-U") - cpf_router_efit: Optional[float] = Field(alias="rad_router_efit", + cpf_router_efit: Optional[float] = Field(alias="rad_router_radius_efit", description="(Radii) router major Radius from EFIT Equilibrium \ for MAST and MAST-U") - cpf_sarea_ipmax: Optional[float] = Field(alias="rad_sarea_ipmax", + cpf_sarea_ipmax: Optional[float] = Field(alias="rad_sarea_max_current", description="(Generic) Total Surface Area at time of Peak Plasma \ Current for MAST and MAST-U") cpf_sarea_max: Optional[float] = Field(alias="gen_sarea_max", description="(Generic) maximum Total Surface Area for MAST and MAST-U") - cpf_sarea_truby: Optional[float] = Field(alias="gen_sarea_truby", + cpf_sarea_truby: Optional[float] = Field(alias="gen_sarea_ruby_time", description="(Generic) total Surface Area at time of Ruby TS for MAST only") cpf_sl: Optional[str] = Field(alias="shot_session_leader", @@ -905,39 +905,39 @@ class ShotModel(SQLModel, table=True): cpf_summary: Optional[str] = Field(alias="shot_summary", description="(Shot) session summary for MAST and MAST-U") - cpf_tamin_max: Optional[float] = Field(alias="gen_t_max_plasma_m_rad", + cpf_tamin_max: Optional[float] = Field(alias="gen_min_radius_max_plasma", description="(Generic) Time of Maximum Plasma Minor Radius for MAST and MAST-U") - cpf_tarea_max: Optional[float] = Field(alias="gen_tarea_max", + cpf_tarea_max: Optional[float] = Field(alias="gen_max_poloidal_area", description="(Generic) Time of Maximum Poloidal Cross-Sectional Area \ for MAST and MAST-U") - cpf_tautot_ipmax: Optional[float] = Field(alias="gen_energy_t_ipmax", + cpf_tautot_ipmax: Optional[float] = Field(alias="gen_energy_time_max_current", description="(Generic) Energy Confinement Time at time of Peak Plasma Current \ for MAST and MAST-U") - cpf_tautot_max: Optional[float] = Field(alias="gen_energy_time_max", + cpf_tautot_max: Optional[float] = Field(alias="gen_max_energy_time", description="(Generic) Maximum value of Energy Confinement Time for MAST and MAST-U") - cpf_tautot_truby: Optional[float] = Field(alias="gen_energy_time_truby", + cpf_tautot_truby: Optional[float] = Field(alias="gen_energy_time_ruby_time", description="(Generic) Energy Confinement Time at time of Ruby TS for MAST and MAST-U") - cpf_tbepmhd_max: Optional[float] = Field(alias="gen_t_be_poloidal_max", + cpf_tbepmhd_max: Optional[float] = Field(alias="gen_max_beta_poloidal_mhd", description="(Generic) Time of Maximum Beta Poloidal MHD for MAST and MAST-U") - cpf_tbetmhd_max: Optional[float] = Field(alias="gen_t_be_mhd_max", + cpf_tbetmhd_max: Optional[float] = Field(alias="gen_max_beta_mhd", description="(Generic) Time of Maximum Beta MHD for MAST and MAST-U") - cpf_tbt_max: Optional[float] = Field(alias="gen_t_toroidal_max", + cpf_tbt_max: Optional[float] = Field(alias="gen_max_toroidal_time", description="(Generic) Time of Maximum Toroidal Magnetic Field Strength \ for MAST and MAST-U") - cpf_tdwmhd_max: Optional[float] = Field(alias="gen_t_dt_mhd_energy_max", + cpf_tdwmhd_max: Optional[float] = Field(alias="gen_max_dt_mhd_energy_time", description="(Generic) Time of Maximum Rate of Change of MHD Stored Energy \ for MAST and MAST-U") - cpf_te0_ipmax: Optional[float] = Field(alias="thom_e_temp_ipmax", + cpf_te0_ipmax: Optional[float] = Field(alias="thom_e_temp_max_current", description="(Thomoson) Core Electron Temperature (Nd.YAG) at time of \ Peak Current for MAST and MAST-U") @@ -945,25 +945,25 @@ class ShotModel(SQLModel, table=True): description="(Thomson) Peak Core Electron Temperature (Nd.YAG) \ for MAST and MAST-U") - cpf_te0_truby: Optional[float] = Field(alias="thom_e_temp_truby", + cpf_te0_truby: Optional[float] = Field(alias="thom_e_temp_ruby_time", description="(Thomson) Core Electron Temperature (Nd.YAG) at \ time of Ruby TS for MAST only") - cpf_te0ratio_ipmax: Optional[float] = Field(alias="thom_e_temp_rat_av_temp", + cpf_te0ratio_ipmax: Optional[float] = Field(alias="thom_e_temp_rat_line_avg_temp", description="(Thomson) ratio of Core Electron Temperature to line \ average Te for MAST and MAST-U") cpf_te0ruby: Optional[float] = Field(alias="thom_e_temp_ruby", description="(Thomson) Ruby TS Core Electron Temperature for MAST only") - cpf_te_yag_bar_ipmax: Optional[float] = Field(alias="thom_yag_av_e_temp", + cpf_te_yag_bar_ipmax: Optional[float] = Field(alias="thom_yag_line_avg_e_temp", description="Mid-plane line average electron temperature from \ YAG Thomson scattering for MAST and MAST-U") cpf_tend: Optional[float] = Field(alias="plasma_end_time", description="(Plasma) current end time for MAST and MAST-U") - cpf_tend_ibgas: Optional[float] = Field(alias="gas_end_time_ib",description="Inboard Gas Puff End Time for MAST only") + cpf_tend_ibgas: Optional[float] = Field(alias="gas_puff_end_time",description="Inboard Gas Puff End Time for MAST only") cpf_tend_nbi: Optional[float] = Field(alias="nbi_end_time",description="(NBI) end time for MAST and MAST-U") @@ -971,120 +971,120 @@ class ShotModel(SQLModel, table=True): cpf_tend_nbi_sw: Optional[float] = Field(alias="nbi_end_time_ss", description="SW NBI end time for MAST and MAST-U") - cpf_term_code: Optional[float] = Field(alias="shot_term_code", + cpf_term_code: Optional[float] = Field(alias="shot_end_code", description="(Plasma) shot termination reason code for MAST and MASt-U") - cpf_tftend: Optional[float] = Field(alias="plasma_flat_top_end_time", + cpf_tftend: Optional[float] = Field(alias="plasma_flattop_end_time", description="(Plasma) Current Flat-Top End Time for MAST and MAST-U") - cpf_tftstart: Optional[float] = Field(alias="plasma_flat_top_start_time", + cpf_tftstart: Optional[float] = Field(alias="plasma_flattop_start_time", description="(Plasma) Current Flat-Top Start Time for MAST and MAST-U") - cpf_tipmax: Optional[float] = Field(alias="plasma_t_current_max", + cpf_tipmax: Optional[float] = Field(alias="plasma_max_plasma_current_time", description="(Plasma) Time of Maximum Plasma Current for MAST and MAST-U") - cpf_tkappa_max: Optional[float] = Field(alias="gen_t_plasma_elon_max", + cpf_tkappa_max: Optional[float] = Field(alias="gen_max_plasma_elongation_time", description="(Generic) Time of Maximum Plasma Elongation for MAST and MAST-U") - cpf_tli_2_max: Optional[float] = Field(alias="equi_t_li2_max", + cpf_tli_2_max: Optional[float] = Field(alias="equi_max_li2_time", description="(Equilibrium) time of Maximum li(2) for MAST and MAST-U") - cpf_tli_3_max: Optional[float] = Field(alias="equi_t_li3_max", + cpf_tli_3_max: Optional[float] = Field(alias="equi_max_li3_time", description="(Equilibrium) time of Maximum li(3) for MAST and MAST-U") - cpf_tndl_co2_max: Optional[float] = Field(alias="thom_t_e_dens_li_max", + cpf_tndl_co2_max: Optional[float] = Field(alias="thom_max_e_dens_line_time", description="(Thomson) Time of Maximum Electron Density Line Integral \ for MAST and MAST-U") - cpf_tne0_max: Optional[float] = Field(alias="thom_t_e_dens_max", + cpf_tne0_max: Optional[float] = Field(alias="thom_max_e_dens_time", description="(thomson) Time of Maximum Core Electron Density (from Nd.YAG TS) \ for MAST and MAST-U") - cpf_tpe0_max: Optional[float] = Field(alias="thom_t_e_pressure_max", + cpf_tpe0_max: Optional[float] = Field(alias="thom_max_e_pressure_time", description="(Thomson) Time of Maximum Core Electron Pressure (from Nd.YAG TS) \ for MAST and MAST-U") - cpf_tpnbi_max: Optional[float] = Field(alias="nbi_t_power_max", description="(NBI) Time of Maximum NB Power for MAST and MAST-U") + cpf_tpnbi_max: Optional[float] = Field(alias="nbi_max_power_time", description="(NBI) Time of Maximum NB Power for MAST and MAST-U") - cpf_tpnbi_max_ss: Optional[float] = Field(alias="nbi_t_ss_power_maxx", description="(NBI) Time of Maximum SS NBI Power for MAST and MAST-U") + cpf_tpnbi_max_ss: Optional[float] = Field(alias="nbi_max_ss_power_time", description="(NBI) Time of Maximum SS NBI Power for MAST and MAST-U") - cpf_tpnbi_max_sw: Optional[float] = Field(alias="nbi_t_sw_power_max",description="(NBI) Time of Maximum SW NBI Power for MAST and MAST-U") + cpf_tpnbi_max_sw: Optional[float] = Field(alias="nbi_max_sw_power_time",description="(NBI) Time of Maximum SW NBI Power for MAST and MAST-U") - cpf_tpohm_max: Optional[float] = Field(alias="ohm_t_heat_max", description="(NBI) Time of Maximum Ohmic Heating for MAST and MAST-U") + cpf_tpohm_max: Optional[float] = Field(alias="ohm_max_heating_time", description="(NBI) Time of Maximum Ohmic Heating for MAST and MAST-U") - cpf_tprad_max: Optional[float] = Field(alias="gen_t_p_power_loss_max", + cpf_tprad_max: Optional[float] = Field(alias="gen_max_plasma_power_loss_time", description="(Generic) Time of Maximum Plasma Radiated Power Loss for MAST and MAST-U") - cpf_tq95_min: Optional[float] = Field(alias="gen_t_q95_min", + cpf_tq95_min: Optional[float] = Field(alias="gen_min_q95_time", description="(Generic) Time of Minimum q 95 for MAST and MAST-U") - cpf_trgeo_max: Optional[float] = Field(alias="gen_t_geo_rad_max", + cpf_trgeo_max: Optional[float] = Field(alias="gen_max_geo_maj_radius_time", description="(Generic) Time of Maximum Geometrical Mid-plane Center Major Radius \ for MAST and MAST-U") - cpf_truby: Optional[float] = Field(alias="thom_truby", + cpf_truby: Optional[float] = Field(alias="thom_ruby_time", description="(Thomson) Ruby Thomson Scattering Time for MAST only") - cpf_tsarea_max: Optional[float] = Field(alias="gen_t_p_sarea_max", + cpf_tsarea_max: Optional[float] = Field(alias="gen_max_plasma_sarea_time", description="(Generic) Time of Maximum Plasma Surface Area for MAST and MAST-U") - cpf_tstart: Optional[float] = Field(alias="plasma_flat_top_stime", + cpf_tstart: Optional[float] = Field(alias="plasma_flattop_start_time", description="(Plasma) Current Flat-Top Start Time for MAST and MAST-U") - cpf_tstart_ibgas: Optional[float] = Field(alias ="gas_ib_stime", description="Inboard Gas Puff Start Time for MAST only") + cpf_tstart_ibgas: Optional[float] = Field(alias ="gas_puff_start_time", description="Inboard Gas Puff Start Time for MAST only") - cpf_tstart_nbi: Optional[float] = Field(alias="nbi_stime",description="(NBI) Start Time for MAST and MAST-U") + cpf_tstart_nbi: Optional[float] = Field(alias="nbi_start_time",description="(NBI) Start Time for MAST and MAST-U") - cpf_tstart_nbi_ss: Optional[float] = Field(alias="nbi_ss_stime",description="SS NBI Start Time for MAST and MAST-U") + cpf_tstart_nbi_ss: Optional[float] = Field(alias="nbi_ss_start_time",description="SS NBI Start Time for MAST and MAST-U") - cpf_tstart_nbi_sw: Optional[float] = Field(alias="nbi_sw_stime",description="SW NBI Start Time for MAST and MAST-U") + cpf_tstart_nbi_sw: Optional[float] = Field(alias="nbi_sw_start_time",description="SW NBI Start Time for MAST and MAST-U") - cpf_ttautot_max: Optional[float] = Field(alias="gen_t_tenergy_max", + cpf_ttautot_max: Optional[float] = Field(alias="gen_max_total_energy_time", description="(Generic) Time of Maximum Total Energy Confinement Time for MAST and MAST-U") - cpf_tte0_max: Optional[float] = Field(alias="thom_t_e_temp_max", + cpf_tte0_max: Optional[float] = Field(alias="thom_max_e_temp_time", description="(Thomson) Time of Maximum Core Electron Temperature (from Nd.YAG TS) \ for MAST and MAST-U") - cpf_tvol_max: Optional[float] = Field(alias="gen_t_p_vol_max", + cpf_tvol_max: Optional[float] = Field(alias="gen_max_plasma_vol_time", description="(Generic) Time of Maximum Plasma Volume for MAST and MAST-U") - cpf_twmhd_max: Optional[float] = Field(alias="gen_t_mhd_energy_max", + cpf_twmhd_max: Optional[float] = Field(alias="gen_max_mhd_energy_time", description="(Generic) Time of Maximum MHD Stored Energy for MAST and MAST-U") - cpf_tzeff_max: Optional[float] = Field(alias="gen_t_zeff_max", + cpf_tzeff_max: Optional[float] = Field(alias="gen_max_plasma_zeff_time", description="(Generic) Time of Maximum Plasma Z-Effective for MAST and MAST-U") cpf_useful: Optional[float] = Field(alias="shot_useful", description="Useful Shot for MAST and MAST-U") - cpf_vol_ipmax: Optional[float] = Field(alias="gen_vol_ipmax", + cpf_vol_ipmax: Optional[float] = Field(alias="gen_plasma_vol_max_current", description="(Generic) Plasma Volume at time of Peak Plasma Current for MAST and MAST-U") - cpf_vol_max: Optional[float] = Field(alias="gen_p_vol_max", + cpf_vol_max: Optional[float] = Field(alias="gen_max_plasma_vol", description="(Generic) Maximum Plasma Volume for MAST and MAST-U") - cpf_vol_truby: Optional[float] = Field(alias="gen_p_vol_truby", + cpf_vol_truby: Optional[float] = Field(alias="gen_plasma_vol_ruby_time", description="(Generic) Plasma Volume at time of Ruby TS for MAST only") - cpf_wmhd_ipmax: Optional[float] = Field(alias="gen_energy_p_current_max", + cpf_wmhd_ipmax: Optional[float] = Field(alias="gen_energy_current_max", description="(Generic) Stored Energy at time of Peak Plasma Current \ for MAST and MAST-U") cpf_wmhd_max: Optional[float] = Field(alias="gen_energy_max", description="(Generic) Maximum Stored Energy for MAST and MAST-U") - cpf_wmhd_truby: Optional[float] = Field(alias="gen_energy_truby", + cpf_wmhd_truby: Optional[float] = Field(alias="gen_energy_ruby_time", description="(Generic) Stored Energy at time of Ruby TS for MAST only") - cpf_zeff_ipmax: Optional[float] = Field(alias="gen_p_zeff_ipmax", + cpf_zeff_ipmax: Optional[float] = Field(alias="gen_plasma_zeff_max_current", description="(Generic) Plasma Z-Effective at time of Peak Plasma Current \ for MAST and MAST-U") - cpf_zeff_max: Optional[float] = Field(alias="gen_p_zeff_max", + cpf_zeff_max: Optional[float] = Field(alias="gen_plasma_zeff_max", description="(Generic) Maximum Plasma Z-Effective for MAST and MASt-U") - cpf_zeff_truby: Optional[float] = Field(alias="gen_p_zeff_truby", + cpf_zeff_truby: Optional[float] = Field(alias="gen_plasma_zeff_ruby_time", description="(Generic) Plasma Z-Effective at time of Ruby TS for MAST only") cpf_zmag_efit: Optional[float] = Field(alias="rad_mag_height_efit", diff --git a/tests/api/test_graphql.py b/tests/api/test_graphql.py index 483f31d..91e15a1 100644 --- a/tests/api/test_graphql.py +++ b/tests/api/test_graphql.py @@ -154,7 +154,7 @@ def test_query_shots_from_signals(client, override_get_db): def test_query_cpf_summary(client, override_get_db): query = """ query { - shot_summary { + cpf_summary { description } } @@ -166,8 +166,8 @@ def test_query_cpf_summary(client, override_get_db): assert "errors" not in data data = data["data"] - assert "shot_summary" in data - assert len(data["shot_summary"]) == 265 + assert "cpf_summary" in data + assert len(data["cpf_summary"]) == 265 def test_query_scenarios(client, override_get_db):