From c13a2787f11e4e8cc2dde47bdfd3b154eb271716 Mon Sep 17 00:00:00 2001 From: Goetz Gaycken <goetz.gaycken@cern.ch> Date: Mon, 7 May 2018 19:28:51 +0200 Subject: [PATCH] Fix TCC jet content. Former-commit-id: 644841ba2178fb12f7a115491da02fde64701519 --- .../DerivationFrameworkHiggs/python/HIGG5Common.py | 3 ++- .../DerivationFrameworkHiggs/share/HIGG2D4.py | 1 + .../DerivationFrameworkHiggs/share/HIGG5D1.py | 1 + .../DerivationFrameworkHiggs/share/HIGG5D2.py | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py index 46e3f8e0502..97ca252bc98 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py @@ -26,7 +26,8 @@ def getHIGG5Common() : "BTagging_AntiKt4EMTopo.MV2cl100_discriminant", "BTagging_AntiKt4EMPFlow.MV2cl100_discriminant", "CaloCalTopoClusters.CENTER_MAG.calE.calEta.calM.calPhi.calPt.e_sampl.etaCalo.eta_sampl.phiCalo.phi_sampl.rawE.rawEta.rawM.rawPhi", - "TauChargedParticleFlowObjects.bdtPi0Score.e.eta.m.phi.pt.rapidity" + "TauChargedParticleFlowObjects.bdtPi0Score.e.eta.m.phi.pt.rapidity", + "TrackCaloClustersCombinedAndNeutral.pt.eta.phi.m.taste.trackParticleLink.caloClusterLinks" ] def getHIGG5CommonTruthContainers() : diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py index 019007ee4bc..2ec805394cb 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py @@ -359,6 +359,7 @@ if DerivationFrameworkIsMonteCarlo : # AntiKt4PV0TrackJets are needed in conjunction with AntiKt10LCTopoJets, but the can be removed from the # output HIGG5Common.addJetOutputs(HIGG2D4SlimmingHelper,["HIGG2D4Jets"],slimmed_content, ['AntiKt4PV0TrackJets']) +addOriginCorrectedClusters(HIGG2D4SlimmingHelper, writeLC=True, writeEM=False) HIGG2D4SlimmingHelper.IncludeMuonTriggerContent = True HIGG2D4SlimmingHelper.IncludeEGammaTriggerContent = True diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py index 1ab61efff2c..7198354f06b 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py @@ -353,6 +353,7 @@ if DerivationFrameworkIsMonteCarlo : # AntiKt4PV0TrackJets are needed in conjunction with AntiKt10LCTopoJets, but the can be removed from the # output HIGG5Common.addJetOutputs(HIGG5D1SlimmingHelper,["HIGG5D1Jets"],slimmed_content,['AntiKt4PV0TrackJets']) +addOriginCorrectedClusters(HIGG5D1SlimmingHelper, writeLC=True, writeEM=False) # if not DerivationFrameworkIsMonteCarlo : # for very early data # HIGG5D1SlimmingHelper.IncludeMuonTriggerContent = True diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py index 6a9a3433a1a..a66fdc4df37 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py @@ -430,6 +430,7 @@ if DerivationFrameworkIsMonteCarlo : # AntiKt4PV0TrackJets are needed in conjunction with AntiKt10LCTopoJets, but the can be removed from the # output HIGG5Common.addJetOutputs(HIGG5D2SlimmingHelper,["HIGG5D2Jets"],slimmed_content,['AntiKt4PV0TrackJets']) +addOriginCorrectedClusters(HIGG5D2SlimmingHelper, writeLC=True, writeEM=False) HIGG5D2SlimmingHelper.IncludeMuonTriggerContent = True HIGG5D2SlimmingHelper.IncludeEGammaTriggerContent = True -- GitLab