diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py index 0e67c1b888f010e7eb6d6dd5daa8c59c6bf084ad..6157984cf4fd551007ebd2e4ddd8dba1a4a6bc05 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py @@ -64,7 +64,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 c74f616c65edebc354ed5e229904a48e5aa88981..c6ae8859cb19d6b4f851f1d35e50ab7c55bbd714 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py @@ -200,7 +200,12 @@ 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 +608,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 806f6fb870465eac64f1388bbfbd8afd47287b2a..23ee132866a68e862b85b23ddc303893fea9f327 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TauTriggerContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TauTriggerContent.py @@ -1,8 +1,22 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2014 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.", +] + diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py index b3593174873bbc1b67d7dab3228fbecc11800a18..e1963f094073b145f37a66cb212f3c5671d59ac5 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py @@ -159,7 +159,9 @@ def PHYSCoreCfg(flags, name_tag='PHYS', StreamName='StreamDAOD_PHYS', TriggerLis "TauJets.dRmax.etOverPtLeadTrk", "TauJets_MuonRM.dRmax.etOverPtLeadTrk", "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET.ex.ey", - "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht.ex.ey"] + "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht.ex.ey", + "L1_eTauRoI.thresholdPatterns", + "L1_cTauRoI.thresholdPatterns.jTauLink"] if TauJets_EleRM_in_input: PHYSSlimmingHelper.ExtraVariables += ["TauJets_EleRM.dRmax.etOverPtLeadTrk"] @@ -194,7 +196,7 @@ def PHYSCoreCfg(flags, name_tag='PHYS', StreamName='StreamDAOD_PHYS', TriggerLis PHYSSlimmingHelper.IncludeMuonTriggerContent = False PHYSSlimmingHelper.IncludeEGammaTriggerContent = False PHYSSlimmingHelper.IncludeJetTauEtMissTriggerContent = False - PHYSSlimmingHelper.IncludeTauTriggerContent = False + PHYSSlimmingHelper.IncludeTauTriggerContent = True PHYSSlimmingHelper.IncludeEtMissTriggerContent = False PHYSSlimmingHelper.IncludeBJetTriggerContent = False PHYSSlimmingHelper.IncludeBPhysTriggerContent = False