gather all egammaCaloClusterSelector in one place and tidy

gather all egammaCaloClusterSelector in one place and tidy

Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Instantiate egammaSelectedTrackCopy with default configuration"
 
-from egammaTrackTools.egammaTrackToolsConfig import (
-    EMExtrapolationToolsCfg)
 from AthenaCommon.Logging import logging
 from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 
 
-def egammaSelectedTrackCopyCfg(
-        flags,
-        name='egammaSelectedTrackCopy',
-        **kwargs):
-
+def egammaSelectedTrackCopyCfg(flags, name="egammaSelectedTrackCopy", **kwargs):
     acc = ComponentAccumulator()
 
     if "egammaCaloClusterSelector" not in kwargs:
-        egammaCaloClusterGSFSelector = CompFactory.egammaCaloClusterSelector(
-            name='caloClusterGSFSelector',
-            egammaCheckEnergyDepositTool = CompFactory.egammaCheckEnergyDepositTool(),
-            EMEtCut = 2250. if not flags.Egamma.doLowMu else 500.,
-            EMEtSplittingFraction = 0.7,
-            EMFCut=0.5
+        from egammaCaloTools.egammaCaloToolsConfig import (
+            egammaCaloClusterSelectorGSFCfg,
+        )
+
+        kwargs["egammaCaloClusterSelector"] = acc.popToolsAndMerge(
+            egammaCaloClusterSelectorGSFCfg(flags)
         )
-        kwargs["egammaCaloClusterSelector"] = egammaCaloClusterGSFSelector
 
     if "ExtrapolationTool" not in kwargs:
-        extraptool = EMExtrapolationToolsCfg(
-            flags, name="EMExtrapolationTools")
+        from egammaTrackTools.egammaTrackToolsConfig import (
+            EMExtrapolationToolsCfg,
+        )
+
+        extraptool = EMExtrapolationToolsCfg(flags, name="EMExtrapolationTools")
         kwargs["ExtrapolationTool"] = acc.popToolsAndMerge(extraptool)
 
     kwargs.setdefault(
-        "ClusterContainerName",
-        flags.Egamma.Keys.Internal.EgammaTopoClusters)
+        "ClusterContainerName", flags.Egamma.Keys.Internal.EgammaTopoClusters
+    )
     kwargs.setdefault(
-        "TrackParticleContainerName",
-        flags.Egamma.Keys.Input.TrackParticles)
+        "TrackParticleContainerName", flags.Egamma.Keys.Input.TrackParticles
+    )
 
     # P->T conversion extra dependencies
     if flags.Detector.GeometryITk:
-        kwargs.setdefault("ExtraInputs", [
-            ("InDetDD::SiDetectorElementCollection", "ConditionStore+ITkPixelDetectorElementCollection"),
-            ("InDetDD::SiDetectorElementCollection", "ConditionStore+ITkStripDetectorElementCollection"),
-        ])
+        kwargs.setdefault(
+            "ExtraInputs",
+            [
+                (
+                    "InDetDD::SiDetectorElementCollection",
+                    "ConditionStore+ITkPixelDetectorElementCollection",
+                ),
+                (
+                    "InDetDD::SiDetectorElementCollection",
+                    "ConditionStore+ITkStripDetectorElementCollection",
+                ),
+            ],
+        )
     else:
-        kwargs.setdefault("ExtraInputs", [
-            ("InDetDD::SiDetectorElementCollection", "ConditionStore+PixelDetectorElementCollection"),
-            ("InDetDD::SiDetectorElementCollection", "ConditionStore+SCT_DetectorElementCollection"),
-        ])
+        kwargs.setdefault(
+            "ExtraInputs",
+            [
+                (
+                    "InDetDD::SiDetectorElementCollection",
+                    "ConditionStore+PixelDetectorElementCollection",
+                ),
+                (
+                    "InDetDD::SiDetectorElementCollection",
+                    "ConditionStore+SCT_DetectorElementCollection",
+                ),
+            ],
+        )
 
     egseltrkcpAlg = CompFactory.egammaSelectedTrackCopy(name, **kwargs)
 
