Skip to content
Snippets Groups Projects
Commit aefb0a40 authored by Oana Vickey Boeriu's avatar Oana Vickey Boeriu
Browse files

Merge branch '21.2-HIGG2D1-AntiKt4TruthDressedWZJets' into '21.2'

Add AntiKt4TruthDressedWZJets to HIGG2D1, fix a typo and add missing lines

See merge request atlas/athena!21057
parents 7c2acc44 dbf3e3c0
No related branches found
No related tags found
38 merge requests!76035Updated rel21 number,!63304adding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_VarRad),!62053Merge branch 'sh_xrd_warning' into 'master',!61521fix maxPVrefit,!59663fixed a typo in HIGG8D1 format (followup of https://gitlab.cern.ch/atlas/athena/-/merge_requests/59575),!50754Return TruthTaus from truth matching tool in SUSY tools,!48850Added new HDBS derivation (HDBS3),!46643Draft:Adding MET Significance in AT,!46320Draft: Adding support for Leading3SignalJets strategy,!45689Bug fix: Use wrong vector to calculate largest bin number in findBin(),!45211Update in the FFJetSmearingTool,!44864Draft: WIP- MuonUncorrelateSystematics,!43718Modification of EXOT17.py for fractionally charged particle search,!40581Fix crash in egamma topocluster decorator,!37848Add TrigRingerRings to EGAM3, EGAM4 and EGAM9,!36766Truth class fallback max dr,!35816Add HardScatterParticles into the EXOT8 Derivation,!35273Fix JETM1: add back TruthEvents,!34244WIP: 21.2 topq1 add rc jets 2020 06 27,!34182Merge new MCTruthClassifier developments into master,!34164Use allMuons instead oc combinedOnly for BPHY15,!33109Add delta-R to nearest VR track jet decoration,!33012Adding Prompt Lepton Improved Veto to TOPQ,!32637WIP: Add tracks in R=0.4 jets to STDM11,!32353WIP: Fix rare bug in jet smearing RNG seed,!32051Fix of compilation warnings in CPAnalysisExamples,!31361WIP: AnalysisTop Update - New Muon Isolation WPs included,!30796Reducing number of warnings in MuonEfficiencyCorrections when missing dRJet decoration,!30295Move from boost::filesystem to std::filesystem,!29180WIP: Add multiplicity calculations to JetEtMiss code,!27299WIP: Turning b-jet thinning off in SUSY1 (permanent?),!27094JETM8 UFO fix,!26641Rename member functions to start with lower case,!24487Time-stamped PFlow containers in output DAOD,!24347Electron-in-jet and overlap removal interplay fixed,!23744New trigger derivation for jet substructure,!21621Updating fJVT WP with new recommendations in TopCPTools,!21057Add AntiKt4TruthDressedWZJets to HIGG2D1, fix a typo and add missing lines
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# List of containers that are made on-the-fly by basically all DAOD types and
# can therefore be reasonably added to the NameAndTypes dictionary centrally
......@@ -36,6 +36,8 @@ ContainersOnTheFly = [
["AntiKt4TruthJetsAux","xAOD::JetAuxContainer"],
["AntiKt4TruthWZJets","xAOD::JetContainer"],
["AntiKt4TruthWZJetsAux","xAOD::JetAuxContainer"],
["AntiKt4TruthDressedWZJets","xAOD::JetContainer"],
["AntiKt4TruthDressedWZJetsAux","xAOD::JetAuxContainer"],
["AntiKt4EMTopoCSSKJets","xAOD::JetContainer"],
["AntiKt4EMTopoCSSKJetsAux","xAOD::JetAuxContainer"],
["AntiKt4EMPFlowCSSKJets","xAOD::JetContainer"],
......
......@@ -289,7 +289,8 @@ HIGG2D1SlimmingHelper.SmartCollections = ["Electrons",
if DerivationFrameworkIsMonteCarlo:
# https://twiki.cern.ch/twiki/bin/view/AtlasProtected/DaodRecommendations#Jets_MET
HIGG2D1SlimmingHelper.SmartCollections += ["AntiKt4TruthJets",
"AntiKt4TruthWZJets"]
"AntiKt4TruthWZJets",
"AntiKt4TruthDressedWZJets"]
HIGG2D1SlimmingHelper.ExtraVariables = HIGG2D1ExtraContent
from DerivationFrameworkEGamma.ElectronsCPDetailedContent import *
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
AntiKt4TruthWZJetsCPContent = [
AntiKt4TruthDressedWZJetsCPContent = [
"AntiKt4TruthDressedWZJets",
"AntiKt4TruthDressedWZJetsAux.pt.eta.phi.m.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor.GhostBHadronsFinalCount.GhostBHadronsFinal"
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment