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

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py

-# 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"],

PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py

@@ -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 *

PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt4TruthDressedWZJetsCPContent.py

 # 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"
 ]