refactoring/bugfixing

src/graphnet/data/dataconverter.py

@@ -21,7 +21,6 @@
     TypeVar,
     Union,
     cast,
-    Sequence,
 )
 
 import numpy as np
@@ -109,7 +108,7 @@ def __init__(
         workers: int = 1,
         index_column: str = "event_no",
         icetray_verbose: int = 0,
-        I3_Filters: Union[I3Filter, List[Callable]] = [NullSplitI3Filter],
+        I3_Filters: List[I3Filter] = [],
     ):
         """Construct DataConverter.
 
@@ -169,9 +168,10 @@ def __init__(
         self._sequential_batch_pattern = sequential_batch_pattern
         self._input_file_batch_pattern = input_file_batch_pattern
         self._workers = workers
-        if isinstance(I3_Filters, I3Filter):
-            I3_Filters = [I3_Filters]
-        self._I3Filters = I3_Filters
+
+        # I3Filters (NullSplitI3Filter is always included)
+        self._I3Filters = [NullSplitI3Filter()] + I3_Filters
+
         for filter in self._I3Filters:
             assert isinstance(
                 filter, I3Filter

src/graphnet/data/filters.py

@@ -13,15 +13,15 @@ class I3Filter(Logger):
     """A generic filter for I3-frames."""
 
     @abstractmethod
-    def _pass_frame(self, frame: "icetray.I3Frame") -> bool:
-        """Return True if the frame passes the filter, False otherwise.
+    def _keep_frame(self, frame: "icetray.I3Frame") -> bool:
+        """Return True if the frame is kept, False otherwise.
 
         Args:
             frame: I3-frame
                 The I3-frame to check.
 
         Returns:
-            bool: True if the frame passes the filter, False otherwise.
+            bool: True if the frame is kept, False otherwise.
         """
         raise NotImplementedError
 
@@ -35,7 +35,7 @@ def __call__(self, frame: "icetray.I3Frame") -> bool:
         Returns:
             bool: True if the frame passes the filter, False otherwise.
         """
-        pass_flag = self._pass_frame(frame)
+        pass_flag = self._keep_frame(frame)
         try:
             assert isinstance(pass_flag, bool)
         except AssertionError: