diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfig.py b/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfig.py index 19417c9aa33936c3f4130093016a935d28c53da7..347f8a8e821b048256c1b843b5aec8a237f58c0b 100644 --- a/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfig.py +++ b/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfig.py @@ -92,11 +92,9 @@ def getTruthJetRange(name="TruthJetRange", **kwargs): kwargs.setdefault('LastXing', TruthJet_LastXing() ) itemList = [] if 'PileUpAntiKt4TruthJets' in digitizationFlags.experimentalDigi(): - itemList += ["xAOD::JetContainer#InTimeAntiKt4TruthJets", - "xAOD::JetContainer#OutOfTimeAntiKt4TruthJets"] + itemList += ["xAOD::JetContainer#AntiKt4TruthJets"] if 'PileUpAntiKt6TruthJets' in digitizationFlags.experimentalDigi(): - itemList += ["xAOD::JetContainer#InTimeAntiKt6TruthJets", - "xAOD::JetContainer#OutOfTimeAntiKt6TruthJets"] + itemList += ["xAOD::JetContainer#AntiKt6TruthJets"] kwargs.setdefault('ItemList', itemList) return CfgMgr.PileUpXingFolder(name, **kwargs) diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfigNew.py b/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfigNew.py index 92011fcc9a63a75816469dd6dfeff86acbd0279e..627d058a392048fb2905b913dd4d976c5687c17e 100644 --- a/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfigNew.py +++ b/Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfigNew.py @@ -80,8 +80,9 @@ def TruthJetRangeCfg(flags, name="TruthJetRange", **kwargs): #this is the time of the xing in ns kwargs.setdefault("FirstXing", TruthJet_FirstXing()) kwargs.setdefault("LastXing", TruthJet_LastXing()) - kwargs.setdefault("ItemList", ["JetCollection#InTimeAntiKt4TruthJets", - "JetCollection#OutOfTimeAntiKt4TruthJets"]) + itemList = ["xAOD::JetContainer#AntiKt4TruthJets", + "xAOD::JetContainer#AntiKt6TruthJets"] + kwargs.setdefault("ItemList", itemList) return PileUpXingFolderCfg(flags, name, **kwargs) @@ -106,8 +107,8 @@ def MergeAntiKt6TruthJetsCfg(flags, name="MergeAntiKt6TruthJetsTool", **kwargs): if flags.Digitization.DoXingByXingPileUp: # PileUpTool approach kwargs.setdefault("FirstXing", TruthJet_FirstXing()) kwargs.setdefault("LastXing", TruthJet_LastXing()) - kwargs.setdefault("InTimeOutputTruthJetCollKey", "InTimeAntiKt4TruthJets") - kwargs.setdefault("OutOfTimeTruthJetCollKey", "OutOfTimeAntiKt4TruthJets") + kwargs.setdefault("InTimeOutputTruthJetCollKey", "InTimeAntiKt6TruthJets") + kwargs.setdefault("OutOfTimeTruthJetCollKey", "OutOfTimeAntiKt6TruthJets") tool = CompFactory.MergeTruthJetsTool(name, **kwargs) acc.merge(PileUpToolsCfg(flags, PileUpTools=tool)) return acc