From 80e6f4ccc95ac8cb090e388717416664bf490cdc Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 2 Sep 2020 08:50:32 +0200 Subject: [PATCH] more cleanup/reorganization --- .../python/producersLayer1/jetProducer_cff.py | 11 +++++++++++ .../python/producersLayer1/patCandidates_cff.py | 7 +++---- .../PatAlgos/python/slimming/miniAOD_tools.py | 15 ++++++++------- .../python/slimming/slimmedGenJets_cfi.py | 1 - 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py index 45d2e3791fbc7..cfdc3762f12a9 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py @@ -17,6 +17,17 @@ patJetFlavourIdTask, patJets ) + +from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJets_cff import * +_makePatJetsTaskHI = cms.Task( + recoJetsHIpostAODTask, + makePatJetsTask.copy() +) + +from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 +(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(makePatJetsTask, _makePatJetsTaskHI) + makePatJets = cms.Sequence(makePatJetsTask) from RecoBTag.ImpactParameter.pfImpactParameterTagInfos_cfi import * #pfImpactParameterTagInfos diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py b/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py index 8768104ad5584..d940d972c3e30 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py @@ -34,14 +34,13 @@ makePatJetsTask, makePatMETsTask ) -patCandidates = cms.Sequence(patCandidateSummary, patCandidatesTask) -from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJets_cff import * _patCandidatesTask = patCandidatesTask.copy() -_patCandidatesTask.add(recoJetsHIpostAODTask) _patCandidatesTask.remove(makePatOOTPhotonsTask) - from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 (pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(patCandidatesTask, _patCandidatesTask) (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("patOOTPhotons")) ) + +patCandidates = cms.Sequence(patCandidateSummary, patCandidatesTask) + diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index 47d9ecf5eb100..7aee4278e2f33 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -528,6 +528,12 @@ def miniAOD_customizeCommon(process): stage2L1Trigger_2017.toModify(process.prefiringweight, DataEra = "2017BtoF") run2_L1prefiring.toModify(task, func=lambda t: t.add(process.prefiringweight)) + from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 + from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 + from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import useCsJetsForPat, removeL1FastJetJECs + (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: useCsJetsForPat(proc)) + (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: removeL1FastJetJECs(proc)) + def miniAOD_customizeMC(process): task = getPatAlgosToolsTask(process) #GenJetFlavourInfos @@ -574,11 +580,8 @@ def miniAOD_customizeMC(process): from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 - (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process.slimmedGenJetsAK8, cut = 'pt>9999', nLoose = 0) - from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import useCsJetsForPat, removeJECsForMC, removeL1FastJetJECs, setupHeavyIonGenJets - (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: useCsJetsForPat(proc)) + from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import removeJECsForMC, setupHeavyIonGenJets (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: removeJECsForMC(proc)) - (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: removeL1FastJetJECs(proc)) (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: setupHeavyIonGenJets(proc, 'akCs4PF', 4, task)) @@ -604,10 +607,8 @@ def miniAOD_customizeData(process): from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 - from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import useCsJetsForPat, addJECsForData, removeL1FastJetJECs - (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: useCsJetsForPat(proc)) + from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import addJECsForData (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: addJECsForData(proc)) - (pp_on_AA_2018 | pp_on_PbPb_run3).toModify(process, func = lambda proc: removeL1FastJetJECs(proc)) def miniAOD_customizeAllData(process): miniAOD_customizeCommon(process) diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py index d60521a70f91a..83709c6d51c9b 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py @@ -13,7 +13,6 @@ slimmedGenJetsAK8 = cms.EDProducer("PATGenJetSlimmer", src = cms.InputTag("ak8GenJetsNoNu"), packedGenParticles = cms.InputTag("packedGenParticles"), - cut = cms.string("pt > 80"), cutLoose = cms.string("pt > 10."), nLoose = cms.uint32(3),