diff --git a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py index c8dc176f678b3..87a3077f68894 100644 --- a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py +++ b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py @@ -41,3 +41,15 @@ patJetFlavourIdTask = cms.Task(patJetPartons, patJetFlavourAssociation) patJetFlavourId = cms.Sequence(patJetFlavourIdTask) + +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(patJetPartons, particles = "hiSignalGenParticles") +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetFlavourAssociation, + jets = 'akCs4PFJets', + rParam = 0.4, + ) +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetPartonAssociationLegacy, + jets = "akCs4PFJets", + partons = "allPartons", +) diff --git a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py index 8141442b5bd71..5b2c208f48e84 100644 --- a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py +++ b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py @@ -27,4 +27,16 @@ resolveByMatchQuality = cms.bool(False), # False = just match input in order; True = pick lowest deltaR pair first ) +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(patJetGenJetMatch, + matched = 'ak4HiCleanedGenJets', + maxDeltaR = 0.4, + resolveByMatchQuality = True, + src = "akCs4PFJets", + ) +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetPartonMatch, + matched = "cleanedPartons", + src = "akCs4PFJets", + ) diff --git a/PhysicsTools/PatAlgos/python/producersHeavyIons/heavyIonJetSetup.py b/PhysicsTools/PatAlgos/python/producersHeavyIons/heavyIonJetSetup.py new file mode 100644 index 0000000000000..ca42d0bc7066a --- /dev/null +++ b/PhysicsTools/PatAlgos/python/producersHeavyIons/heavyIonJetSetup.py @@ -0,0 +1,13 @@ +def removeL1FastJetJECs(process): + for label in process.producerNames().split(): + module = getattr(process, label) + if module.type_() == "PATPFJetMETcorrInputProducer": + module.offsetCorrLabel = '' + +def removeJECsForMC(process): + for label in process.producerNames().split(): + module = getattr(process, label) + if module.type_() == "PATPFJetMETcorrInputProducer": + module.jetCorrLabel = 'Uncorrected' + + process.basicJetsForMet.jetCorrLabel = 'Uncorrected' diff --git a/PhysicsTools/PatAlgos/python/producersHeavyIons/heavyIonJets_cff.py b/PhysicsTools/PatAlgos/python/producersHeavyIons/heavyIonJets_cff.py index 205d557bfa905..05680c7e97ef5 100644 --- a/PhysicsTools/PatAlgos/python/producersHeavyIons/heavyIonJets_cff.py +++ b/PhysicsTools/PatAlgos/python/producersHeavyIons/heavyIonJets_cff.py @@ -1,19 +1,66 @@ import FWCore.ParameterSet.Config as cms -from PhysicsTools.PatAlgos.producersLayer1.jetProducer_cff import * -from RecoHI.HiJetAlgos.HiGenCleaner_cff import * -heavyIonCleaned = cms.Sequence(genPartons*hiPartons+heavyIonCleanedGenJets) +from RecoJets.Configuration.GenJetParticles_cff import genParticlesForJets +from RecoHI.HiJetAlgos.HiGenCleaner_cff import hiPartons +from RecoHI.HiJetAlgos.HiGenJets_cff import ak4HiGenJets +from RecoHI.HiJetAlgos.HiGenCleaner_cff import heavyIonCleanedGenJets -makeHeavyIonJets = cms.Sequence( - patJetCorrections * - - # pat and HI specifics - heavyIonCleaned * - patJetGenJetMatch * - patJetPartonMatch * +allPartons = cms.EDProducer( + "PartonSelector", + src = cms.InputTag('genParticles'), + withLeptons = cms.bool(False), + ) - # object production - patJets +cleanedPartons = hiPartons.clone( + src = 'allPartons', ) +ak4HiCleanedGenJets = heavyIonCleanedGenJets.clone(src = "ak4HiGenJets") + +cleanedGenJetsTask = cms.Task( + genParticlesForJets, + cleanedPartons, + ak4HiGenJets, + ak4HiCleanedGenJets +) +from RecoHI.HiJetAlgos.HiRecoPFJets_cff import PFTowers, pfEmptyCollection, ak4PFJetsForFlow, hiPuRho, hiFJRhoFlowModulation, akCs4PFJets +from RecoHI.HiTracking.highPurityGeneralTracks_cfi import highPurityGeneralTracks +from RecoJets.JetAssociationProducers.ak5JTA_cff import * +from RecoBTag.Configuration.RecoBTag_cff import impactParameterTagInfos, trackCountingHighEffBJetTags, trackCountingHighPurBJetTags, jetProbabilityBJetTags, jetBProbabilityBJetTags, secondaryVertexTagInfos, combinedSecondaryVertexV2BJetTags, simpleSecondaryVertexHighEffBJetTags, simpleSecondaryVertexHighPurBJetTags +ak5JetTracksAssociatorAtVertex +from RecoBTag.SecondaryVertex.simpleSecondaryVertex2TrkComputer_cfi import * +from RecoBTag.SecondaryVertex.simpleSecondaryVertex3TrkComputer_cfi import * +from RecoBTag.SecondaryVertex.combinedSecondaryVertexV2Computer_cfi import * +from RecoBTag.ImpactParameter.jetBProbabilityComputer_cfi import * +from RecoBTag.ImpactParameter.jetProbabilityComputer_cfi import * +from RecoBTag.ImpactParameter.trackCounting3D2ndComputer_cfi import * +from RecoBTag.ImpactParameter.trackCounting3D3rdComputer_cfi import * +from PhysicsTools.PatAlgos.recoLayer0.jetCorrFactors_cfi import * + +recoPFJetsHIpostAODTask = cms.Task( + PFTowers, + pfEmptyCollection, + ak4PFJetsForFlow, + hiFJRhoFlowModulation, + hiPuRho, + highPurityGeneralTracks, + akCs4PFJets, + ak5JetTracksAssociatorAtVertex, + impactParameterTagInfos, + trackCountingHighEffBJetTags, + trackCountingHighPurBJetTags, + jetProbabilityBJetTags, + jetBProbabilityBJetTags, + secondaryVertexTagInfos, + combinedSecondaryVertexV2BJetTags, + simpleSecondaryVertexHighEffBJetTags, + simpleSecondaryVertexHighPurBJetTags, + patJetCorrFactors +) + +recoJetsHIpostAODTask = cms.Task( + recoPFJetsHIpostAODTask, + allPartons, + cleanedGenJetsTask, + ) 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/jetProducer_cfi.py b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py index bca8636a6b011..6b191dba32a74 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py @@ -99,4 +99,27 @@ resolutions = cms.PSet() ) +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(_patJets, + jetSource = "akCs4PFJets", + genJetMatch = "patJetGenJetMatch", + genPartonMatch = "patJetPartonMatch", + JetFlavourInfoSource = "patJetFlavourAssociation", + JetPartonMapSource = "patJetFlavourAssociationLegacy", + jetCorrFactorsSource = ["patJetCorrFactors"], + trackAssociationSource = "ak5JetTracksAssociatorAtVertex", + useLegacyJetMCFlavour = True, + discriminatorSources = [ + "simpleSecondaryVertexHighEffBJetTags", + "simpleSecondaryVertexHighPurBJetTags", + "combinedSecondaryVertexV2BJetTags", + "jetBProbabilityBJetTags", + "jetProbabilityBJetTags", + "trackCountingHighEffBJetTags", + "trackCountingHighPurBJetTags", + ], + addJetCharge = False, +) + patJets = _patJets.clone() diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py b/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py index 436e4504b1c58..d940d972c3e30 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py @@ -34,8 +34,13 @@ makePatJetsTask, makePatMETsTask ) -patCandidates = cms.Sequence(patCandidateSummary, patCandidatesTask) +_patCandidatesTask = patCandidatesTask.copy() +_patCandidatesTask.remove(makePatOOTPhotonsTask) from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith(patCandidatesTask, patCandidatesTask.copyAndExclude([makePatOOTPhotonsTask])) -pp_on_AA_2018.toModify(patCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("patOOTPhotons")) ) +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/recoLayer0/jetCorrFactors_cfi.py b/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py index 26d449c178af6..05822b077a224 100644 --- a/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py +++ b/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py @@ -40,3 +40,13 @@ useRho = cms.bool(True), rho = cms.InputTag('fixedGridRhoFastjetAll'), ) + +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(patJetCorrFactors, + useNPV = False, + useRho = False, + levels = ['L2Relative','L3Absolute'], + payload = "AK4PF", + src = "akCs4PFJets", + ) diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py index 7ee533a446680..5f8c23c47be59 100644 --- a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py @@ -141,6 +141,7 @@ _pp_on_AA_extraCommands = [ 'keep patPackedCandidates_hiPixelTracks_*_*', 'keep *_packedCandidateMuonID_*_*', + 'keep *_slimmedJets_pfCandidates_*', 'keep floatedmValueMap_packedPFCandidateTrackChi2_*_*', 'keep floatedmValueMap_lostTrackChi2_*_*', 'keep recoCentrality_hiCentrality_*_*', diff --git a/PhysicsTools/PatAlgos/python/slimming/applyDeepBtagging_cff.py b/PhysicsTools/PatAlgos/python/slimming/applyDeepBtagging_cff.py index a67434ea8ad23..7b0084c85d296 100644 --- a/PhysicsTools/PatAlgos/python/slimming/applyDeepBtagging_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/applyDeepBtagging_cff.py @@ -88,4 +88,3 @@ def applyDeepBtagging( process, postfix="" ) : # delete module not used anymore (slimmedJetsAK8 substitutes) delattr(process, 'selectedUpdatedPatJetsSlimmedAK8DeepTags'+postfix) - diff --git a/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py b/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py index 5a7541ece63cf..99b238370d6a8 100644 --- a/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py @@ -25,6 +25,7 @@ def applySubstructure( process, postfix="" ) : _run2_miniAOD_ANY = (run2_miniAOD_80XLegacy | run2_miniAOD_94XFall17 | run2_miniAOD_UL) from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 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 if postfix=='': # Avoid recomputing the PUPPI collections that are present in AOD _rerun_puppijets_task = task.copy() @@ -32,7 +33,7 @@ def applySubstructure( process, postfix="" ) : getattr(process,'ak8PFJetsPuppiConstituents'), getattr(process,'ak8PFJetsPuppiSoftDrop'), getattr(process,'ak8PFJetsPuppiSoftDropMass')) - (_run2_miniAOD_ANY | pA_2016 | pp_on_AA_2018).toReplaceWith(task, _rerun_puppijets_task) + (_run2_miniAOD_ANY | pA_2016 | pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(task, _rerun_puppijets_task) else: task.add(getattr(process,'ak8PFJetsPuppi'+postfix), getattr(process,'ak8PFJetsPuppiConstituents'+postfix), @@ -53,6 +54,8 @@ def applySubstructure( process, postfix="" ) : dropSpecific = cms.bool(True), # Save space ), process, task ) + (pp_on_AA_2018 | pp_on_PbPb_run3).toModify( getattr(process,'slimmedGenJetsAK8SoftDropSubJets'), cut = 'pt<0', nLoose = 0) + ## PATify puppi soft drop fat jets addJetCollection( process, @@ -88,10 +91,9 @@ def applySubstructure( process, postfix="" ) : addToProcessAndTask('nb2AK8PuppiSoftDrop'+postfix, process.ecfNbeta2.clone(src = cms.InputTag("ak8PFJetsPuppiSoftDrop"+postfix), cuts = cms.vstring('', '', 'pt > 250')), process, task) #too slow now ==> disable - from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common - for e in [pp_on_XeXe_2017, pp_on_AA_2018, phase2_common]: + for e in [pp_on_XeXe_2017, pp_on_AA_2018, pp_on_PbPb_run3, phase2_common]: e.toModify(getattr(process,'nb1AK8PuppiSoftDrop'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) e.toModify(getattr(process,'nb2AK8PuppiSoftDrop'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) @@ -106,7 +108,7 @@ def applySubstructure( process, postfix="" ) : getattr(process,"patJetsAK8PFPuppiSoftDropSubjets"+postfix).userData.userFloats.src += ['nb2AK8PuppiSoftDropSubjets'+postfix+':ecfN2','nb2AK8PuppiSoftDropSubjets'+postfix+':ecfN3'] getattr(process,"patJetsAK8PFPuppiSoftDropSubjets"+postfix).userData.userFloats.src += ['NjettinessAK8Subjets'+postfix+':tau1','NjettinessAK8Subjets'+postfix+':tau2','NjettinessAK8Subjets'+postfix+':tau3','NjettinessAK8Subjets'+postfix+':tau4'] - for e in [pp_on_XeXe_2017, pp_on_AA_2018, phase2_common]: + for e in [pp_on_XeXe_2017, pp_on_AA_2018, pp_on_PbPb_run3, phase2_common]: e.toModify(getattr(process,'nb1AK8PuppiSoftDropSubjets'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) e.toModify(getattr(process,'nb2AK8PuppiSoftDropSubjets'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index 50ad5cca7fbc3..b6981349253b1 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -4,6 +4,10 @@ from PhysicsTools.PatAlgos.tools.helpers import getPatAlgosToolsTask, addToProcessAndTask +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 +_hiGeneral = pp_on_AA_2018 | pp_on_PbPb_run3 + def miniAOD_customizeCommon(process): process.patMuons.isoDeposits = cms.PSet() process.patElectrons.isoDeposits = cms.PSet() @@ -120,20 +124,25 @@ def miniAOD_customizeCommon(process): from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon phase2_muon.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 3 && (isGlobalMuon || isStandAloneMuon || numberOfMatches > 0 || muonID('RPCMuLoose') || muonID('ME0MuonArbitrated') || muonID('GEMMuonArbitrated')) )") - 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.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon) )") + _hiGeneral.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon) )") process.selectedPatElectrons.cut = cms.string("") process.selectedPatTaus.cut = cms.string("pt > 18. && tauID('decayModeFindingNewDMs')> 0.5") process.selectedPatPhotons.cut = cms.string("") - from PhysicsTools.PatAlgos.tools.jetTools import addJetCollection - - from PhysicsTools.PatAlgos.slimming.applySubstructure_cff import applySubstructure - applySubstructure( process ) + _dummyPatJets = process.selectedPatJets.clone(cut = "pt < 0") + task = getPatAlgosToolsTask(process) + def _applySubstructure(process): + from PhysicsTools.PatAlgos.tools.jetTools import addJetCollection + from PhysicsTools.PatAlgos.slimming.applySubstructure_cff import applySubstructure + applySubstructure( process ) + (~_hiGeneral).toModify(process, _applySubstructure) + + _hiGeneral.toModify(process, func = lambda p: addToProcessAndTask('slimmedJets', p.selectedPatJets.clone(), p, task)) + _hiGeneral.toModify(process, func = lambda p: addToProcessAndTask('slimmedJetsAK8', _dummyPatJets.clone(), p, task)) + # from PhysicsTools.PatAlgos.tools.trigTools import switchOnTriggerStandAlone switchOnTriggerStandAlone( process, outputModule = '' ) @@ -155,8 +164,6 @@ def miniAOD_customizeCommon(process): #noHF pfMET ========= - task = getPatAlgosToolsTask(process) - process.noHFCands = cms.EDFilter("GenericPFCandidateSelector", src=cms.InputTag("particleFlow"), cut=cms.string("abs(pdgId)!=1 && abs(pdgId)!=2 && abs(eta)<3.0") @@ -172,20 +179,22 @@ def miniAOD_customizeCommon(process): process.load('PhysicsTools.PatAlgos.slimming.slimmedMETs_cfi') task.add(process.slimmedMETs) - process.slimmedMETs.addDeepMETs = True - - addToProcessAndTask('slimmedMETsNoHF', process.slimmedMETs.clone(), process, task) - process.slimmedMETsNoHF.src = cms.InputTag("patMETsNoHF") - process.slimmedMETsNoHF.rawVariation = cms.InputTag("patPFMetNoHF") - process.slimmedMETsNoHF.t1Uncertainties = cms.InputTag("patPFMetT1%sNoHF") - process.slimmedMETsNoHF.t01Variation = cms.InputTag("patPFMetT0pcT1NoHF") - process.slimmedMETsNoHF.t1SmearedVarsAndUncs = cms.InputTag("patPFMetT1Smear%sNoHF") - process.slimmedMETsNoHF.tXYUncForRaw = cms.InputTag("patPFMetTxyNoHF") - process.slimmedMETsNoHF.tXYUncForT1 = cms.InputTag("patPFMetT1TxyNoHF") - process.slimmedMETsNoHF.tXYUncForT01 = cms.InputTag("patPFMetT0pcT1TxyNoHF") - process.slimmedMETsNoHF.tXYUncForT1Smear = cms.InputTag("patPFMetT1SmearTxyNoHF") - process.slimmedMETsNoHF.tXYUncForT01Smear = cms.InputTag("patPFMetT0pcT1SmearTxyNoHF") - del process.slimmedMETsNoHF.caloMET + (~_hiGeneral).toModify(process.slimmedMETs, addDeepMETs = True) + + def _add_slimmedMETsNoHF(process): + addToProcessAndTask('slimmedMETsNoHF', process.slimmedMETs.clone(), process, task) + process.slimmedMETsNoHF.src = cms.InputTag("patMETsNoHF") + process.slimmedMETsNoHF.rawVariation = cms.InputTag("patPFMetNoHF") + process.slimmedMETsNoHF.t1Uncertainties = cms.InputTag("patPFMetT1%sNoHF") + process.slimmedMETsNoHF.t01Variation = cms.InputTag("patPFMetT0pcT1NoHF") + process.slimmedMETsNoHF.t1SmearedVarsAndUncs = cms.InputTag("patPFMetT1Smear%sNoHF") + process.slimmedMETsNoHF.tXYUncForRaw = cms.InputTag("patPFMetTxyNoHF") + process.slimmedMETsNoHF.tXYUncForT1 = cms.InputTag("patPFMetT1TxyNoHF") + process.slimmedMETsNoHF.tXYUncForT01 = cms.InputTag("patPFMetT0pcT1TxyNoHF") + process.slimmedMETsNoHF.tXYUncForT1Smear = cms.InputTag("patPFMetT1SmearTxyNoHF") + process.slimmedMETsNoHF.tXYUncForT01Smear = cms.InputTag("patPFMetT0pcT1SmearTxyNoHF") + del process.slimmedMETsNoHF.caloMET + (~_hiGeneral).toModify(process, _add_slimmedMETsNoHF) # ================== NoHF pfMET # ================== CHSMET @@ -249,13 +258,15 @@ def miniAOD_customizeCommon(process): process.patJets.userData.userInts.src += [ 'hfJetShowerShape:centralEtaStripSize', 'hfJetShowerShape:adjacentEtaStripsSize'] ## DeepCSV meta discriminators (simple arithmethic on output probabilities) - process.load('RecoBTag.Combined.deepFlavour_cff') - task.add(process.pfDeepCSVDiscriminatorsJetTags) - process.patJets.discriminatorSources.extend([ - cms.InputTag('pfDeepCSVDiscriminatorsJetTags:BvsAll' ), - cms.InputTag('pfDeepCSVDiscriminatorsJetTags:CvsB' ), - cms.InputTag('pfDeepCSVDiscriminatorsJetTags:CvsL' ), - ]) + def _add_deepFlavour(process): + process.load('RecoBTag.Combined.deepFlavour_cff') + task.add(process.pfDeepCSVDiscriminatorsJetTags) + process.patJets.discriminatorSources.extend([ + 'pfDeepCSVDiscriminatorsJetTags:BvsAll', + 'pfDeepCSVDiscriminatorsJetTags:CvsB', + 'pfDeepCSVDiscriminatorsJetTags:CvsL', + ]) + (~_hiGeneral).toModify(process, _add_deepFlavour) ## CaloJets process.caloJetMap = cms.EDProducer("RecoJetDeltaRValueMapProducer", @@ -268,6 +279,9 @@ def miniAOD_customizeCommon(process): task.add(process.caloJetMap) process.patJets.userData.userFloats.src += [ 'caloJetMap:pt', 'caloJetMap:emEnergyFraction' ] + _hiGeneral.toModify(process.patJets.userData.userInts, src = [] ) + _hiGeneral.toModify(process.patJets.userData.userFloats, src = [] ) + #Muon object modifications from PhysicsTools.PatAlgos.slimming.muonIsolationsPUPPI_cfi import makeInputForPUPPIIsolationMuon makeInputForPUPPIIsolationMuon(process) @@ -421,89 +435,107 @@ def miniAOD_customizeCommon(process): ) task.add(process.patJetPuppiCharge) - noDeepFlavourDiscriminators = [x.value() for x in process.patJets.discriminatorSources if not "DeepFlavour" in x.value()] - addJetCollection(process, postfix = "", labelName = 'Puppi', jetSource = cms.InputTag('ak4PFJetsPuppi'), - jetCorrections = ('AK4PFPuppi', ['L2Relative', 'L3Absolute'], ''), - pfCandidates = cms.InputTag("particleFlow"), - algo= 'AK', rParam = 0.4, btagDiscriminators = noDeepFlavourDiscriminators - ) + def _add_jetsPuppi(process): + from PhysicsTools.PatAlgos.tools.jetTools import addJetCollection + noDeepFlavourDiscriminators = [x.value() if isinstance(x, cms.InputTag) else x for x in process.patJets.discriminatorSources + if not "DeepFlavour" in str(x)] + addJetCollection(process, postfix = "", labelName = 'Puppi', jetSource = cms.InputTag('ak4PFJetsPuppi'), + jetCorrections = ('AK4PFPuppi', ['L2Relative', 'L3Absolute'], ''), + pfCandidates = cms.InputTag("particleFlow"), + algo= 'AK', rParam = 0.4, btagDiscriminators = noDeepFlavourDiscriminators + ) + + process.patJetGenJetMatchPuppi.matched = 'slimmedGenJets' - process.patJetGenJetMatchPuppi.matched = 'slimmedGenJets' + process.patJetsPuppi.jetChargeSource = cms.InputTag("patJetPuppiCharge") - process.patJetsPuppi.jetChargeSource = cms.InputTag("patJetPuppiCharge") - - process.selectedPatJetsPuppi.cut = cms.string("pt > 15") + process.selectedPatJetsPuppi.cut = cms.string("pt > 15") + + from PhysicsTools.PatAlgos.slimming.applyDeepBtagging_cff import applyDeepBtagging + applyDeepBtagging( process ) - from PhysicsTools.PatAlgos.slimming.applyDeepBtagging_cff import applyDeepBtagging - applyDeepBtagging( process ) + addToProcessAndTask('slimmedJetsPuppi', process.slimmedJetsNoDeepFlavour.clone( + src = "selectedPatJetsPuppi", packedPFCandidates = "packedPFCandidates"), + process, task) + + task.add(process.slimmedJetsPuppi) - addToProcessAndTask('slimmedJetsPuppi', process.slimmedJetsNoDeepFlavour.clone( - src = "selectedPatJetsPuppi", packedPFCandidates = "packedPFCandidates"), - process, task) + process.slimmedJetsNoDeepFlavour.dropTagInfos = '0' + process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour.addTagInfos = True + process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour.tagInfoSources = ["pixelClusterTagInfos"] + _run2_miniAOD_ANY.toModify(process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour, addTagInfos = False ) + (~_hiGeneral).toModify(process, _add_jetsPuppi) - task.add(process.slimmedJetsPuppi) + _hiGeneral.toModify(process, func = lambda p: addToProcessAndTask('slimmedJetsPuppi', _dummyPatJets.clone(), p, task)) # Embed pixelClusterTagInfos in slimmedJets process.patJets.addTagInfos = True process.patJets.tagInfoSources = ["pixelClusterTagInfos"] - process.slimmedJetsNoDeepFlavour.dropTagInfos = '0' - process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour.addTagInfos = True - process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour.tagInfoSources = ["pixelClusterTagInfos"] _run2_miniAOD_ANY.toModify(process.patJets, addTagInfos = False ) - _run2_miniAOD_ANY.toModify(process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour, addTagInfos = False ) + _hiGeneral.toModify(process.patJets, addTagInfos = True ) + _hiGeneral.toModify(process.patJets, tagInfoSources = cms.VInputTag(["impactParameterTagInfos","secondaryVertexTagInfos"]) ) + ## puppi met - process.load('RecoMET.METProducers.pfMetPuppi_cfi') - _rerun_puppimet_task = task.copy() - _rerun_puppimet_task.add(process.puppiNoLep, process.pfMetPuppi) - (_run2_miniAOD_ANY | pA_2016 | pp_on_AA_2018).toReplaceWith(task, _rerun_puppimet_task) + def _add_metPuppi(process): + process.load('RecoMET.METProducers.pfMetPuppi_cfi') + _rerun_puppimet_task = task.copy() + _rerun_puppimet_task.add(process.puppiNoLep, process.pfMetPuppi) + (_run2_miniAOD_ANY | pA_2016 | pp_on_AA_2018).toReplaceWith(task, _rerun_puppimet_task) - runMetCorAndUncForMiniAODProduction(process, metType="Puppi", - jetCollUnskimmed="slimmedJetsPuppi", - recoMetFromPFCs=True, - jetFlavor="AK4PFPuppi", - postfix="Puppi" + runMetCorAndUncForMiniAODProduction(process, metType="Puppi", + jetCollUnskimmed="slimmedJetsPuppi", + recoMetFromPFCs=True, + jetFlavor="AK4PFPuppi", + postfix="Puppi" ) - + (~_hiGeneral).toModify(process, _add_metPuppi) + process.load('PhysicsTools.PatAlgos.slimming.slimmedMETs_cfi') task.add(process.slimmedMETs) - addToProcessAndTask('slimmedMETsPuppi', process.slimmedMETs.clone(), process, task) - process.slimmedMETsPuppi.src = cms.InputTag("patMETsPuppi") - process.slimmedMETsPuppi.rawVariation = cms.InputTag("patPFMetPuppi") - process.slimmedMETsPuppi.t1Uncertainties = cms.InputTag("patPFMetT1%sPuppi") - process.slimmedMETsPuppi.t01Variation = cms.InputTag("patPFMetT0pcT1Puppi") - process.slimmedMETsPuppi.t1SmearedVarsAndUncs = cms.InputTag("patPFMetT1Smear%sPuppi") - process.slimmedMETsPuppi.tXYUncForRaw = cms.InputTag("patPFMetTxyPuppi") - process.slimmedMETsPuppi.tXYUncForT1 = cms.InputTag("patPFMetT1TxyPuppi") - process.slimmedMETsPuppi.tXYUncForT01 = cms.InputTag("patPFMetT0pcT1TxyPuppi") - process.slimmedMETsPuppi.tXYUncForT1Smear = cms.InputTag("patPFMetT1SmearTxyPuppi") - process.slimmedMETsPuppi.tXYUncForT01Smear = cms.InputTag("patPFMetT0pcT1SmearTxyPuppi") - del process.slimmedMETsPuppi.caloMET - - process.load('RecoMET.METPUSubtraction.deepMETProducer_cfi') - - addToProcessAndTask('deepMETsResolutionTune', process.deepMETProducer.clone(), process, task) - addToProcessAndTask('deepMETsResponseTune', process.deepMETProducer.clone(), process, task) - process.deepMETsResponseTune.graph_path = 'RecoMET/METPUSubtraction/data/deepmet/deepmet_resp_v1_2018.pb' - - from Configuration.Eras.Modifier_phase2_common_cff import phase2_common - phase2_common.toModify( - process.deepMETsResolutionTune, - max_n_pf=12500, - graph_path="RecoMET/METPUSubtraction/data/deepmet/deepmet_v1_phase2.pb" - ) - phase2_common.toModify( - process.deepMETsResponseTune, - max_n_pf=12500, - graph_path="RecoMET/METPUSubtraction/data/deepmet/deepmet_resp_v1_phase2.pb" - ) - from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016 - run2_jme_2016.toModify( - process.deepMETsResponseTune, - graph_path="RecoMET/METPUSubtraction/data/deepmet/deepmet_resp_v1_2016.pb" - ) + def _add_slimmedMETsPuppi(process): + addToProcessAndTask('slimmedMETsPuppi', process.slimmedMETs.clone(), process, task) + process.slimmedMETsPuppi.src = cms.InputTag("patMETsPuppi") + process.slimmedMETsPuppi.rawVariation = cms.InputTag("patPFMetPuppi") + process.slimmedMETsPuppi.t1Uncertainties = cms.InputTag("patPFMetT1%sPuppi") + process.slimmedMETsPuppi.t01Variation = cms.InputTag("patPFMetT0pcT1Puppi") + process.slimmedMETsPuppi.t1SmearedVarsAndUncs = cms.InputTag("patPFMetT1Smear%sPuppi") + process.slimmedMETsPuppi.tXYUncForRaw = cms.InputTag("patPFMetTxyPuppi") + process.slimmedMETsPuppi.tXYUncForT1 = cms.InputTag("patPFMetT1TxyPuppi") + process.slimmedMETsPuppi.tXYUncForT01 = cms.InputTag("patPFMetT0pcT1TxyPuppi") + process.slimmedMETsPuppi.tXYUncForT1Smear = cms.InputTag("patPFMetT1SmearTxyPuppi") + process.slimmedMETsPuppi.tXYUncForT01Smear = cms.InputTag("patPFMetT0pcT1SmearTxyPuppi") + del process.slimmedMETsPuppi.caloMET + (~_hiGeneral).toModify(process, _add_slimmedMETsPuppi) + + def _add_deepMET(process): + process.load('RecoMET.METPUSubtraction.deepMETProducer_cfi') + + addToProcessAndTask('deepMETsResolutionTune', process.deepMETProducer.clone(), process, task) + addToProcessAndTask('deepMETsResponseTune', process.deepMETProducer.clone(), process, task) + process.deepMETsResponseTune.graph_path = 'RecoMET/METPUSubtraction/data/deepmet/deepmet_resp_v1_2018.pb' + + from Configuration.Eras.Modifier_phase2_common_cff import phase2_common + phase2_common.toModify( + process.deepMETsResolutionTune, + max_n_pf=12500, + graph_path="RecoMET/METPUSubtraction/data/deepmet/deepmet_v1_phase2.pb" + ) + phase2_common.toModify( + process.deepMETsResponseTune, + max_n_pf=12500, + graph_path="RecoMET/METPUSubtraction/data/deepmet/deepmet_resp_v1_phase2.pb" + ) + + from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016 + run2_jme_2016.toModify( + process.deepMETsResponseTune, + graph_path="RecoMET/METPUSubtraction/data/deepmet/deepmet_resp_v1_2016.pb" + ) + (~_hiGeneral).toModify(process, _add_deepMET) + # add DetIdAssociatorRecords to EventSetup (for isolatedTracks) process.load("TrackingTools.TrackAssociator.DetIdAssociatorESProducer_cff") @@ -522,6 +554,9 @@ def miniAOD_customizeCommon(process): stage2L1Trigger_2017.toModify(process.prefiringweight, DataEra = "2017BtoF") run2_L1prefiring.toModify(task, func=lambda t: t.add(process.prefiringweight)) + from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import removeL1FastJetJECs + _hiGeneral.toModify(process, removeL1FastJetJECs) + def miniAOD_customizeMC(process): task = getPatAlgosToolsTask(process) #GenJetFlavourInfos @@ -555,7 +590,7 @@ def miniAOD_customizeMC(process): process.patJetPartonMatch.matched = "prunedGenParticles" process.patJetPartonMatch.mcStatus = [ 3, 23 ] process.patJetGenJetMatch.matched = "slimmedGenJets" - process.patJetGenJetMatchAK8Puppi.matched = "slimmedGenJetsAK8" + (~_hiGeneral).toModify(process, patJetGenJetMatchAK8Puppi = dict(matched = "slimmedGenJetsAK8")) process.patMuons.embedGenMatch = False process.patElectrons.embedGenMatch = False process.patPhotons.embedGenMatch = False @@ -565,6 +600,10 @@ def miniAOD_customizeMC(process): process.patJets.embedGenPartonMatch = False #also jet flavour must be switched process.patJetFlavourAssociation.rParam = 0.4 + + from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import removeJECsForMC + _hiGeneral.toModify(process, removeJECsForMC) + def miniAOD_customizeOutput(out): from PhysicsTools.PatAlgos.slimming.MicroEventContent_cff import MiniAODOverrideBranchesSplitLevel diff --git a/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py b/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py index d94780c03c7d5..933250f78239c 100644 --- a/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py @@ -49,3 +49,6 @@ from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing phase2_timing.toModify(packedPFCandidates, storeTiming = cms.bool(True)) +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(packedPFCandidates, PuppiSrc = "", PuppiNoLepSrc = "") diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py index d41d0fcc42b8f..f92987c92a3c5 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py @@ -5,3 +5,6 @@ cut = cms.string("pt>20") ) +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(slimmedCaloJets, src = 'akPu4CaloJets') diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py index beecfd0d794f1..83709c6d51c9b 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py @@ -19,3 +19,7 @@ clearDaughters = cms.bool(False), #False means rekeying dropSpecific = cms.bool(False), ) + +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(slimmedGenJetsAK8, cut = 'pt>9999', nLoose = 0) diff --git a/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py b/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py index 597725bad1b6d..9e9a1f8c90151 100644 --- a/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py +++ b/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py @@ -16,3 +16,7 @@ jetDirectionUsingGhostTrack = cms.bool(False), useTrackQuality = cms.bool(False) ) + +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(impactParameterTagInfos, jetTracks = "ak5JetTracksAssociatorAtVertex") diff --git a/RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py b/RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py index 26ac7fd1adbd5..1bc7d1c680ba4 100644 --- a/RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py +++ b/RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py @@ -9,10 +9,10 @@ PFTowers = _mod.particleTowerProducer.clone(useHF = True) #dummy sequence to speed-up reconstruction in pp_on_AA era -pfNoPileUpJMEHI = cms.EDFilter('GenericPFCandidateSelector', - src = cms.InputTag('particleFlow'), - cut = cms.string("pt>9999") - ) +pfEmptyCollection = cms.EDFilter('GenericPFCandidateSelector', + src = cms.InputTag('particleFlow'), + cut = cms.string("pt<0") + ) ak5PFJets = cms.EDProducer( "FastjetJetProducer", diff --git a/RecoHI/HiTracking/python/highPurityGeneralTracks_cfi.py b/RecoHI/HiTracking/python/highPurityGeneralTracks_cfi.py new file mode 100644 index 0000000000000..2ed339f8773a4 --- /dev/null +++ b/RecoHI/HiTracking/python/highPurityGeneralTracks_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +highPurityGeneralTracks = cms.EDFilter( + 'TrackSelector', + src = cms.InputTag('generalTracks'), + cut = cms.string('quality("highPurity")'), + ) diff --git a/RecoJets/Configuration/python/RecoPFJets_cff.py b/RecoJets/Configuration/python/RecoPFJets_cff.py index a44f4e5ae2e8b..955ef43688f67 100644 --- a/RecoJets/Configuration/python/RecoPFJets_cff.py +++ b/RecoJets/Configuration/python/RecoPFJets_cff.py @@ -84,7 +84,7 @@ ) recoPFJetsWithSubstructure=cms.Sequence(recoPFJetsWithSubstructureTask) -from RecoHI.HiJetAlgos.HiRecoPFJets_cff import PFTowers, akPu3PFJets, akPu4PFJets, kt4PFJetsForRho, ak4PFJetsForFlow, akCs4PFJets, pfNoPileUpJMEHI, hiFJRhoFlowModulation, hiPuRho, hiPFCandCleanerforJets +from RecoHI.HiJetAlgos.HiRecoPFJets_cff import PFTowers, akPu3PFJets, akPu4PFJets, kt4PFJetsForRho, ak4PFJetsForFlow, akCs4PFJets, pfEmptyCollection, hiFJRhoFlowModulation, hiPuRho, hiPFCandCleanerforJets from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer @@ -93,7 +93,7 @@ fixedGridRhoFastjetCentral, fixedGridRhoFastjetCentralChargedPileUp, fixedGridRhoFastjetCentralNeutral, - pfNoPileUpJMEHI, + pfEmptyCollection, ak4PFJets, ak4PFJetsCHS, PFTowers, diff --git a/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py b/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py index 75d19cbb364b2..29228c9866218 100644 --- a/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py +++ b/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py @@ -40,3 +40,10 @@ ak5JTAExplicitTask = cms.Task(ak5JetTracksAssociatorExplicit) ak5JTAExplicit = cms.Sequence(ak5JTAExplicitTask) + +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(ak5JetTracksAssociatorAtVertex, + jets = "akCs4PFJets", + tracks = "highPurityGeneralTracks" + ) diff --git a/RecoJets/JetProducers/python/ak4PFJets_cfi.py b/RecoJets/JetProducers/python/ak4PFJets_cfi.py index fdbeafce74131..60954a960a4bf 100644 --- a/RecoJets/JetProducers/python/ak4PFJets_cfi.py +++ b/RecoJets/JetProducers/python/ak4PFJets_cfi.py @@ -36,5 +36,7 @@ jetPtMin = 100.0 ) from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(ak4PFJets,src = "pfNoPileUpJMEHI", inputEtMin = 9999) -pp_on_AA_2018.toModify(ak4PFJetsCHS,src = "pfNoPileUpJMEHI", inputEtMin = 9999) +from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak4PFJets, src = "pfEmptyCollection") +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak4PFJetsCHS, src = "pfEmptyCollection") +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak4PFJetsPuppi, src = "pfEmptyCollection") diff --git a/RecoJets/JetProducers/python/ak8PFJets_cfi.py b/RecoJets/JetProducers/python/ak8PFJets_cfi.py index db0c4b45b543c..ea7e09882989f 100644 --- a/RecoJets/JetProducers/python/ak8PFJets_cfi.py +++ b/RecoJets/JetProducers/python/ak8PFJets_cfi.py @@ -26,7 +26,9 @@ ) from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(ak8PFJetsCHS,src = "pfNoPileUpJMEHI", inputEtMin = 9999) +from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak8PFJetsCHS, src = "pfEmptyCollection") +(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak8PFJetsPuppi, src = "pfEmptyCollection") ak8PFJetsCS = ak8PFJets.clone( useConstituentSubtraction = cms.bool(True),