Fix bug in ChargeDistributionFilter for pedestal maker (#213)

* Only fill charges container if waveforms are available

* Cleanup commented stuff from some previous PR

* Pin `persistent` (dependency for `ZODB`) version to fix CI

---------

Co-authored-by: Jean-Philippe Lenain <[email protected]>

Author: tibaldo

environment.yml

@@ -24,6 +24,7 @@ dependencies:
   - pip:
     - zeo
     - zodb
+    - persistent<6.2
     - mechanize
     - browser-cookie3
     - pyqtgraph

pyproject.toml

@@ -26,6 +26,7 @@ dependencies = [
     "iminuit",
     "matplotlib",
     "pandas",
+    "persistent<6.2",
     "scipy",
     "zodb",
     "zeo",

src/nectarchain/dqm/bokeh_app/tests/test_app_hooks.py

@@ -1,10 +1,12 @@
 import numpy as np
-from bokeh.io import output_file, save
 
 # bokeh imports
+from bokeh.io import output_file, save
 from bokeh.layouts import layout
 from bokeh.models import Select
 from bokeh.plotting import curdoc
+
+# ctapipe imports
 from ctapipe.coordinates import EngineeringCameraFrame
 from ctapipe.instrument import CameraGeometry
 from ZODB import DB

src/nectarchain/makers/component/pedestal_component.py

@@ -496,31 +496,6 @@ def finish(self, *args, **kwargs):
         self._waveformsContainers = waveformsContainers.containers[
             EventType.SKY_PEDESTAL
         ]
-        # log.info('JPL: waveformsContainers=',waveformsContainers.containers[
-        # EventType.SKY_PEDESTAL].nsamples)
-
-        # If we want to filter based on charges distribution
-        # make sure that the charge distribution container is filled
-        if (
-            self.filter_method == "ChargeDistributionFilter"
-            and self._chargesContainers is None
-        ):
-            log.debug("Compute charges from waveforms")
-            chargesComponent_kwargs = {}
-            chargesComponent_configurable_traits = (
-                ComponentUtils.get_configurable_traits(ChargesComponent)
-            )
-            for key in kwargs.keys():
-                if key in chargesComponent_configurable_traits.keys():
-                    chargesComponent_kwargs[key] = kwargs[key]
-            self._chargesContainers = ChargesComponent.create_from_waveforms(
-                waveformsContainer=self._waveformsContainers,
-                subarray=self.subarray,
-                config=self.config,
-                parent=self.parent,
-                *args,
-                **chargesComponent_kwargs,
-            )
 
         # Check if waveforms container is empty
         if self._waveformsContainers is None:
@@ -535,6 +510,29 @@ def finish(self, *args, **kwargs):
             # container with no results
             return None
         else:
+            # If we want to filter based on charges distribution
+            # make sure that the charge distribution container is filled
+            if (
+                self.filter_method == "ChargeDistributionFilter"
+                and self._chargesContainers is None
+            ):
+                log.debug("Compute charges from waveforms")
+                chargesComponent_kwargs = {}
+                chargesComponent_configurable_traits = (
+                    ComponentUtils.get_configurable_traits(ChargesComponent)
+                )
+                for key in kwargs.keys():
+                    if key in chargesComponent_configurable_traits.keys():
+                        chargesComponent_kwargs[key] = kwargs[key]
+                self._chargesContainers = ChargesComponent.create_from_waveforms(
+                    waveformsContainer=self._waveformsContainers,
+                    subarray=self.subarray,
+                    config=self.config,
+                    parent=self.parent,
+                    *args,
+                    **chargesComponent_kwargs,
+                )
+
             # Build mask to filter the waveforms
             # Mask based on the high gain channel that is most sensitive to signals
             # Initialize empty mask