From ac0f114383bda8ded1ba780df5d0e31c3461c621 Mon Sep 17 00:00:00 2001 From: Antonio De Maria <antonio.de.maria@cern.ch> Date: Tue, 26 Mar 2024 23:28:09 +0100 Subject: [PATCH] Draft: Update TauTrig collection in Derivations --- .../python/FullListOfSmartContainers.py | 3 ++- .../python/SlimmingHelper.py | 12 +++++++++--- .../python/TauTriggerContent.py | 19 +++++++++++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py index 982dff2ae5d4..b326c2328dba 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py @@ -66,7 +66,8 @@ def FullListOfSmartContainers(flags=None): "HLT_xAOD__TrigVertexCountsContainer_vertexcounts", "HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf", "HLT_IDVertex_FS", - "HLT_IDTrack_FS_FTF" + "HLT_IDTrack_FS_FTF", + "HLT_TrigTauRecMerged_MVA" ] if flags is not None and flags.Tracking.doPseudoTracking: diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py index c74f616c65ed..0ccf0ef3297d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py @@ -200,7 +200,10 @@ class SlimmingHelper: if (self.IncludeTauTriggerContent is True): triggerContent = True - self.SmartCollections.append("HLT_xAOD__TauJetContainer_TrigTauRecMerged") + if self.flags.Trigger.EDMVersion == 2: + self.SmartCollections.append("HLT_xAOD__TauJetContainer_TrigTauRecMerged") + elif self.flags.Trigger.EDMVersion == 3: + self.SmartCollections.append("HLT_TrigTauRecMerged_MVA") if (self.IncludeBJetTriggerContent is True): triggerContent = True @@ -603,8 +606,11 @@ class SlimmingHelper: from DerivationFrameworkCore.EtMissTriggerContent import EtMissTriggerContent items.extend(EtMissTriggerContent) elif collectionName=="HLT_xAOD__TauJetContainer_TrigTauRecMerged": - from DerivationFrameworkCore.TauTriggerContent import TauTriggerContent - items.extend(TauTriggerContent) + from DerivationFrameworkCore.TauTriggerContent import TauTriggerContentRun2 + items.extend(TauTriggerContentRun2) + elif collectionName=="HLT_TrigTauRecMerged_MVA": + from DerivationFrameworkCore.TauTriggerContent import TauTriggerContentRun3 + items.extend(TauTriggerContentRun3) elif collectionName=="HLT_xAOD__BTaggingContainer_HLTBjetFex": from DerivationFrameworkFlavourTag.BJetTriggerContent import BJetTriggerContent items.extend(BJetTriggerContent) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TauTriggerContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TauTriggerContent.py index 806f6fb87046..7b54a4403332 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TauTriggerContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TauTriggerContent.py @@ -1,8 +1,23 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration -TauTriggerContent = [ +#Run2 collections +TauTriggerContentRun2 = [ "HLT_xAOD__TauJetContainer_TrigTauRecMerged", "HLT_xAOD__TauJetContainer_TrigTauRecMergedAux.", "LVL1EmTauRoIs", "LVL1EmTauRoIsAux." ] + +#Run3 collections +TauTriggerContentRun3 = [ +"HLT_TrigTauRecMerged_MVA", +"HLT_TrigTauRecMerged_MVAAux.", +"LVL1EmTauRoIs", +"LVL1EmTauRoIsAux.", +"L1_eTauRoI", +"L1_eTauRoIAux.", +"L1_cTauRoI", +"L1_cTauRoIAux." +] + + -- GitLab