Merge pull request #75 from vmarandon/MiscImprovements

Misc improvements

Author: jlenain

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
     rev: 6.0.0
     hooks:
       - id: flake8
-        args: [--max-line-length=88, "--extend-ignore=E203,E712"]
+        args: [--max-line-length=88, "--extend-ignore=E203,E712,E731"]
         exclude: ^src/nectarchain/user_scripts/
   - repo: https://github.com/mwouts/jupytext
     rev: v1.14.6

src/ctapipe_io_nectarcam/__init__.py

@@ -496,6 +496,32 @@ def _correct_tel_id(self, tel_id, run):
             cor_tel_id = tel_id
         return cor_tel_id
 
+    def _estimate_if_trig_pat_missing(self, pre_v6_data, evb_version):
+        # Runs before EVB v6.12 does not have the trigger part
+        # of the pixel status bit pattern filled.
+        # The information is in the debug field trigger_pattern
+        # which comes from the feb.
+        # This function tries to estimate if there is the need to fill
+        # the relevant bit of the pixel_status
+
+        # Assume that tpat is in the pixel_status per default
+        tpat_missing = False
+
+        if pre_v6_data:
+            tpat_missing = True
+        else:
+            # idaq_version examples : 'v6.9.2-rc2' or 'v6.12.1'
+            # starting from v6.12, we have the trigger pattern info in pixel_status
+            if evb_version.startswith("v6"):
+                split_version = re.split(r"\.|-", evb_version)
+                try:
+                    minor_version = int(split_version[1])
+                    if minor_version < 12:
+                        tpat_missing = True
+                except (IndexError, ValueError):
+                    pass
+        return tpat_missing
+
     def __init__(self, **kwargs):
         """
         Constructor of the NectarCAMEventSource class.
@@ -569,6 +595,10 @@ def __init__(self, **kwargs):
             self.tel_id, self.multi_file.camera_datastream, self._pre_v6_data
         )
 
+        self._missing_trig_pat = self._estimate_if_trig_pat_missing(
+            self._pre_v6_data, self.nectarcam_service.idaq_version
+        )
+
         target_info = {}
 
         # VIM : Put some pointing info to be filled as a reminder that it should be done
@@ -965,7 +995,9 @@ def fill_nectarcam_event_container_from_zfile(self, array_event, event):
 
         if not self.pre_v6_data:
             event_container.first_cell_id = np.full(
-                (N_PIXELS,), np.nan, dtype=event.first_cell_id.dtype
+                (N_PIXELS,),
+                np.iinfo(event.first_cell_id.dtype).max,
+                dtype=event.first_cell_id.dtype,
             )
             event_container.first_cell_id[
                 self.nectarcam_service.pixel_ids
@@ -975,6 +1007,18 @@ def fill_nectarcam_event_container_from_zfile(self, array_event, event):
         if self.load_feb_info:
             self.unpack_feb_data(event_container, event, nectarcam_data)
 
+        # Fill information of the trigger mask in the pixel_status if needed
+        # Note that FEB data must have been loaded
+        if self._missing_trig_pat:
+            tpat = np.any(event_container.trigger_pattern, axis=0)
+
+            event_container.pixel_status = (
+                event_container.pixel_status & 0x1F
+            )  # Reset the trigger part
+            event_container.pixel_status[tpat] = (
+                event_container.pixel_status[tpat] | PixelStatus.PIXEL_TRIGGER_1
+            )
+
     def fill_trigger_info(self, array_event):
         tel_id = self.tel_id
 
@@ -1095,9 +1139,7 @@ def unpack_feb_data(self, event_container, event, nectarcam_data):
             3::n_fields
         ]
         # Unpack TS2 counters
-        ts2_decimal = (
-            lambda bits: bits - (1 << 8) if bits & 0x80 != 0 else bits
-        )  # noqa: E731
+        ts2_decimal = lambda bits: (bits - (1 << 8) if bits & 0x80 != 0 else bits)
         ts2_decimal_vec = np.vectorize(ts2_decimal)
         event_container.feb_ts2_trig[
             self.nectarcam_service.module_ids
@@ -1224,12 +1266,20 @@ def fill_r0r1_camera_container(self, zfits_event):
         if not self.pre_v6_data:
             if r0.waveform is not None:
                 r0.waveform = (
-                    r0.waveform - self.nectarcam_datastream.waveform_offset
-                ) / self.nectarcam_datastream.waveform_scale
+                    r0.waveform / self.nectarcam_datastream.waveform_scale
+                    - self.nectarcam_datastream.waveform_offset
+                )
+                # r0.waveform = (
+                #     r0.waveform - self.nectarcam_datastream.waveform_offset
+                # ) / self.nectarcam_datastream.waveform_scale
             if r1.waveform is not None:
                 r1.waveform = (
-                    r1.waveform - self.nectarcam_datastream.waveform_offset
-                ) / self.nectarcam_datastream.waveform_scale
+                    r1.waveform / self.nectarcam_datastream.waveform_scale
+                    - self.nectarcam_datastream.waveform_offset
+                )
+                # r1.waveform = (
+                #     r1.waveform - self.nectarcam_datastream.waveform_offset
+                # ) / self.nectarcam_datastream.waveform_scale
 
         return r0, r1