more renaming

Author: Aske-Rosted

docker/gnn-benchmarking/apply.py

@@ -9,7 +9,7 @@
 from icecube.icetray import I3Tray  # pyright: reportMissingImports=false
 
 from graphnet.deployment.i3modules import I3InferenceModule
-from graphnet.data.extractors.i3featureextractor import (
+from graphnet.data.extractors.icecube import (
     I3FeatureExtractorIceCubeUpgrade,
 )
 from graphnet.data.constants import FEATURES

src/graphnet/data/constants.py

@@ -2,7 +2,7 @@
 
 
 class FEATURES:
-    """Namespace for standard names working with `I3FeatureExtractor`."""
+    """Namespace for standard names working with `I3PulseLevelExtractor`."""
 
     ICECUBE86 = [
         "dom_x",

src/graphnet/deployment/icecube/cleaning_module.py

@@ -11,6 +11,7 @@
 from graphnet.utilities.config import ModelConfig
 from graphnet.utilities.imports import has_icecube_package
 from graphnet.data.extractors.icecube import (
+    I3PulseLevelExtractor,
     I3FeatureExtractor,
     I3FeatureExtractorIceCubeUpgrade,
 )
@@ -36,7 +37,10 @@ def __init__(
         pulsemap: str,
         features: List[str],
         pulsemap_extractor: Union[
-            List[I3FeatureExtractor], I3FeatureExtractor
+            List[I3PulseLevelExtractor],
+            I3PulseLevelExtractor,
+            List[I3FeatureExtractor],
+            I3FeatureExtractor,
         ],
         model_config: Union[ModelConfig, str],
         state_dict: str,

src/graphnet/deployment/icecube/inference_module.py

@@ -10,7 +10,10 @@
 
 from graphnet.utilities.config import ModelConfig
 from graphnet.deployment import DeploymentModule
-from graphnet.data.extractors.icecube import I3FeatureExtractor
+from graphnet.data.extractors.icecube import (
+    I3PulseLevelExtractor,
+    I3FeatureExtractor,
+)
 from graphnet.utilities.imports import has_icecube_package
 
 if has_icecube_package() or TYPE_CHECKING:
@@ -28,7 +31,10 @@ class I3InferenceModule(DeploymentModule):
     def __init__(
         self,
         pulsemap_extractor: Union[
-            List[I3FeatureExtractor], I3FeatureExtractor
+            List[I3PulseLevelExtractor],
+            I3PulseLevelExtractor,
+            List[I3FeatureExtractor],
+            I3FeatureExtractor,
         ],
         model_config: Union[ModelConfig, str],
         state_dict: str,
@@ -165,7 +171,7 @@ def _create_data_representation(self, frame: I3Frame) -> Data:
             return None
 
     def _extract_feature_array_from_frame(self, frame: I3Frame) -> np.array:
-        """Apply the I3FeatureExtractors to the I3Frame.
+        """Apply the I3PulseLevelExtractor(s) to the I3Frame.
 
         Arguments:
             frame: Physics I3Frame (PFrame)