@@ -61,6 +75,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+
     flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
@@ -68,9 +83,11 @@ if __name__ == "__main__":
     acc.merge(egammaSelectedTrackCopyCfg(flags))
     mlog = logging.getLogger("egammaSelectedTrackCopyConfigTest")
     mlog.info("Configuring  egammaSelectedTrackCopy: ")
-    printProperties(mlog,
-                    acc.getEventAlgo("egammaSelectedTrackCopy"),
-                    nestLevel=1,
-                    printDefaults=True)
+    printProperties(
+        mlog,
+        acc.getEventAlgo("egammaSelectedTrackCopy"),
+        nestLevel=1,
+        printDefaults=True,
+    )
     with open("egammaselectedtrackCopy.pkl", "wb") as f:
         acc.store(f)

Reconstruction/egamma/egammaCaloTools/python/egammaCaloToolsConfig.py

@@ -16,34 +16,56 @@ def CaloFillRectangularClusterCfg(flags, **kwargs):
     kwargs.setdefault("phi_size", 7)
     kwargs.setdefault("cells_name", flags.Egamma.Keys.Input.CaloCells)
 
+    result.setPrivateTools(CompFactory.CaloFillRectangularCluster(**kwargs))
+    return result
+
+
+def egammaCaloClusterSelectorGSFCfg(
+    flags, name="caloClusterGSFSelector", **kwargs
+):
+    result = ComponentAccumulator()
+
+    if "egammaCheckEnergyDepositTool" not in kwargs:
+        kwargs[
+            "egammaCheckEnergyDepositTool"
+        ] = CompFactory.egammaCheckEnergyDepositTool()
+
+    kwargs.setdefault("EMEtCut", 2250.0 if not flags.Egamma.doLowMu else 500.0)
+    kwargs.setdefault("EMEtSplittingFraction", 0.7)
+    kwargs.setdefault("EMFCut", 0.5)
     result.setPrivateTools(
-        CompFactory.CaloFillRectangularCluster(**kwargs))
+        CompFactory.egammaCaloClusterSelector(name, **kwargs)
+    )
     return result
 
 
-def egammaCaloClusterSelectorCfg(ConfigFlags,
-                                 name="caloClusterROISelector",
-                                 **kwargs):
+def egammaCaloClusterSelectorCfg(
+    flags, name="caloClusterROISelector", **kwargs
+):
     result = ComponentAccumulator()
 
     if "egammaCheckEnergyDepositTool" not in kwargs:
-        kwargs["egammaCheckEnergyDepositTool"] = CompFactory.egammaCheckEnergyDepositTool()
-    kwargs.setdefault("EMEtCut", 2250.)
+        kwargs[
+            "egammaCheckEnergyDepositTool"
+        ] = CompFactory.egammaCheckEnergyDepositTool()
+    kwargs.setdefault("EMEtCut", 2250.0 if not flags.Egamma.doLowMu else 500.0)
     kwargs.setdefault("EMEtSplittingFraction", 0.7)
     kwargs.setdefault("EMFCut", 0.7)
     kwargs.setdefault("RetaCut", 0.65)
     kwargs.setdefault("HadLeakCut", 0.15)
     result.setPrivateTools(
-        CompFactory.egammaCaloClusterSelector(name, **kwargs))
+        CompFactory.egammaCaloClusterSelector(name, **kwargs)
+    )
     return result
 
 
-def egammaHadCaloClusterSelectorCfg(ConfigFlags,
-                                    name="caloClusterHadROISelector",
-                                    **kwargs):
+def egammaHadCaloClusterSelectorCfg(
+    ConfigFlags, name="caloClusterHadROISelector", **kwargs
+):
     result = ComponentAccumulator()
     kwargs.setdefault("egammaCheckEnergyDepositTool", "")
     kwargs.setdefault("ClusterEtCut", 150e3)
     result.setPrivateTools(
-        CompFactory.egammaCaloClusterSelector(name, **kwargs))
+        CompFactory.egammaCaloClusterSelector(name, **kwargs)
+    )
     return result