Skip to content

Reference model corrections #1326

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
GernotMaier wants to merge 6 commits into from
Closed

Reference model corrections #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fdd30e
Reference model corrections
GernotMaier Jan 26, 2025
21e4d5e
Merge branch 'main' into reference-models-corrections
GernotMaier Jan 27, 2025
9e3e082
remove SSTS from dsum and asum_clippling schemas
GernotMaier Jan 27, 2025
34f76c2
SST fixes
GernotMaier Jan 27, 2025
5a5ce31
array window metaschema
GernotMaier Jan 27, 2025
7d73939
Merge branch 'main' into reference-models-corrections
GernotMaier Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions src/simtools/schemas/model_parameters/array_window.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/asum_clipping.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ instrument:
- LSTS
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_clipping.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_ignore_below.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_offset.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_pedsub.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_pre_clipping.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_prescale.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_presum_max.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_presum_shift.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_shaping.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_shaping_renormalize.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_threshold.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
1 change: 0 additions & 1 deletion src/simtools/schemas/model_parameters/dsum_zero_clip.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ instrument:
type:
- MSTN
- MSTS
- SSTS
- SCTS
activity:
setting:
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/sim_telarray_configurations/CTA-North-LSTN-01-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions tests/resources/sim_telarray_configurations/CTA-North-LSTN-02-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tests/resources/sim_telarray_configurations/CTA-North-LSTN-03-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions tests/resources/sim_telarray_configurations/CTA-North-LSTN-04-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/resources/sim_telarray_configurations/CTA-North-MSTN-01-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/sim_telarray_configurations/CTA-South-LSTS-01-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/resources/sim_telarray_configurations/CTA-South-MSTS-01-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
28 changes: 14 additions & 14 deletions tests/resources/sim_telarray_configurations/CTA-South-SSTS-01-5.0.0_test.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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_shaping_file = CTA-ULTRA6-dsum-shaping-FlashCam-2a-int.dat
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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -142,11 +142,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.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 = 2000.0
trigger_current_limit = 20.0
trigger_delay_compensation = 0.0 0.0 0.0 0.0
trigger_pixels = 2
iobuf_maximum = 1000000000
Expand Down