diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py index ef11d15f3f220fcaddaf5384ff7ba5d3a87668d7..7626a7c0c36174bc90e38c6ec7a4f0afc3649d72 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommon.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration # Add translator from EVGEN input to xAOD-like truth here from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob @@ -121,15 +121,13 @@ def schedulePostJetMCTruthAugmentations(kernel=None, decorationDressing=None): augmentationToolsList = [ dfTruth.DFCommonTruthTauDressingTool ] #Save the post-shower HT and MET filter values that will make combining filtered samples easier (adds to the EventInfo) - if dfInputIsEVNT: - from DerivationFrameworkMCTruth.GenFilterToolSetup import DFCommonTruthGenFilter - - # schedule the special truth building tools and add them to a common augmentation; note taus are handled separately below - from DerivationFrameworkMCTruth.TruthDerivationTools import DFCommonTruthDressedWZQGLabelTool - augmentationToolsList += [ DFCommonTruthGenFilter , - DFCommonTruthDressedWZQGLabelTool] - else: - augmentationToolsList = [] + from DerivationFrameworkMCTruth.GenFilterToolSetup import DFCommonTruthGenFilter + + # schedule the special truth building tools and add them to a common augmentation; note taus are handled separately below + from DerivationFrameworkMCTruth.TruthDerivationTools import DFCommonTruthDressedWZQGLabelTool + augmentationToolsList += [ DFCommonTruthGenFilter, + DFCommonTruthDressedWZQGLabelTool] + # SUSY signal decorations from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal if IsSUSYSignal(): diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py index 6e92acd3dff25db2c022b21f5bc9e33e494630c2..6aaa5bb9e0c867cd2c6090e0bbf34c8427d3bd08 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration #==================================================================== # DAOD_PHYS.py @@ -212,7 +212,7 @@ PHYSSlimmingHelper.ExtraVariables += ["Electrons.TruthLink", "AntiKt4EMPFlowJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.ConeExclBHadronsFinal.ConeExclCHadronsFinal.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt", "TruthPrimaryVertices.t.x.y.z", "InDetTrackParticles.TTVA_AMVFVertices.TTVA_AMVFWeights.eProbabilityHT.numberOfTRTHits.numberOfTRTOutliers", - "EventInfo.hardScatterVertexLink.timeStampNSOffset", + "EventInfo.timeStampNSOffset.GenFiltHT.GenFiltMET", "TauJets.dRmax.etOverPtLeadTrk", "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET.ex.ey", "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht.ex.ey"] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py index 7f448d71f8a06f4425d048a959f142e9576387db..35f8d8a73e2474dfcf0eaec4696ee9a71b8d8fe5 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration #******************************************************************** # PHYSLITE.py # reductionConf flag PHYSLITE in Reco_tf.py @@ -376,7 +376,7 @@ PHYSLITESlimmingHelper.ExtraVariables = [ "MET_Core_AnalysisMET.name.mpx.mpy.sumet.source", "METAssoc_AnalysisMET.", "InDetTrackParticles.TTVA_AMVFVertices.TTVA_AMVFWeights.numberOfTRTHits.numberOfTRTOutliers", - "EventInfo.hardScatterVertexLink.RandomRunNumber", + "EventInfo.RandomRunNumber.GenFiltHT.GenFiltMET", "Kt4EMPFlowEventShape.Density", "TauTracks.pt.eta.phi.flagSet.trackLinks", ]