diff --git a/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py
index fd48f34e3b839fa9abb0eba3cf13e029a676d425..ec3efeba67d6238b800b1b0bd268ef62d0232bde 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py
@@ -6,12 +6,14 @@ __author__ = "Christos"
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory
from egammaRec import egammaKeys
-from egammaTrackTools.egammaTrackToolsFactories import EMLastCaloExtensionTool,EMParticleCaloExtensionTool
+from egammaTrackTools.egammaTrackToolsFactories import (
+ EMLastCaloExtensionTool, EMParticleCaloExtensionTool)
-EMGSFCaloExtensionBuilder = AlgFactory( egammaAlgsConf.EMGSFCaloExtensionBuilder,
- name = 'EMGSFCaloExtensionBuilder',
- LastCaloExtensionTool=EMLastCaloExtensionTool,
- PerigeeCaloExtensionTool=EMParticleCaloExtensionTool,
- GSFPerigeeCache='GSFPerigeeCaloExtension',
- GSFLastCache='GSFLastCaloExtension',
- GFFTrkPartContainerName=egammaKeys.outputTrackParticleKey())
+EMGSFCaloExtensionBuilder = AlgFactory(
+ egammaAlgsConf.EMGSFCaloExtensionBuilder,
+ name='EMGSFCaloExtensionBuilder',
+ LastCaloExtensionTool=EMLastCaloExtensionTool,
+ PerigeeCaloExtensionTool=EMParticleCaloExtensionTool,
+ GSFPerigeeCache='GSFPerigeeCaloExtension',
+ GSFLastCache='GSFLastCaloExtension',
+ GFFTrkPartContainerName=egammaKeys.outputTrackParticleKey())
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilder.py
index b4fd2393605026d468974e8c8e3303427af156f4..0738f9e6f45a85e5db1fb2330f3bf6c1f89d00a9 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilder.py
@@ -1,6 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate EMVertexBuilder with default configuration"
+__doc__ = """ToolFactory to instantiate EMVertexBuilder
+with default configuration"""
__author__ = "Bruno Lenzi"
import InDetRecExample.TrackingCommon as TrackingCommon
@@ -14,28 +15,23 @@ from egammaTools.egammaExtrapolators import AtlasPublicExtrapolator
class VertexFinderToolInstance(FcnWrapper):
def __call__(self):
- # Loading Configurable HoleSearchTool
- egammaInDetHoleSearchTool = TrackingCommon.getInDetHoleSearchTool(
- name="egammaInDetHoleSearchTool",
- Extrapolator=AtlasPublicExtrapolator()
- )
-
- # Load the InDetTrackSummaryHelperTool
- egammaInDetTrackSummaryHelperTool = (
+ # In reality we do NOT need a summary tool
+ # but the confgured Secondary vertex
+ # still asks for one (TODO)
+ egammaVtxInDetTrackSummaryHelperTool = (
TrackingCommon.getInDetSummaryHelper(
- name="egammaInDetSummaryHelper",
+ name="egammaVtxInDetSummaryHelper",
AssoTool=None,
+ HoleSearch=None,
DoSharedHits=False,
- HoleSearch=egammaInDetHoleSearchTool,
private=True))
- #
- egammaInDetTrackSummaryTool = (
+ egammaVtxInDetTrackSummaryTool = (
TrackingCommon.getInDetTrackSummaryTool(
- name="egammaInDetTrackSummaryTool",
- InDetSummaryHelperTool=egammaInDetTrackSummaryHelperTool,
+ name="egammaVtxInDetTrackSummaryTool",
+ InDetSummaryHelperTool=egammaVtxInDetTrackSummaryHelperTool,
doSharedHits=False,
- doHolesInDet=True))
+ doHolesInDet=False))
#
# Configured conversion vertex reconstruction cuts
@@ -55,7 +51,7 @@ class VertexFinderToolInstance(FcnWrapper):
TrackParticles=egammaKeys.outputTrackParticleKey(),
SecVertices=egammaKeys.outputConversionKey(),
Extrapolator=AtlasPublicExtrapolator(),
- TrackSummaryTool=egammaInDetTrackSummaryTool,
+ TrackSummaryTool=egammaVtxInDetTrackSummaryTool,
printConfig=False)
return theemvertexfindertool.toolInstance()
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlg.py b/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlg.py
index e66be31947ddc2fd3a0842ca6d3bd4003ed439bb..19b9c52a87aa3e7d39e29c55d6cee321189e5f5f 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlg.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlg.py
@@ -1,6 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate egammaLargeClusterMaker with default configuration"
+__doc__ = """ToolFactory to instantiate egammaLargeClusterMaker
+with default configuration"""
__author__ = "Jovan Mitrevski"
from egammaTools.egammaToolsFactories import egammaLargeClusterMakerTool
@@ -9,15 +10,18 @@ from egammaRec.Factories import AlgFactory, FcnWrapper
from egammaRec import egammaKeys
from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrections
+
def clusMakerTools():
return [egammaLargeClusterMakerTool()]
-egammaLargeClusterMakerAlg = AlgFactory( CaloRecConf.CaloClusterMaker,
- name = "egammaLargeClusterMaker",
- SaveUncalibratedSignalState = False,
- ClustersOutputName = egammaKeys.EgammaLargeClustersKey(),
- ClusterMakerTools = FcnWrapper(clusMakerTools),
- ClusterCorrectionTools=make_CaloSwCorrections("ele7_11",
- suffix="Nocorr",
- version="none",
- cells_name=egammaKeys.caloCellKey()))
+
+egammaLargeClusterMakerAlg = AlgFactory(
+ CaloRecConf.CaloClusterMaker,
+ name="egammaLargeClusterMaker",
+ SaveUncalibratedSignalState=False,
+ ClustersOutputName=egammaKeys.EgammaLargeClustersKey(),
+ ClusterMakerTools=FcnWrapper(clusMakerTools),
+ ClusterCorrectionTools=make_CaloSwCorrections("ele7_11",
+ suffix="Nocorr",
+ version="none",
+ cells_name=egammaKeys.caloCellKey()))
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py
index 5b42f69420304078f4000f461e4a97b96e17ec59..f80be96ec0f9a68067352d6a0934d09eeb428d0c 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py
@@ -1,22 +1,23 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate egammaRecBuilder with default configuration"
+__doc__ = """ToolFactory to instantiate
+egammaRecBuilder with default configuration"""
__author__ = "Jovan Mitrevski"
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory
-from egammaRec.egammaRecFlags import jobproperties # to set jobproperties.egammaRecFlags
+from egammaRec.egammaRecFlags import jobproperties
from egammaRec import egammaKeys
from egammaTools.egammaToolsFactories import \
EMTrackMatchBuilder, EMConversionBuilder
-egammaRecBuilder = AlgFactory( egammaAlgsConf.egammaRecBuilder,
- name = 'egammaRecBuilder' ,
- InputTopoClusterContainerName=jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
- egammaRecContainer=egammaKeys.EgammaRecKey(),
- # Builder tools
- TrackMatchBuilderTool = EMTrackMatchBuilder,
- ConversionBuilderTool = EMConversionBuilder
- )
-
+egammaRecBuilder = AlgFactory(
+ egammaAlgsConf.egammaRecBuilder,
+ name='egammaRecBuilder',
+ InputTopoClusterContainerName=jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
+ egammaRecContainer=egammaKeys.EgammaRecKey(),
+ # Builder tools
+ TrackMatchBuilderTool=EMTrackMatchBuilder,
+ ConversionBuilderTool=EMConversionBuilder
+)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopy.py b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopy.py
index 8de23bed129368bf8f86508c96ae7aac68a92530..95249d385d6745e4d1c7c2a628eb038bd413a41f 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopy.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopy.py
@@ -1,6 +1,7 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate egammaSelectedTrackCopy with default configuration"
+__doc__ = """ToolFactory to instantiate
+egammaSelectedTrackCopy with default configuration"""
__author__ = "Christos"
from egammaAlgs import egammaAlgsConf
@@ -8,21 +9,24 @@ from egammaRec.Factories import ToolFactory, AlgFactory
# to set jobproperties.egammaRecFlags
from egammaRec.egammaRecFlags import jobproperties
from InDetRecExample.InDetKeys import InDetKeys
-from egammaTrackTools.egammaTrackToolsFactories import EMExtrapolationTools, EMExtrapolationToolsCommonCache
+from egammaTrackTools.egammaTrackToolsFactories import (
+ EMExtrapolationTools, EMExtrapolationToolsCommonCache)
from egammaCaloTools import egammaCaloToolsConf
-egammaCaloClusterGSFSelector = ToolFactory(egammaCaloToolsConf.egammaCaloClusterSelector,
- name='caloClusterGSFSelector',
- EMEtCut=2250.,
- EMEtSplittingFraction = 0.7,
- EMFCut=0.5
- )
+egammaCaloClusterGSFSelector = ToolFactory(
+ egammaCaloToolsConf.egammaCaloClusterSelector,
+ name='caloClusterGSFSelector',
+ EMEtCut=2250.,
+ EMEtSplittingFraction=0.7,
+ EMFCut=0.5
+)
-egammaSelectedTrackCopy = AlgFactory(egammaAlgsConf.egammaSelectedTrackCopy,
- name='egammaSelectedTrackCopy',
- ExtrapolationTool=EMExtrapolationTools,
- ExtrapolationToolCommonCache=EMExtrapolationToolsCommonCache,
- ClusterContainerName=jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
- TrackParticleContainerName=InDetKeys.xAODTrackParticleContainer(),
- egammaCaloClusterSelector=egammaCaloClusterGSFSelector
- )
+egammaSelectedTrackCopy = AlgFactory(
+ egammaAlgsConf.egammaSelectedTrackCopy,
+ name='egammaSelectedTrackCopy',
+ ExtrapolationTool=EMExtrapolationTools,
+ ExtrapolationToolCommonCache=EMExtrapolationToolsCommonCache,
+ ClusterContainerName=jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
+ TrackParticleContainerName=InDetKeys.xAODTrackParticleContainer(),
+ egammaCaloClusterSelector=egammaCaloClusterGSFSelector
+)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py
index 1f4b3f4fc2f09fa3d9a8b137ec312545cd5a0080..0de10c4dee171458544d367f47491f2925e1c49b 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py
@@ -1,35 +1,38 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate the two supercluster builders with default configuration"
+__doc__ = """ToolFactory to instantiate the
+two supercluster builders with default configuration"""
__author__ = "Jovan Mitrevski"
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory
-from egammaRec.egammaRecFlags import jobproperties # noqa: F401 # to set jobproperties.egammaRecFlags
from egammaRec import egammaKeys
-from egammaTools.egammaToolsFactories import \
- EMTrackMatchBuilder, EMConversionBuilder, egammaSwTool, egammaMVASvc
+from egammaTools.egammaToolsFactories import (
+ EMTrackMatchBuilder, EMConversionBuilder, egammaSwTool, egammaMVASvc)
-from egammaCaloTools.egammaCaloToolsFactories import egammaCheckEnergyDepositTool
+from egammaCaloTools.egammaCaloToolsFactories import (
+ egammaCheckEnergyDepositTool)
-electronSuperClusterBuilder = AlgFactory( egammaAlgsConf.electronSuperClusterBuilder,
- name = 'electronSuperClusterBuilder',
- InputEgammaRecContainerName=egammaKeys.EgammaRecKey(),
- SuperElectronRecCollectionName=egammaKeys.ElectronSuperRecKey(),
- ClusterCorrectionTool=egammaSwTool,
- egammaCheckEnergyDepositTool = egammaCheckEnergyDepositTool,
- MVACalibSvc=egammaMVASvc,
- EtThresholdCut=1000,
- TrackMatchBuilderTool = EMTrackMatchBuilder
- )
+electronSuperClusterBuilder = AlgFactory(
+ egammaAlgsConf.electronSuperClusterBuilder,
+ name='electronSuperClusterBuilder',
+ InputEgammaRecContainerName=egammaKeys.EgammaRecKey(),
+ SuperElectronRecCollectionName=egammaKeys.ElectronSuperRecKey(),
+ ClusterCorrectionTool=egammaSwTool,
+ egammaCheckEnergyDepositTool=egammaCheckEnergyDepositTool,
+ MVACalibSvc=egammaMVASvc,
+ EtThresholdCut=1000,
+ TrackMatchBuilderTool=EMTrackMatchBuilder
+)
-photonSuperClusterBuilder = AlgFactory( egammaAlgsConf.photonSuperClusterBuilder,
- name = 'photonSuperClusterBuilder',
- InputEgammaRecContainerName=egammaKeys.EgammaRecKey(),
- SuperPhotonRecCollectionName=egammaKeys.PhotonSuperRecKey(),
- ClusterCorrectionTool=egammaSwTool,
- egammaCheckEnergyDepositTool = egammaCheckEnergyDepositTool,
- MVACalibSvc= egammaMVASvc,
- ConversionBuilderTool = EMConversionBuilder
- )
+photonSuperClusterBuilder = AlgFactory(
+ egammaAlgsConf.photonSuperClusterBuilder,
+ name='photonSuperClusterBuilder',
+ InputEgammaRecContainerName=egammaKeys.EgammaRecKey(),
+ SuperPhotonRecCollectionName=egammaKeys.PhotonSuperRecKey(),
+ ClusterCorrectionTool=egammaSwTool,
+ egammaCheckEnergyDepositTool=egammaCheckEnergyDepositTool,
+ MVACalibSvc=egammaMVASvc,
+ ConversionBuilderTool=EMConversionBuilder
+)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py
index a127a20457af601048dae2a71018ad4c50bd0064..3b314af0653a123e0cf6cfe7d70850b5d738d486 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py
@@ -1,16 +1,18 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate egammaTopoClusterCopier with default configuration"
+__doc__ = """
+ToolFactory to instantiate egammaTopoClusterCopier with default configuration"""
__author__ = "Jovan Mitrevski"
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory
-from egammaRec.egammaRecFlags import jobproperties # to set jobproperties.egammaRecFlags
-
-egammaTopoClusterCopier = AlgFactory( egammaAlgsConf.egammaTopoClusterCopier,
- name = 'egammaTopoClusterCopier' ,
- InputTopoCollection=jobproperties.egammaRecFlags.inputTopoClusterCollection(),
- OutputTopoCollection=jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
- OutputTopoCollectionShallow="tmp_"+jobproperties.egammaRecFlags.egammaTopoClusterCollection()
- )
+from egammaRec.egammaRecFlags import jobproperties
+egammaTopoClusterCopier = AlgFactory(
+ egammaAlgsConf.egammaTopoClusterCopier,
+ name='egammaTopoClusterCopier',
+ InputTopoCollection=jobproperties.egammaRecFlags.inputTopoClusterCollection(),
+ OutputTopoCollection=jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
+ OutputTopoCollectionShallow="tmp_" +
+ jobproperties.egammaRecFlags.egammaTopoClusterCollection()
+)
diff --git a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilder.py b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilder.py
index 82351fa7dbfca762d19feffc1d7a42d0b844005f..21ef1e92eefdaa641bdc8dfc15f89c6d0c4fe85d 100644
--- a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilder.py
@@ -1,21 +1,21 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate the two supercluster builders with default configuration"
+__doc__ = """ToolFactory to instantiate the
+two supercluster builders with default configuration"""
__author__ = "Jovan Mitrevski"
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory
-from egammaRec.egammaRecFlags import jobproperties # noqa: F401 # to set jobproperties.egammaRecFlags
from egammaRec import egammaKeys
from egammaTools.egammaToolsFactories import EGammaAmbiguityTool
-topoEgammaBuilder = AlgFactory( egammaAlgsConf.topoEgammaBuilder,
- name = 'topoEgammaBuilder',
- SuperElectronRecCollectionName=egammaKeys.ElectronSuperRecKey(),
- SuperPhotonRecCollectionName=egammaKeys.PhotonSuperRecKey(),
- ElectronOutputName = egammaKeys.outputElectronKey(),
- PhotonOutputName = egammaKeys.outputPhotonKey(),
- AmbiguityTool = EGammaAmbiguityTool
- )
-
+topoEgammaBuilder = AlgFactory(
+ egammaAlgsConf.topoEgammaBuilder,
+ name='topoEgammaBuilder',
+ SuperElectronRecCollectionName=egammaKeys.ElectronSuperRecKey(),
+ SuperPhotonRecCollectionName=egammaKeys.PhotonSuperRecKey(),
+ ElectronOutputName=egammaKeys.outputElectronKey(),
+ PhotonOutputName=egammaKeys.outputPhotonKey(),
+ AmbiguityTool=EGammaAmbiguityTool
+)