From 7fdd30ec12c333fac78924415f0ecdf177c02dbb Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Sun, 26 Jan 2025 20:54:15 +0100 Subject: [PATCH 1/9] Reference model corrections --- .../CTA-North-LSTN-01-5.0.0_test.cfg | 2 +- .../CTA-North-LSTN-02-5.0.0_test.cfg | 14 +++++++------- .../CTA-North-LSTN-03-5.0.0_test.cfg | 12 ++++++------ .../CTA-North-LSTN-04-5.0.0_test.cfg | 14 +++++++------- .../CTA-North-MSTN-01-5.0.0_test.cfg | 4 ++-- .../CTA-South-LSTS-01-5.0.0_test.cfg | 2 +- .../CTA-South-MSTS-01-5.0.0_test.cfg | 4 ++-- .../CTA-South-SSTS-01-5.0.0_test.cfg | 6 +++--- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg index 66e6180504..36203d221c 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg @@ -94,7 +94,7 @@ mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.238006 +nightsky_background = all: 0.23801 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg index 6a22e82a58..eca5a0d43c 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg @@ -19,7 +19,7 @@ atmospheric_transmission = atm_trans_2158_1_3_2_0_0_0.1_0.1.dat axes_offsets = 0.0 0.0 camera_body_diameter = 348.0 camera_body_shape = 2 -camera_config_file = camera_CTA-LST-1_analogsum21_v2020-04-14.dat +camera_config_file = camera_CTA-LST-234_analogsum21_v2020-04-14.dat camera_degraded_efficiency = 1.0 camera_degraded_map = none camera_depth = 0.0 @@ -89,12 +89,12 @@ mirror_align_random_vertical = 0.0039 28.0 0.0 0.0 mirror_class = 0 mirror_degraded_reflection = 1.0 mirror_focal_length = 0.0 -mirror_list = mirror_CTA-N-LST1_v2019-03-31.dat +mirror_list = mirror_CTA-N-LST2_v2020-04-07.dat mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.238006 +nightsky_background = all: 0.24499 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 @@ -104,12 +104,12 @@ photon_delay = 19.0 pixeltrg_time_step = 0.0 pm_average_gain = 40000.0 pm_collection_efficiency = 1.0 -pm_gain_index = 4.5 +pm_gain_index = 3.92 pm_photoelectron_spectrum = spe_LST_2020-05-09_AP2.0e-4.dat -pm_transit_time = 24.74 9.0 350.0 1066.0 -pm_voltage_variation = 0.041 +pm_transit_time = 20.89 9 350 1135 +pm_voltage_variation = 0.03 qe_variation = 0.03 -quantum_efficiency = qe_lst1_20200318_high+low.dat +quantum_efficiency = qe_lst2-4_20200318_high+low.dat random_focal_length = 0.0 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg index b284166cef..0d4fd36e3c 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg @@ -19,7 +19,7 @@ atmospheric_transmission = atm_trans_2158_1_3_2_0_0_0.1_0.1.dat axes_offsets = 0.0 0.0 camera_body_diameter = 348.0 camera_body_shape = 2 -camera_config_file = camera_CTA-LST-1_analogsum21_v2020-04-14.dat +camera_config_file = camera_CTA-LST-234_analogsum21_v2020-04-14.dat camera_degraded_efficiency = 1.0 camera_degraded_map = none camera_depth = 0.0 @@ -89,7 +89,7 @@ mirror_align_random_vertical = 0.0039 28.0 0.0 0.0 mirror_class = 0 mirror_degraded_reflection = 1.0 mirror_focal_length = 0.0 -mirror_list = mirror_CTA-N-LST1_v2019-03-31.dat +mirror_list = mirror_CTA-N-LST3_v2020-04-07.dat mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat @@ -104,12 +104,12 @@ photon_delay = 19.0 pixeltrg_time_step = 0.0 pm_average_gain = 40000.0 pm_collection_efficiency = 1.0 -pm_gain_index = 4.5 +pm_gain_index = 3.92 pm_photoelectron_spectrum = spe_LST_2020-05-09_AP2.0e-4.dat -pm_transit_time = 24.74 9.0 350.0 1066.0 -pm_voltage_variation = 0.041 +pm_transit_time = 20.89 9 350 1135 +pm_voltage_variation = 0.03 qe_variation = 0.03 -quantum_efficiency = qe_lst1_20200318_high+low.dat +quantum_efficiency = qe_lst2-4_20200318_high+low.dat random_focal_length = 0.0 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg index 95d4eef87c..942bc46ddd 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg @@ -19,7 +19,7 @@ atmospheric_transmission = atm_trans_2158_1_3_2_0_0_0.1_0.1.dat axes_offsets = 0.0 0.0 camera_body_diameter = 348.0 camera_body_shape = 2 -camera_config_file = camera_CTA-LST-1_analogsum21_v2020-04-14.dat +camera_config_file = camera_CTA-LST-234_analogsum21_v2020-04-14.dat camera_degraded_efficiency = 1.0 camera_degraded_map = none camera_depth = 0.0 @@ -89,12 +89,12 @@ mirror_align_random_vertical = 0.0039 28.0 0.0 0.0 mirror_class = 0 mirror_degraded_reflection = 1.0 mirror_focal_length = 0.0 -mirror_list = mirror_CTA-N-LST1_v2019-03-31.dat +mirror_list = mirror_CTA-N-LST4_v2020-04-07.dat mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.238006 +nightsky_background = all: 0.24499 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 @@ -104,12 +104,12 @@ photon_delay = 19.0 pixeltrg_time_step = 0.0 pm_average_gain = 40000.0 pm_collection_efficiency = 1.0 -pm_gain_index = 4.5 +pm_gain_index = 3.92 pm_photoelectron_spectrum = spe_LST_2020-05-09_AP2.0e-4.dat -pm_transit_time = 24.74 9.0 350.0 1066.0 -pm_voltage_variation = 0.041 +pm_transit_time = 20.89 9 350 1135 +pm_voltage_variation = 0.03 qe_variation = 0.03 -quantum_efficiency = qe_lst1_20200318_high+low.dat +quantum_efficiency = qe_lst2-4_20200318_high+low.dat random_focal_length = 0.0 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg index a58c7641d4..2cec2b4039 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg @@ -107,7 +107,7 @@ mirror_offset = 0.0 mirror_reflection_random_angle = 0.006759 0.125 0.037 mirror_reflectivity = ref_AlSiO2HfO2.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.207706 +nightsky_background = all: 0.20771 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 @@ -126,7 +126,7 @@ quantum_efficiency = qe_R12992-100-05b.dat random_focal_length = 3.9 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 -telescope_transmission = 0.908661 0.0 0.0 0.0 0.0 0.0 +telescope_transmission = 0.908661 0.0154576 4 1.21166 0 0 teltrig_min_sigsum = 0.0 teltrig_min_time = 1.0 transit_time_calib_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg index 9cab0f5f51..071a92c2b6 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg @@ -94,7 +94,7 @@ mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.244985 +nightsky_background = all: 0.24499 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 diff --git a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg index e054a6db70..58ac86de31 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg @@ -107,7 +107,7 @@ mirror_offset = 0.0 mirror_reflection_random_angle = 0.006759 0.125 0.037 mirror_reflectivity = ref_AlSiO2HfO2.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.209051 +nightsky_background = all: 0.20905 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 1 @@ -126,7 +126,7 @@ quantum_efficiency = qe_R12992-100-05b.dat random_focal_length = 3.9 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 -telescope_transmission = 0.908661 0.0 0.0 0.0 0.0 0.0 +telescope_transmission = 0.908661 0.0154576 4 1.21166 0 0 teltrig_min_sigsum = 0.0 teltrig_min_time = 0.0 transit_time_calib_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg index 5136f9c1b2..c04d11b7bd 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg @@ -56,7 +56,7 @@ dsum_pre_clipping = 0 dsum_prescale = 40 256 dsum_presum_max = 127 dsum_presum_shift = 1 -dsum_shaping_file = CTA-ULTRA6-dsum-shaping-FlashCam-2a-int.dat +dsum_shaping_file = none dsum_shaping_renormalize = 0 dsum_threshold = 0.0 dsum_zero_clip = 1 @@ -107,7 +107,7 @@ mirror_reflection_random_angle = 0.0255 0.0 0.0 mirror_reflectivity = ref_astri-2d_2018-01-17.dat mirror_secondary_reflectivity = ref_astri-2d_2018-01-17.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.0387262 +nightsky_background = all: 0.03873 nsb_autoscale_airmass = 0.83 0.2 nsb_gain_drop_scale = 0.0 nsb_offaxis = 1.0 0.04478 7.844 2.0282 0.0 @@ -146,7 +146,7 @@ transit_time_compensate_error = 0.2 transit_time_compensate_step = 1.0 transit_time_error = 0.1 transit_time_jitter = 0.01 -trigger_current_limit = 2000.0 +trigger_current_limit = 20.0 trigger_delay_compensation = 0.0 0.0 0.0 0.0 trigger_pixels = 2 iobuf_maximum = 1000000000 From 9e3e082df8fbb3acc18ada464fe4d89c37c1c03b Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Mon, 27 Jan 2025 14:45:30 +0100 Subject: [PATCH 2/9] remove SSTS from dsum and asum_clippling schemas --- src/simtools/schemas/model_parameters/asum_clipping.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_clipping.schema.yml | 1 - .../schemas/model_parameters/dsum_ignore_below.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_offset.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml | 1 - .../schemas/model_parameters/dsum_pre_clipping.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_prescale.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml | 1 - .../schemas/model_parameters/dsum_presum_shift.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_shaping.schema.yml | 1 - .../schemas/model_parameters/dsum_shaping_renormalize.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_threshold.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml | 1 - 13 files changed, 13 deletions(-) diff --git a/src/simtools/schemas/model_parameters/asum_clipping.schema.yml b/src/simtools/schemas/model_parameters/asum_clipping.schema.yml index 4fbcd3746e..c34294335d 100644 --- a/src/simtools/schemas/model_parameters/asum_clipping.schema.yml +++ b/src/simtools/schemas/model_parameters/asum_clipping.schema.yml @@ -24,7 +24,6 @@ instrument: - LSTS - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml b/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml index 1ff03a1be1..9ba72cb26b 100644 --- a/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml @@ -24,7 +24,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml b/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml index 45c769df28..25f252948e 100644 --- a/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml @@ -24,7 +24,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_offset.schema.yml b/src/simtools/schemas/model_parameters/dsum_offset.schema.yml index deb91b4f51..f3bdae9caa 100644 --- a/src/simtools/schemas/model_parameters/dsum_offset.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_offset.schema.yml @@ -23,7 +23,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml b/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml index 7942b5be1e..0025779348 100644 --- a/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml @@ -20,7 +20,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml b/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml index 3af1912a7e..dfed2f2332 100644 --- a/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml @@ -25,7 +25,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml b/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml index 29b278cc6b..6b6fccd25e 100644 --- a/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml @@ -30,7 +30,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml b/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml index f466f5e9b7..f994bca44a 100644 --- a/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml @@ -24,7 +24,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml b/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml index 697e92b478..60cdd5bb16 100644 --- a/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml @@ -31,7 +31,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml b/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml index 3300db113e..eff815f48f 100644 --- a/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml @@ -30,7 +30,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml b/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml index a62c001c82..2b2f80b949 100644 --- a/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml @@ -18,7 +18,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml b/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml index 6bbba24ab8..a6c70d3cec 100644 --- a/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml @@ -28,7 +28,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: diff --git a/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml b/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml index 81923cb713..83e87a71b4 100644 --- a/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml @@ -28,7 +28,6 @@ instrument: type: - MSTN - MSTS - - SSTS - SCTS activity: setting: From 34f76c2306b68c01b4054b0f48dfe155ee7543b3 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Mon, 27 Jan 2025 14:56:48 +0100 Subject: [PATCH 3/9] SST fixes --- .../CTA-South-SSTS-01-5.0.0_test.cfg | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg index c04d11b7bd..1718d78298 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg @@ -12,7 +12,7 @@ adjust_gain = 1.0 altitude = 2147.0 -asum_clipping = 0.0 +asum_clipping = 9999 asum_offset = 0.0 asum_shaping_file = none asum_threshold = 0.0 @@ -48,18 +48,18 @@ discriminator_var_gate_length = 0.0 discriminator_var_sigsum_over_threshold = 0.0 discriminator_var_threshold = 0.25 discriminator_var_time_over_threshold = 0.0 -dsum_clipping = 85 +dsum_clipping = 0 dsum_ignore_below = 0 dsum_offset = 0.0 -dsum_pedsub = 0 +dsum_pedsub = 1 dsum_pre_clipping = 0 -dsum_prescale = 40 256 -dsum_presum_max = 127 -dsum_presum_shift = 1 +dsum_prescale = all: 0 +dsum_presum_max = 0 +dsum_presum_shift = 0 dsum_shaping_file = none dsum_shaping_renormalize = 0 dsum_threshold = 0.0 -dsum_zero_clip = 1 +dsum_zero_clip = 0 effective_focal_length = 215.191 0.0 0.0 0.0 0.0 fadc_ac_coupled = 0 fadc_amplitude = 2.77 @@ -97,8 +97,8 @@ focal_surface_ref_radius = 1.0 focus_offset = 0.0 0.0 0.0 0.0 gain_variation = 0.05 mirror2_degraded_reflection = 1.0 -mirror_align_random_horizontal = 0.0 31.0 0.0135 0.012 -mirror_align_random_vertical = 0.0 31.0 0.0135 0.012 +mirror_align_random_horizontal = 0.0 0.0 0.0 0.0 +mirror_align_random_vertical = 0.0 0.0 0.0 0.0 mirror_class = 2 mirror_degraded_reflection = 1.0 mirror_list = none @@ -142,8 +142,8 @@ telescope_transmission = 0.92362 1.0 0.03668 1.7454 0.858 0.0 teltrig_min_sigsum = 0.0 teltrig_min_time = 0.5 transit_time_calib_error = 0.0 -transit_time_compensate_error = 0.2 -transit_time_compensate_step = 1.0 +transit_time_compensate_error = 0. +transit_time_compensate_step = 0. transit_time_error = 0.1 transit_time_jitter = 0.01 trigger_current_limit = 20.0 From 5a5ce317c56b9db3ef8d6066b12833f4636c43a0 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Mon, 27 Jan 2025 16:50:45 +0100 Subject: [PATCH 4/9] array window metaschema --- .../model_parameters/array_window.schema.yml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/simtools/schemas/model_parameters/array_window.schema.yml diff --git a/src/simtools/schemas/model_parameters/array_window.schema.yml b/src/simtools/schemas/model_parameters/array_window.schema.yml new file mode 100644 index 0000000000..1318824a83 --- /dev/null +++ b/src/simtools/schemas/model_parameters/array_window.schema.yml @@ -0,0 +1,37 @@ +%YAML 1.2 +--- +title: Schema for array_window model parameter +version: 0.1.0 +meta_schema: simpipe-schema +meta_schema_url: https://raw.githubusercontent.com/gammasim/simtools/main/src/simtools/schemas/model_parameter_and_data_schema.metaschema.yml +meta_schema_version: 0.1.0 +name: array_window +description: |- + Length of a coincidence window of the default stereo trigger, + after correction of fixed (cable length, focal length, etc.) + and variable (view direction) delays. +short_description: |- + Length of a coincidence window of the default stereo trigger. +data: + - type: double + unit: ns + default: 100. +instrument: + class: Camera + type: + - LSTN + - LSTS + - MSTN + - MSTS + - SSTS + - SCTS +activity: + setting: + - SetParameterFromExternal + validation: + - ValidateParameterByExpert + - ValidateTriggerPerformance +source: + - Observation execution +simulation_software: + - name: sim_telarray From f52a783c0d3cdefffb093c89ea6943b472d6b43f Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Tue, 28 Jan 2025 12:45:32 +0100 Subject: [PATCH 5/9] Corrections to reference models --- .../CTA-North-LSTN-01-5.0.0_test.cfg | 3 ++- .../CTA-North-LSTN-01-6.0.0_test.cfg | 1 + .../CTA-North-LSTN-02-5.0.0_test.cfg | 5 +++-- .../CTA-North-LSTN-02-6.0.0_test.cfg | 1 + .../CTA-North-LSTN-03-5.0.0_test.cfg | 5 +++-- .../CTA-North-LSTN-03-6.0.0_test.cfg | 1 + .../CTA-North-LSTN-04-5.0.0_test.cfg | 5 +++-- .../CTA-North-LSTN-04-6.0.0_test.cfg | 1 + .../CTA-North-MSTN-01-5.0.0_test.cfg | 5 +++-- .../CTA-North-MSTN-01-6.0.0_test.cfg | 1 + .../CTA-South-LSTS-01-5.0.0_test.cfg | 3 ++- .../CTA-South-LSTS-01-6.0.0_test.cfg | 1 + .../CTA-South-MSTS-01-5.0.0_test.cfg | 5 +++-- .../CTA-South-MSTS-01-6.0.0_test.cfg | 1 + .../CTA-South-SSTS-01-5.0.0_test.cfg | 9 +++++---- .../CTA-South-SSTS-01-6.0.0_test.cfg | 3 ++- 16 files changed, 33 insertions(+), 17 deletions(-) diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg index 36203d221c..59d3c22b22 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2158.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none @@ -94,7 +95,7 @@ mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.23801 +nightsky_background = all: 0.238006 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-6.0.0_test.cfg index 2f5d4ec29a..2866f46b8c 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-6.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2156.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg index eca5a0d43c..d5ab1b8e6a 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2158.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none @@ -94,7 +95,7 @@ mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.24499 +nightsky_background = all: 0.244985 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 @@ -106,7 +107,7 @@ pm_average_gain = 40000.0 pm_collection_efficiency = 1.0 pm_gain_index = 3.92 pm_photoelectron_spectrum = spe_LST_2020-05-09_AP2.0e-4.dat -pm_transit_time = 20.89 9 350 1135 +pm_transit_time = 20.89 9.0 350.0 1135.0 pm_voltage_variation = 0.03 qe_variation = 0.03 quantum_efficiency = qe_lst2-4_20200318_high+low.dat diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-6.0.0_test.cfg index 2be55beae9..bbcf6a03db 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-6.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2156.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg index 0d4fd36e3c..ae798dda40 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2158.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none @@ -94,7 +95,7 @@ mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.238006 +nightsky_background = all: 0.244985 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 @@ -106,7 +107,7 @@ pm_average_gain = 40000.0 pm_collection_efficiency = 1.0 pm_gain_index = 3.92 pm_photoelectron_spectrum = spe_LST_2020-05-09_AP2.0e-4.dat -pm_transit_time = 20.89 9 350 1135 +pm_transit_time = 20.89 9.0 350.0 1135.0 pm_voltage_variation = 0.03 qe_variation = 0.03 quantum_efficiency = qe_lst2-4_20200318_high+low.dat diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-6.0.0_test.cfg index a813caea12..32135153f0 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-6.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2156.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg index 942bc46ddd..af8dcf89c1 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2158.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none @@ -94,7 +95,7 @@ mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.24499 +nightsky_background = all: 0.244985 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 @@ -106,7 +107,7 @@ pm_average_gain = 40000.0 pm_collection_efficiency = 1.0 pm_gain_index = 3.92 pm_photoelectron_spectrum = spe_LST_2020-05-09_AP2.0e-4.dat -pm_transit_time = 20.89 9 350 1135 +pm_transit_time = 20.89 9.0 350.0 1135.0 pm_voltage_variation = 0.03 qe_variation = 0.03 quantum_efficiency = qe_lst2-4_20200318_high+low.dat diff --git a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-6.0.0_test.cfg index 7fdef1c87b..459b84c63b 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-6.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2156.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none diff --git a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg index 2cec2b4039..984173b4f3 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg @@ -12,6 +12,7 @@ adjust_gain = 1.0 altitude = 2158.0 +array_window = 1000.0 asum_clipping = 0.0 asum_offset = 0.0 asum_shaping_file = none @@ -107,7 +108,7 @@ mirror_offset = 0.0 mirror_reflection_random_angle = 0.006759 0.125 0.037 mirror_reflectivity = ref_AlSiO2HfO2.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.20771 +nightsky_background = all: 0.207706 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 @@ -126,7 +127,7 @@ quantum_efficiency = qe_R12992-100-05b.dat random_focal_length = 3.9 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 -telescope_transmission = 0.908661 0.0154576 4 1.21166 0 0 +telescope_transmission = 0.908661 0.0154576 4.0 1.21166 teltrig_min_sigsum = 0.0 teltrig_min_time = 1.0 transit_time_calib_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-6.0.0_test.cfg index 161c3b32ae..a87b837ec6 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-6.0.0_test.cfg @@ -12,6 +12,7 @@ adjust_gain = 1.0 altitude = 2156.0 +array_window = 1000.0 asum_clipping = 0.0 asum_offset = 0.0 asum_shaping_file = none diff --git a/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg index 071a92c2b6..11c3b8bc93 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2147.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none @@ -94,7 +95,7 @@ mirror_offset = 93.25 mirror_reflection_random_angle = 0.0075 0.125 0.037 mirror_reflectivity = ref_LST_2020-04-23.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.24499 +nightsky_background = all: 0.244985 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 2 diff --git a/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-6.0.0_test.cfg index 51a89bc8ca..d17df29ae8 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-6.0.0_test.cfg @@ -11,6 +11,7 @@ #endif altitude = 2147.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none diff --git a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg index 58ac86de31..06445e0161 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg @@ -12,6 +12,7 @@ adjust_gain = 1.0 altitude = 2147.0 +array_window = 1000.0 asum_clipping = 9999.0 asum_offset = 0.0 asum_shaping_file = none @@ -107,7 +108,7 @@ mirror_offset = 0.0 mirror_reflection_random_angle = 0.006759 0.125 0.037 mirror_reflectivity = ref_AlSiO2HfO2.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.20905 +nightsky_background = all: 0.209051 nsb_autoscale_airmass = 0.84 0.29 nsb_offaxis = 0.0 0.0 0.0 0.0 0.0 num_gains = 1 @@ -126,7 +127,7 @@ quantum_efficiency = qe_R12992-100-05b.dat random_focal_length = 3.9 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 -telescope_transmission = 0.908661 0.0154576 4 1.21166 0 0 +telescope_transmission = 0.908661 0.0154576 4.0 1.21166 teltrig_min_sigsum = 0.0 teltrig_min_time = 0.0 transit_time_calib_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-6.0.0_test.cfg index c06b51487e..530a9496ae 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-6.0.0_test.cfg @@ -12,6 +12,7 @@ adjust_gain = 1.0 altitude = 2147.0 +array_window = 1000.0 asum_clipping = 0.0 asum_offset = 0.0 asum_shaping_file = none diff --git a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg index bf9877ea7c..cbdb6ec992 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg @@ -12,6 +12,7 @@ adjust_gain = 1.0 altitude = 2147.0 +array_window = 1000.0 asum_clipping = 0.0 asum_offset = 0.0 asum_shaping_file = none @@ -107,7 +108,7 @@ mirror_reflection_random_angle = 0.0255 0.0 0.0 mirror_reflectivity = ref_astri-2d_2018-01-17.dat mirror_secondary_reflectivity = ref_astri-2d_2018-01-17.dat multiplicity_offset = -0.5 -nightsky_background = all: 0.03873 +nightsky_background = all: 0.0387262 nsb_autoscale_airmass = 0.83 0.2 nsb_gain_drop_scale = 0.0 nsb_offaxis = 1.0 0.04478 7.844 2.0282 0.0 @@ -142,11 +143,11 @@ telescope_transmission = 0.92362 1.0 0.03668 1.7454 0.858 0.0 teltrig_min_sigsum = 0.0 teltrig_min_time = 0.5 transit_time_calib_error = 0.0 -transit_time_compensate_error = 0. -transit_time_compensate_step = 0. +transit_time_compensate_error = 0.0 +transit_time_compensate_step = 0.0 transit_time_error = 0.1 transit_time_jitter = 0.01 -trigger_current_limit = 20.0 +trigger_current_limit = 2000.0 trigger_delay_compensation = 0.0 0.0 0.0 0.0 trigger_pixels = 2 iobuf_maximum = 1000000000 diff --git a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-6.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-6.0.0_test.cfg index b58061e91e..f202ad8f1d 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-6.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-6.0.0_test.cfg @@ -12,6 +12,7 @@ adjust_gain = 1.0 altitude = 2147.0 +array_window = 1000.0 asum_clipping = 0.0 asum_offset = 0.0 asum_shaping_file = none @@ -146,7 +147,7 @@ transit_time_compensate_error = 0.0 transit_time_compensate_step = 0.0 transit_time_error = 0.3 transit_time_jitter = 0.1 -trigger_current_limit = 20.0 +trigger_current_limit = 2000.0 trigger_delay_compensation = 0.0 0.0 0.0 0.0 trigger_pixels = 2 iobuf_maximum = 1000000000 From 193c1e33a6ec0f4eca3b71d928b79015fdd24f81 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Tue, 28 Jan 2025 13:23:05 +0100 Subject: [PATCH 6/9] minor source fix --- src/simtools/schemas/model_parameters/array_window.schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simtools/schemas/model_parameters/array_window.schema.yml b/src/simtools/schemas/model_parameters/array_window.schema.yml index 1318824a83..c6918ecabf 100644 --- a/src/simtools/schemas/model_parameters/array_window.schema.yml +++ b/src/simtools/schemas/model_parameters/array_window.schema.yml @@ -32,6 +32,6 @@ activity: - ValidateParameterByExpert - ValidateTriggerPerformance source: - - Observation execution + - Initial instrument setup simulation_software: - name: sim_telarray From 9bf50b21c75fa8a3a60ba66f6d353e23683b01c2 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Tue, 28 Jan 2025 13:40:16 +0100 Subject: [PATCH 7/9] Simplifications of get simulation software from parameter name --- .../upload_from_model_repository_to_db.sh | 2 +- src/simtools/model/model_parameter.py | 11 ++--------- src/simtools/simtel/simtel_config_writer.py | 5 +---- src/simtools/utils/names.py | 12 +----------- tests/resources/model_parameters/mirror_list.json | 1 + tests/unit_tests/utils/test_names.py | 13 ------------- 6 files changed, 6 insertions(+), 38 deletions(-) diff --git a/database_scripts/upload_from_model_repository_to_db.sh b/database_scripts/upload_from_model_repository_to_db.sh index 2a82112d26..85d2bfd668 100755 --- a/database_scripts/upload_from_model_repository_to_db.sh +++ b/database_scripts/upload_from_model_repository_to_db.sh @@ -6,7 +6,7 @@ # shellcheck disable=SC1091 DB_SIMULATION_MODEL_URL="https://gitlab.cta-observatory.org/cta-science/simulations/simulation-model/simulation-models.git" -DB_SIMULATION_MODEL_BRANCH="v1.0.0-parameters" +DB_SIMULATION_MODEL_BRANCH="prod5-prod6-corrections" # Check that this script is not sourced but executed if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then diff --git a/src/simtools/model/model_parameter.py b/src/simtools/model/model_parameter.py index adc5a9b370..248a984af2 100644 --- a/src/simtools/model/model_parameter.py +++ b/src/simtools/model/model_parameter.py @@ -344,7 +344,7 @@ def extra_label(self): """Return the extra label if defined, if not return ''.""" return self._extra_label if self._extra_label is not None else "" - def get_simtel_parameters(self, parameters=None, telescope_model=True, site_model=True): + def get_simtel_parameters(self, parameters=None): """ Get simtel parameters as name and value pairs. @@ -352,10 +352,6 @@ def get_simtel_parameters(self, parameters=None, telescope_model=True, site_mode ---------- parameters: dict Parameters (simtools) to be renamed (if necessary) - telescope_model: bool - If True, telescope model parameters are included. - site_model: bool - If True, site model parameters are included. Returns ------- @@ -369,10 +365,7 @@ def get_simtel_parameters(self, parameters=None, telescope_model=True, site_mode _simtel_parameter_value = {} for key in parameters: _par_name = names.get_simulation_software_name_from_parameter_name( - key, - simulation_software="sim_telarray", - search_telescope_parameters=telescope_model, - search_site_parameters=site_model, + key, simulation_software="sim_telarray" ) if _par_name is not None: _simtel_parameter_value[_par_name] = parameters[key].get("value") diff --git a/src/simtools/simtel/simtel_config_writer.py b/src/simtools/simtel/simtel_config_writer.py index 4c144192ff..1fee7d48d3 100644 --- a/src/simtools/simtel/simtel_config_writer.py +++ b/src/simtools/simtel/simtel_config_writer.py @@ -294,10 +294,7 @@ def _write_site_parameters(self, file, site_model, model_path, telescope_model): _site_parameters = site_model.get_simtel_parameters() for par, value in _site_parameters.items(): _simtel_name = names.get_simulation_software_name_from_parameter_name( - par, - simulation_software="sim_telarray", - search_telescope_parameters=False, - search_site_parameters=True, + par, simulation_software="sim_telarray" ) _simtel_name, value = self._convert_model_parameters_to_simtel_format( _simtel_name, value, model_path, telescope_model diff --git a/src/simtools/utils/names.py b/src/simtools/utils/names.py index 43415e0290..e4ee803caa 100644 --- a/src/simtools/utils/names.py +++ b/src/simtools/utils/names.py @@ -335,8 +335,6 @@ def get_collection_name_from_array_element_name(name, array_elements_only=True): def get_simulation_software_name_from_parameter_name( par_name, simulation_software="sim_telarray", - search_telescope_parameters=True, - search_site_parameters=True, ): """ Get the name used in the simulation software from the model parameter name. @@ -350,21 +348,13 @@ def get_simulation_software_name_from_parameter_name( Model parameter name. simulation_software: str Simulation software name. - search_telescope_parameters: bool - If True, telescope model parameters are included. - search_site_parameters: bool - If True, site model parameters are included. Returns ------- str Simtel parameter name. """ - _parameter_names = {} - if search_telescope_parameters: - _parameter_names.update(telescope_parameters()) - if search_site_parameters: - _parameter_names.update(site_parameters()) + _parameter_names = {**telescope_parameters(), **site_parameters()} try: _parameter = _parameter_names[par_name] diff --git a/tests/resources/model_parameters/mirror_list.json b/tests/resources/model_parameters/mirror_list.json index 172113ce62..7371c99c62 100644 --- a/tests/resources/model_parameters/mirror_list.json +++ b/tests/resources/model_parameters/mirror_list.json @@ -1,5 +1,6 @@ { "schema_version": "0.2.0", + "parameter": "mirror_list", "instrument": "LSTN-01", "site": "North", "parameter_version": "2.0.0", diff --git a/tests/unit_tests/utils/test_names.py b/tests/unit_tests/utils/test_names.py index c8de8bbc9b..dcf42c8a10 100644 --- a/tests/unit_tests/utils/test_names.py +++ b/tests/unit_tests/utils/test_names.py @@ -500,19 +500,6 @@ def test_get_simulation_software_name_from_parameter_name(): == "reference_point_longitude" ) - with pytest.raises(KeyError): - names.get_simulation_software_name_from_parameter_name( - "corsika_observation_level", - simulation_software="sim_telarray", - search_site_parameters=False, - ) - with pytest.raises(KeyError): - names.get_simulation_software_name_from_parameter_name( - "telescope_axis_height", - simulation_software="sim_telarray", - search_telescope_parameters=False, - ) - def test_get_parameter_name_from_simtel_name(): assert names.get_parameter_name_from_simtel_name("focal_length") == "focal_length" From 5ceedf5c104c7a74c6b6e06ed963024cf8df5245 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Tue, 28 Jan 2025 16:22:24 +0100 Subject: [PATCH 8/9] digital sum for MSTs only --- src/simtools/schemas/model_parameters/array_window.schema.yml | 2 +- src/simtools/schemas/model_parameters/asum_clipping.schema.yml | 3 --- src/simtools/schemas/model_parameters/dsum_clipping.schema.yml | 1 - .../schemas/model_parameters/dsum_ignore_below.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_offset.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml | 1 - .../schemas/model_parameters/dsum_pre_clipping.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_prescale.schema.yml | 1 - .../schemas/model_parameters/dsum_presum_max.schema.yml | 1 - .../schemas/model_parameters/dsum_presum_shift.schema.yml | 1 - src/simtools/schemas/model_parameters/dsum_shaping.schema.yml | 1 - .../model_parameters/dsum_shaping_renormalize.schema.yml | 1 - .../schemas/model_parameters/dsum_threshold.schema.yml | 1 - .../schemas/model_parameters/dsum_zero_clip.schema.yml | 1 - 14 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/simtools/schemas/model_parameters/array_window.schema.yml b/src/simtools/schemas/model_parameters/array_window.schema.yml index c6918ecabf..f6bb8a0544 100644 --- a/src/simtools/schemas/model_parameters/array_window.schema.yml +++ b/src/simtools/schemas/model_parameters/array_window.schema.yml @@ -15,7 +15,7 @@ short_description: |- data: - type: double unit: ns - default: 100. + default: 1000. instrument: class: Camera type: diff --git a/src/simtools/schemas/model_parameters/asum_clipping.schema.yml b/src/simtools/schemas/model_parameters/asum_clipping.schema.yml index c34294335d..1024977c14 100644 --- a/src/simtools/schemas/model_parameters/asum_clipping.schema.yml +++ b/src/simtools/schemas/model_parameters/asum_clipping.schema.yml @@ -22,9 +22,6 @@ instrument: type: - LSTN - LSTS - - MSTN - - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml b/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml index 9ba72cb26b..cb4dc9dbcf 100644 --- a/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_clipping.schema.yml @@ -24,7 +24,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml b/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml index 25f252948e..03ae179b94 100644 --- a/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml @@ -24,7 +24,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_offset.schema.yml b/src/simtools/schemas/model_parameters/dsum_offset.schema.yml index f3bdae9caa..993dcc12d4 100644 --- a/src/simtools/schemas/model_parameters/dsum_offset.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_offset.schema.yml @@ -23,7 +23,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml b/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml index 0025779348..e507802ee6 100644 --- a/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml @@ -20,7 +20,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml b/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml index dfed2f2332..02fc297218 100644 --- a/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml @@ -25,7 +25,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml b/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml index 6b6fccd25e..b5a044b193 100644 --- a/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_prescale.schema.yml @@ -30,7 +30,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml b/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml index f994bca44a..db7cc380d8 100644 --- a/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml @@ -24,7 +24,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml b/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml index 60cdd5bb16..d374f37930 100644 --- a/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml @@ -31,7 +31,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml b/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml index eff815f48f..1c32c62382 100644 --- a/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_shaping.schema.yml @@ -30,7 +30,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml b/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml index 2b2f80b949..74047fd93e 100644 --- a/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml @@ -18,7 +18,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml b/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml index a6c70d3cec..af45603e50 100644 --- a/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_threshold.schema.yml @@ -28,7 +28,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal diff --git a/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml b/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml index 83e87a71b4..9ae6c26af4 100644 --- a/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml +++ b/src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml @@ -28,7 +28,6 @@ instrument: type: - MSTN - MSTS - - SCTS activity: setting: - SetParameterFromExternal From 102717b88511abae502c1056053e3847e91b7dee Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Wed, 29 Jan 2025 09:29:50 +0100 Subject: [PATCH 9/9] prod5 telescope transmission --- .../CTA-North-MSTN-01-5.0.0_test.cfg | 2 +- .../CTA-South-MSTS-01-5.0.0_test.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg index 984173b4f3..7dc9a39484 100644 --- a/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg @@ -127,7 +127,7 @@ quantum_efficiency = qe_R12992-100-05b.dat random_focal_length = 3.9 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 -telescope_transmission = 0.908661 0.0154576 4.0 1.21166 +telescope_transmission = 0.908661 0.0 0.0 0.0 0.0 0.0 teltrig_min_sigsum = 0.0 teltrig_min_time = 1.0 transit_time_calib_error = 0.0 diff --git a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg index 06445e0161..28d091a74a 100644 --- a/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg +++ b/tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg @@ -127,7 +127,7 @@ quantum_efficiency = qe_R12992-100-05b.dat random_focal_length = 3.9 0.0 telescope_random_angle = 0.0 telescope_random_error = 0.0 -telescope_transmission = 0.908661 0.0154576 4.0 1.21166 +telescope_transmission = 0.908661 0.0 0.0 0.0 0.0 0.0 teltrig_min_sigsum = 0.0 teltrig_min_time = 0.0 transit_time_calib_error = 0.0