Skip to content

Commit

Permalink
Merge pull request #202 from cta-observatory/fix_tels_with_trigger
Browse files Browse the repository at this point in the history
Always fill tels_with_trigger
  • Loading branch information
maxnoe authored Nov 14, 2023
2 parents 8f5cffd + 54876b1 commit 17dd75b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
10 changes: 6 additions & 4 deletions src/ctapipe_io_lst/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -630,9 +630,7 @@ def _generator(self):
else:
self.fill_r0r1_container(array_event, zfits_event)
self.fill_lst_event_container(array_event, zfits_event)

if self.trigger_information:
self.fill_trigger_info(array_event)
self.fill_trigger_info(array_event)

self.fill_mon_container(array_event, zfits_event)

Expand Down Expand Up @@ -878,8 +876,12 @@ def fill_trigger_info(self, array_event):
tel_id = self.tel_id

trigger = array_event.trigger
trigger.time = self.time_calculator(tel_id, array_event)
trigger.tels_with_trigger = [tel_id]

if not self.trigger_information:
return

trigger.time = self.time_calculator(tel_id, array_event)
trigger.tel[tel_id].time = trigger.time

lst = array_event.lst.tel[tel_id]
Expand Down
5 changes: 4 additions & 1 deletion src/ctapipe_io_lst/tests/test_calib.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pytest
import pickle
from ctapipe_io_lst.constants import HIGH_GAIN
import os
Expand Down Expand Up @@ -136,12 +137,14 @@ def test_source_with_calibration():
assert event.r1.tel[1].waveform is not None


def test_source_with_all():
@pytest.mark.parametrize("trigger_information", [True, False])
def test_source_with_all(trigger_information):
from ctapipe_io_lst import LSTEventSource

config = Config({
'LSTEventSource': {
'pointing_information': False,
'trigger_information': trigger_information,
'LSTR0Corrections': {
'drs4_pedestal_path': test_drs4_pedestal_path,
'drs4_time_calibration_path': test_time_calib_path,
Expand Down

0 comments on commit 17dd75b

Please sign in to comment.