Standardise conditional icecube import

Author: asogaard

src/graphnet/data/dataconverter.py

@@ -27,14 +27,11 @@ def final(f):  # Identity decorator
     I3TruthExtractor,
 )
 from graphnet.utilities.filesys import find_i3_files
-from graphnet.utilities.logging import LoggerMixin, get_logger
+from graphnet.utilities.imports import has_icecube_package
+from graphnet.utilities.logging import LoggerMixin
 
-logger = get_logger()
-
-try:
+if has_icecube_package():
     from icecube import icetray, dataio  # pyright: reportMissingImports=false
-except ImportError:
-    logger.warning("icecube package not available.")
 
 
 SAVE_STRATEGIES = [

src/graphnet/data/extractors/i3extractor.py

@@ -1,17 +1,11 @@
 from abc import ABC, abstractmethod
 from typing import List
 
-from graphnet.utilities.logging import LoggerMixin, get_logger
+from graphnet.utilities.imports import has_icecube_package
+from graphnet.utilities.logging import LoggerMixin
 
-logger = get_logger()
-
-try:
-    from icecube import (
-        icetray,
-        dataio,
-    )  # pyright: reportMissingImports=false
-except ImportError:
-    logger.warning("icecube package not available.")
+if has_icecube_package():
+    from icecube import icetray, dataio  # pyright: reportMissingImports=false
 
 
 class I3Extractor(ABC, LoggerMixin):

src/graphnet/data/extractors/i3featureextractor.py

@@ -1,13 +1,8 @@
 from graphnet.data.extractors.i3extractor import I3Extractor
-from graphnet.utilities.logging import get_logger
-
-logger = get_logger()
-try:
-    from icecube import (
-        dataclasses,
-    )  # pyright: reportMissingImports=false
-except ImportError:
-    logger.warning("icecube package not available.")
+from graphnet.utilities.imports import has_icecube_package
+
+if has_icecube_package():
+    from icecube import dataclasses  # pyright: reportMissingImports=false
 
 
 class I3FeatureExtractor(I3Extractor):

src/graphnet/data/extractors/i3truthextractor.py

@@ -7,18 +7,14 @@
     frame_is_montecarlo,
     frame_is_noise,
 )
-from graphnet.utilities.logging import get_logger
+from graphnet.utilities.imports import has_icecube_package
 
-logger = get_logger()
-
-try:
+if has_icecube_package():
     from icecube import (
         dataclasses,
         icetray,
         phys_services,
     )  # pyright: reportMissingImports=false
-except ImportError:
-    logger.warning("icecube package not available.")
 
 
 class I3TruthExtractor(I3Extractor):
@@ -385,5 +381,5 @@ def _find_data_type(self, mc, input_file):
         if "L2" in input_file:  # not robust
             sim_type = "dbang"
         if sim_type == "lol":
-            logger.info("SIM TYPE NOT FOUND!")
+            self.logger.info("SIM TYPE NOT FOUND!")
         return sim_type