Merge pull request #276 from cta-observatory/implement_aux_traces

Add support for types 2029 and 2030

src/eventio/base.py

@@ -3,6 +3,7 @@
 import logging
 import subprocess as sp
 import zstandard as zstd
+from typing import Any
 
 from .file_types import is_gzip, is_eventio, is_zstd
 from .header import parse_header_bytes, get_bits_from_word
@@ -338,7 +339,7 @@ def __repr__(self):
     def __str__(self):
         return '{}[{}]'.format(self.__class__.__name__, self.header.type)
 
-    def parse(self):
+    def parse(self) -> Any:
         if self.only_subobjects:
             raise ValueError('This object only contains subobjects')
 

src/eventio/iact/objects.py

@@ -92,7 +92,7 @@ def parse(self):
             dtype=dtype,
             count=self.n_telescopes * dtype.itemsize,
         )
-        tel_pos = np.core.records.fromarrays(
+        tel_pos = np.rec.fromarrays(
             block.reshape(4, self.n_telescopes),
             names=['x', 'y', 'z', 'r'],
         )
@@ -148,7 +148,7 @@ def parse(self):
         # the columns are stored one after another
         offsets = read_array(self, count=n_columns * n_arrays, dtype=np.float32)
         offsets = offsets.reshape((n_columns, n_arrays))
-        offsets = np.core.records.fromarrays(offsets, names=columns)
+        offsets = np.rec.fromarrays(offsets, names=columns)
 
         return time_offset, offsets
 

src/eventio/simtel/objects.py

@@ -11,6 +11,7 @@
     read_float,
     read_string,
     read_from,
+    read_unsigned_int,
     read_unsigned_short,
     read_var_string,
     read_varint,
@@ -1789,10 +1790,29 @@ def __str__(self):
 class AuxiliaryDigitalTraces(EventIOObject):
     eventio_type = 2029
 
+    def parse(self):
+        data = {}
+        data["tel_id"] = read_int(self)
+        data["time_scale"] = read_float(self)
+        n_traces = read_unsigned_varint(self)
+        n_samples = read_unsigned_varint(self)
+        array_data = self.read()
+        data["trace_data"], _ = unsigned_varint_arrays_differential(array_data, n_traces, n_samples)
+        return data
+
 
 class AuxiliaryAnalogTraces(EventIOObject):
     eventio_type = 2030
 
+    def parse(self):
+        data = {}
+        data["tel_id"] = read_int(self)
+        data["time_scale"] = read_float(self)
+        n_traces = read_unsigned_varint(self)
+        n_samples = read_unsigned_varint(self)
+        data["trace_data"] = read_array(self, np.float32, n_traces * n_samples).reshape(n_traces, n_samples)
+        return data
+
 
 class FSPhot(EventIOObject):
     '''No idea what this should be, it's only defined in io_hess.h, no

src/eventio/simtel/simtelfile.py

@@ -16,6 +16,8 @@
     ADCSamples,
     ADCSums,
     ArrayEvent,
+    AuxiliaryAnalogTraces,
+    AuxiliaryDigitalTraces,
     CalibrationEvent,
     CameraMonitoring,
     CameraOrganization,
@@ -494,5 +496,9 @@ def parse_telescope_event(telescope_event):
 
         elif isinstance(o, PixelTriggerTimes):
             event['pixel_trigger_times'] = o.parse()
+        elif isinstance(o, (AuxiliaryAnalogTraces, AuxiliaryDigitalTraces)):
+            if "aux_traces" not in event:
+                event["aux_traces"] = {}
+            event["aux_traces"][o.header.id] = o.parse()
 
     return event

tests/simtel/test_simtel_objects.py

@@ -8,7 +8,7 @@
     yield_n_subobjects,
     yield_subobjects,
 )
-from eventio.simtel.objects import ImageParameters, LaserCalibration, PixelList, PixelTiming, TriggerInformation
+from eventio.simtel.objects import AuxiliaryAnalogTraces, AuxiliaryDigitalTraces, ImageParameters, LaserCalibration, PixelList, PixelTiming, TriggerInformation
 
 prod2_file = 'tests/resources/gamma_test.simtel.gz'
 camorgan_v2_file = 'tests/resources/test_camorganv2.simtel.gz'
@@ -749,14 +749,23 @@ def test_2028():
         assert n_events > 0
 
 
-@pytest.mark.xfail
 def test_2029():
-    assert False
+    with EventIOFile("./tests/resources/aux_traces_2029.simtel.zst") as f:
+        o = next(yield_subobjects(f, AuxiliaryDigitalTraces))
+        assert o.header.type == 2029
+        data = o.parse()
+        assert data["tel_id"] == 1
+        assert data["trace_data"].shape == (588, 48)
 
 
-@pytest.mark.xfail
 def test_2030():
-    assert False
+    with EventIOFile("./tests/resources/aux_traces_2030.simtel.zst") as f:
+        o = next(yield_subobjects(f, AuxiliaryAnalogTraces))
+        assert o.header.type == 2030
+        data = o.parse()
+        assert data["tel_id"] == 1
+        assert data["trace_data"].dtype == np.float32
+        assert data["trace_data"].shape == (1855, 300)
 
 
 @pytest.mark.xfail

tests/simtel/test_simtelfile.py

@@ -275,3 +275,17 @@ def test_type_2033():
                     'flags', 'n_pixels', 'n_gains', 'nsb_rate', 'qe_rel', 'gain_rel',
                     'hv_rel', 'current', 'fadc_amp_hg', 'disabled',
                 }
+
+
+def test_type_2029():
+    with SimTelFile("./tests/resources/aux_traces_2029.simtel.zst") as f:
+        e = next(iter(f))
+        assert "aux_traces" in e["telescope_events"][1]
+        assert e["telescope_events"][1]["aux_traces"].keys() == {1}
+
+
+def test_type_2030():
+    with SimTelFile("./tests/resources/aux_traces_2030.simtel.zst") as f:
+        e = next(iter(f))
+        assert "aux_traces" in e["telescope_events"][1]
+        assert e["telescope_events"][1]["aux_traces"].keys() == {1, 2}