Skip to content
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.

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

Require atleast ctapipe_io_lst 0.18.2 #1003

Merged
merged 2 commits into from
Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions lstchain/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion lstchain/image/tests/test_modifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
8 changes: 8 additions & 0 deletions lstchain/scripts/lstchain_data_r0_to_dl1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lstchain/scripts/tests/test_lstchain_scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down