From 4c7b0860623b9fd9260fc325d562d5a869ed448e Mon Sep 17 00:00:00 2001
From: Thomas Strebler <thomas.strebler@cern.ch>
Date: Tue, 30 Apr 2024 15:39:59 +0200
Subject: [PATCH] Clarified config of PRDtoTrackMap
Clarified config of PRDtoTrackMap
---
.../InDetConfig/python/ITkTrackRecoConfig.py | 8 ++++----
.../InDetConfig/python/InDetPriVxFinderConfig.py | 4 ++--
.../InDetConfig/python/TrackRecoConfig.py | 16 ++++++++--------
.../python/InDetToolsConfig.py | 4 ++--
.../python/TrkAmbiguityProcessorConfig.py | 10 +++++-----
.../python/TrkTrackCollectionMergerConfig.py | 2 +-
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
index 9deb9c89c107..54fecf6c9f96 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
@@ -109,7 +109,7 @@ def ITkStoreTrackSeparateContainerCfg(flags,
# schedule merger to combine signal and background tracks
InputTracks = [flags.Overlay.SigPrefix+TrackContainer,
flags.Overlay.BkgPrefix+TrackContainer]
- AssociationMapName = ("PRDtoTrackMapResolved" +
+ AssociationMapName = ("PRDtoTrackMapMerge_Resolved" +
extension + "Tracks")
MergerOutputTracks = TrackContainer
@@ -305,7 +305,7 @@ def ITkTrackFinalCfg(flags,
OutputCombinedTracks=TrackContainer,
AssociationMapName=(
"" if flags.Tracking.doITkFastTracking else
- f"PRDtoTrackMap{TrackContainer}")))
+ f"PRDtoTrackMapMerge_{TrackContainer}")))
if flags.Tracking.doTruth:
from InDetConfig.ITkTrackTruthConfig import ITkTrackTruthCfg
@@ -335,7 +335,7 @@ def ITkTrackFinalCfg(flags,
splitProbName),
AssociationMapName=(
"" if flags.Tracking.doITkFastTracking else
- f"PRDtoTrackMap{TrackContainer}"),
+ f"PRDtoTrackMapMerge_{TrackContainer}"),
isActsAmbi = 'ActsValidateResolvedTracks' in splitProbName or \
'ActsValidateAmbiguityResolution' in splitProbName or \
'ActsConversion' in splitProbName or \
@@ -386,7 +386,7 @@ def ITkSiSPSeededTracksFinalCfg(flags):
if (e=='' or flags.Tracking.__getattr__(f"ITk{e}Pass").storeSiSPSeededTracks) ]
for extension in listOfExtensionsRequesting:
- AssociationMapNameKey="PRDtoTrackMapCombinedITkTracks"
+ AssociationMapNameKey="PRDtoTrackMapMerge_CombinedITkTracks"
if not (extension == ''):
AssociationMapNameKey = f"ITkPRDtoTrackMap{extension}"
diff --git a/InnerDetector/InDetConfig/python/InDetPriVxFinderConfig.py b/InnerDetector/InDetConfig/python/InDetPriVxFinderConfig.py
index 32c2fab58764..d045ce6cfc5a 100644
--- a/InnerDetector/InDetConfig/python/InDetPriVxFinderConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetPriVxFinderConfig.py
@@ -32,7 +32,7 @@ def InDetPriVxFinderCfg(flags,
flags,
ClusterSplitProbabilityName = \
ClusterSplitProbabilityContainerName(flags),
- AssociationMapName = "PRDtoTrackMapCombinedInDetTracks",
+ AssociationMapName = "PRDtoTrackMapMerge_CombinedInDetTracks",
xAODTrackParticlesFromTracksContainerName = \
"InDetTrackParticlesTemporary"))
kwargs["TracksName"]="InDetTrackParticlesTemporary"
@@ -93,7 +93,7 @@ def primaryVertexFindingCfg(flags,
flags,
ClusterSplitProbabilityName=ClusterSplitProbabilityContainerName(
flags),
- AssociationMapName="PRDtoTrackMapCombinedInDetTracks"))
+ AssociationMapName="PRDtoTrackMapMerge_CombinedInDetTracks"))
from OutputStreamAthenaPool.OutputStreamConfig import addToESD, addToAOD
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index a86927e8bbba..1c51d653d216 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -313,13 +313,13 @@ def StoreTrackSeparateContainerCfg(flags, TrackContainer="",
InputTracks += [flags.Overlay.BkgPrefix +
extension + "Tracks"]
TrackContainer = extension+"Tracks"
- AssociationMapName = "PRDtoTrackMap" + TrackContainer
+ AssociationMapName = "PRDtoTrackMapMerge_" + TrackContainer
MergerOutputTracks = TrackContainer
elif doTrackOverlay:
# schedule merger to combine signal and background tracks
InputTracks = [flags.Overlay.SigPrefix+TrackContainer,
flags.Overlay.BkgPrefix+TrackContainer]
- AssociationMapName = ("PRDtoTrackMapResolved" +
+ AssociationMapName = ("PRDtoTrackMapMerge_Resolved" +
extension + "Tracks")
MergerOutputTracks = TrackContainer
@@ -534,7 +534,7 @@ def TrackFinalCfg(flags,
flags,
InputCombinedTracks=InputCombinedInDetTracks,
OutputCombinedTracks=TrackContainer,
- AssociationMapName=f"PRDtoTrackMap{TrackContainer}"))
+ AssociationMapName=f"PRDtoTrackMapMerge_{TrackContainer}"))
if flags.Tracking.doTruth:
from InDetConfig.TrackTruthConfig import InDetTrackTruthCfg
@@ -559,7 +559,7 @@ def TrackFinalCfg(flags,
flags,
ClusterSplitProbabilityName=ClusterSplitProbabilityContainerName(
flags),
- AssociationMapName=f"PRDtoTrackMap{TrackContainer}"))
+ AssociationMapName=f"PRDtoTrackMapMerge_{TrackContainer}"))
return result
@@ -584,7 +584,7 @@ def PseudoTrackFinalCfg(flags):
xAODTrackParticlesFromTracksContainerName=(
"InDetPseudoTrackParticles"),
AssociationMapName=(
- "PRDtoTrackMapCombinedInDetTracks")))
+ "PRDtoTrackMapMerge_CombinedInDetTracks")))
return result
@@ -606,7 +606,7 @@ def ObserverTrackFinalCfg(flags):
result.merge(ObserverTrackParticleCnvAlgCfg(
flags,
AssociationMapName = (
- "PRDtoTrackMapCombinedInDetTracks")))
+ "PRDtoTrackMapMerge_CombinedInDetTracks")))
return result
@@ -653,9 +653,9 @@ def SiSPSeededTracksFinalCfg(flags):
if (e=='' or flags.Tracking.__getattr__(e+'Pass').storeSiSPSeededTracks) ]
for extension in listOfExtensionsRequesting:
- AssociationMapNameKey="PRDtoTrackMapCombinedInDetTracks"
+ AssociationMapNameKey="PRDtoTrackMapMerge_CombinedInDetTracks"
if extension=='Disappearing':
- AssociationMapNameKey = "PRDtoTrackMapDisappearingTracks"
+ AssociationMapNameKey = "PRDtoTrackMapMerge_DisappearingTracks"
elif not (extension == ''):
AssociationMapNameKey = f"InDetPRDtoTrackMap{extension}"
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py
index 89495d2d3ed9..ee75a5776fb4 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py
@@ -97,7 +97,7 @@ def TrackStateOnSurfaceDecoratorCfg(flags, name, **kwargs):
kwargs.setdefault("TRT_ToT_dEdx", acc.addPublicTool(acc.popToolsAndMerge(TRT_dEdxToolCfg(flags))))
kwargs.setdefault("DecorationPrefix", "")
- kwargs.setdefault("PRDtoTrackMap", "PRDtoTrackMapCombinedInDetTracks")
+ kwargs.setdefault("PRDtoTrackMap", "PRDtoTrackMapMerge_CombinedInDetTracks")
acc.addPublicTool(
CompFactory.DerivationFramework.TrackStateOnSurfaceDecorator(
@@ -268,7 +268,7 @@ def ITkTrackStateOnSurfaceDecoratorCfg(
kwargs.setdefault("SctMapName", "ITkStripClustersOffsets")
kwargs.setdefault("PixelClustersName", "ITkPixelClusters")
kwargs.setdefault("SctClustersName", "ITkStripClusters")
- kwargs.setdefault("PRDtoTrackMap", "ITkPRDToTrackMapCombinedITkTracks")
+ kwargs.setdefault("PRDtoTrackMap", "ITkPRDtoTrackMapMerge_CombinedITkTracks")
kwargs.setdefault("PixelMsosName", "ITkPixelMSOSs")
kwargs.setdefault("SctMsosName", "ITkStripMSOSs")
kwargs.setdefault("SCTDetEleCollKey", "ITkStripDetectorElementCollection")
diff --git a/Tracking/TrkConfig/python/TrkAmbiguityProcessorConfig.py b/Tracking/TrkConfig/python/TrkAmbiguityProcessorConfig.py
index 2ac0a4f5a0e4..5c156fbfae2e 100644
--- a/Tracking/TrkConfig/python/TrkAmbiguityProcessorConfig.py
+++ b/Tracking/TrkConfig/python/TrkAmbiguityProcessorConfig.py
@@ -272,7 +272,7 @@ def DenseEnvironmentsAmbiguityScoreProcessorToolCfg(
acc.popToolsAndMerge(PRDtoTrackMapToolCfg(flags)))
kwargs.setdefault("AssociationMapName", (
- f"PRDToTrackMap{flags.Tracking.ActiveConfig.extension}"))
+ "PRDtoTrackMapAmbi_"+flags.Tracking.ActiveConfig.extension))
if flags.Tracking.ActiveConfig.useTIDE_Ambi:
kwargs.setdefault("sharedProbCut",
@@ -358,7 +358,7 @@ def ITkDenseEnvironmentsAmbiguityScoreProcessorToolCfg(
'SplitClusterAmbiguityMap' + extension))
kwargs.setdefault("AssociationMapName", (
- 'ITkPRDToTrackMap' + flags.Tracking.ActiveConfig.extension))
+ 'ITkPRDtoTrackMapAmbi_' + flags.Tracking.ActiveConfig.extension))
kwargs.setdefault("InputClusterSplitProbabilityName", (
ClusterSplitProbContainer))
kwargs.setdefault("OutputClusterSplitProbabilityName", (
@@ -440,7 +440,7 @@ def DenseEnvironmentsAmbiguityProcessorToolCfg(
InDetAmbiTrackSelectionToolCfg(flags)))
kwargs.setdefault("AssociationMapName", (
- 'PRDToTrackMap' + flags.Tracking.ActiveConfig.extension))
+ 'PRDtoTrackMapAmbi_' + flags.Tracking.ActiveConfig.extension))
kwargs.setdefault("InputClusterSplitProbabilityName", (
'SplitProb'+flags.Tracking.ActiveConfig.extension))
kwargs.setdefault("OutputClusterSplitProbabilityName", (
@@ -530,7 +530,7 @@ def ITkDenseEnvironmentsAmbiguityProcessorToolCfg(
ITkAmbiTrackSelectionToolCfg(flags)))
kwargs.setdefault("AssociationMapName", (
- 'ITkPRDToTrackMap' + flags.Tracking.ActiveConfig.extension))
+ 'ITkPRDtoTrackMapAmbi_' + flags.Tracking.ActiveConfig.extension))
kwargs.setdefault("InputClusterSplitProbabilityName", (
'SplitProb'+flags.Tracking.ActiveConfig.extension))
kwargs.setdefault("OutputClusterSplitProbabilityName", (
@@ -554,4 +554,4 @@ def ITkDenseEnvironmentsAmbiguityProcessorToolCfg(
CompFactory.Trk.DenseEnvironmentsAmbiguityProcessorTool(
name+flags.Tracking.ActiveConfig.extension, **kwargs))
return acc
-
\ No newline at end of file
+
diff --git a/Tracking/TrkConfig/python/TrkTrackCollectionMergerConfig.py b/Tracking/TrkConfig/python/TrkTrackCollectionMergerConfig.py
index 62219b25b67c..1cd084c55e74 100644
--- a/Tracking/TrkConfig/python/TrkTrackCollectionMergerConfig.py
+++ b/Tracking/TrkConfig/python/TrkTrackCollectionMergerConfig.py
@@ -46,7 +46,7 @@ def ITkTrackCollectionMergerAlgCfg(flags, name="ITkTrackCollectionMerger",
from InDetConfig.InDetAssociationToolsConfig import ITkPRDtoTrackMapToolGangedPixelsCfg
kwargs.setdefault("AssociationTool", result.popToolsAndMerge(ITkPRDtoTrackMapToolGangedPixelsCfg(flags)))
- kwargs.setdefault("AssociationMapName", "ITkPRDToTrackMapCombinedITkTracks")
+ kwargs.setdefault("AssociationMapName", "ITkPRDtoTrackMapMerge_CombinedITkTracks")
kwargs.setdefault("DoTrackOverlay",doTrackOverlay)
result.addEventAlgo(CompFactory.Trk.TrackCollectionMerger(prefix+name, **kwargs))
--
GitLab