diff --git a/environment.yml b/environment.yml index 8b49d57164..0d6eeb46f0 100644 --- a/environment.yml +++ b/environment.yml @@ -31,7 +31,6 @@ dependencies: - seaborn - jinja2=3.0 # pinned for bokeh 1.0 compatibility - pip: - - - ctapipe_io_lst~=0.18.1 + - ctapipe_io_lst~=0.18.2 - ctaplot~=0.6.2 - pyirf~=0.6.0 diff --git a/lstchain/conftest.py b/lstchain/conftest.py index e3e77e5815..a4e54d2306 100644 --- a/lstchain/conftest.py +++ b/lstchain/conftest.py @@ -135,6 +135,7 @@ def observed_dl1_files(temp_dir_observed_files, run_summary_path): "2516351600", "--dragon-module-id", "132", + "--default-trigger-type=tib", ) run_program( @@ -163,6 +164,7 @@ def observed_dl1_files(temp_dir_observed_files, run_summary_path): test_drive_report, '--run-summary-path', run_summary_path, + "--default-trigger-type=tib", ) run_program( diff --git a/lstchain/image/tests/test_modifier.py b/lstchain/image/tests/test_modifier.py index 6b95f986b1..a5ef384277 100644 --- a/lstchain/image/tests/test_modifier.py +++ b/lstchain/image/tests/test_modifier.py @@ -60,7 +60,7 @@ def test_calculate_noise_parameters(mc_gamma_testfile, observed_dl1_files): observed_dl1_files["dl1_file1"] ) assert extra_noise_in_dim_pixels == 0.0 - assert np.isclose(extra_bias_in_dim_pixels, 11.3, atol=0.1) + assert np.isclose(extra_bias_in_dim_pixels, 11.02, atol=0.1) assert extra_noise_in_bright_pixels == 0.0 diff --git a/lstchain/scripts/lstchain_data_r0_to_dl1.py b/lstchain/scripts/lstchain_data_r0_to_dl1.py index 9f49b20293..179b4a319b 100644 --- a/lstchain/scripts/lstchain_data_r0_to_dl1.py +++ b/lstchain/scripts/lstchain_data_r0_to_dl1.py @@ -143,6 +143,11 @@ ) ) +parser.add_argument( + '--default-trigger-type', + help='Alias for LSTEventSource.default_trigger_type, can be set to "tib" for runs with UCTS problems.', +) + def main(): args = parser.parse_args() @@ -201,6 +206,9 @@ def main(): if args.pedestal_ids_path is not None: lst_event_source['pedestal_ids_path'] = args.pedestal_ids_path + if args.default_trigger_type is not None: + lst_event_source["default_trigger_type"] = args.default_trigger_type + lst_r0_corrections = lst_event_source['LSTR0Corrections'] if args.pedestal_file is not None: lst_r0_corrections['drs4_pedestal_path'] = args.pedestal_file diff --git a/lstchain/scripts/tests/test_lstchain_scripts.py b/lstchain/scripts/tests/test_lstchain_scripts.py index 89944e8c8f..d963fc3f76 100644 --- a/lstchain/scripts/tests/test_lstchain_scripts.py +++ b/lstchain/scripts/tests/test_lstchain_scripts.py @@ -166,7 +166,7 @@ def test_validity_tune_nsb(tune_nsb): if "extra_noise_in_dim_pixels" in line: assert line == ' "extra_noise_in_dim_pixels": 0.0,' if "extra_bias_in_dim_pixels" in line: - assert line == ' "extra_bias_in_dim_pixels": 11.304,' + assert line == ' "extra_bias_in_dim_pixels": 11.019,' if "transition_charge" in line: assert line == ' "transition_charge": 8,' if "extra_noise_in_bright_pixels" in line: diff --git a/setup.py b/setup.py index aa7c8ec837..e335713438 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def find_scripts(script_dir, prefix): 'astropy~=4.2', 'bokeh~=1.0', 'ctapipe~=0.12.0', - 'ctapipe_io_lst~=0.18.1', + 'ctapipe_io_lst~=0.18.2', 'ctaplot~=0.6.2', 'eventio>=1.5.1,<2.0.0a0', # at least 1.1.1, but not 2 'gammapy~=0.19.0',