Skip to content
Snippets Groups Projects
Commit 09773aef authored by Tamas Gal's avatar Tamas Gal :speech_balloon:
Browse files

Fix time parsing in snapshot and triggered hits

parent a9aa5afb
No related branches found
No related tags found
No related merge requests found
......@@ -121,15 +121,15 @@ class DAQReader:
cntvers=True))
snapshot_hits = tree["snapshotHits"].array(
uproot.asjagged(uproot.astable(
uproot.asdtype([("dom_id", "i4"), ("channel_id", "u1"),
("time", "u4"), ("tot", "u1")])),
uproot.asdtype([("dom_id", ">i4"), ("channel_id", "u1"),
("time", "<u4"), ("tot", "u1")])),
skipbytes=10))
triggered_hits = tree["triggeredHits"].array(
uproot.asjagged(uproot.astable(
uproot.asdtype([("dom_id", "i4"), ("channel_id", "u1"),
("time", "u4"), ("tot", "u1"),
uproot.asdtype([("dom_id", ">i4"), ("channel_id", "u1"),
("time", "<u4"), ("tot", "u1"),
(" cnt", "u4"), (" vers", "u2"),
("trigger_mask", "u8")])),
("trigger_mask", ">u8")])),
skipbytes=10))
self._events = DAQEvents(headers, snapshot_hits, triggered_hits)
return self._events
......
......@@ -64,7 +64,7 @@ class TestDAQEventsSnapshotHits(unittest.TestCase):
self.assertListEqual([806451572, 806451572, 806455814],
list(hits.dom_id[0][:3]))
self.assertListEqual([10, 13, 0], list(hits.channel_id[0][:3]))
self.assertListEqual([1593234433, 1559680001, 3371422721],
self.assertListEqual([30733918, 30733916, 30733256],
list(hits.time[0][:3]))
def test_channel_ids_have_valid_values(self):
......@@ -104,7 +104,7 @@ class TestDAQEventsTriggeredHits(unittest.TestCase):
self.assertListEqual([806451572, 806451572, 808432835],
list(hits.dom_id[0][:3]))
self.assertListEqual([10, 13, 1], list(hits.channel_id[0][:3]))
self.assertListEqual([1593234433, 1559680001, 1978979329],
self.assertListEqual([30733918, 30733916, 30733429],
list(hits.time[0][:3]))
self.assertListEqual([16, 16, 4], list(hits.trigger_mask[0][:3]))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment