Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run3JetID #40710

Merged
merged 1 commit into from
Feb 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Run2_2018_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
from Configuration.Eras.Modifier_run2_jme_2017_cff import run2_jme_2017
from Configuration.Eras.Modifier_run2_jme_2018_cff import run2_jme_2018
from Configuration.Eras.Modifier_stage2L1Trigger_2018_cff import stage2L1Trigger_2018

Run2_2018 = cms.ModifierChain(Run2_2017.copyAndExclude([run2_HEPlan1_2017, run2_muon_2017, run2_L1prefiring, run2_HLTconditions_2017, run2_egamma_2017, ctpps_2017, run2_jme_2017]),
run2_CSC_2018, run2_HCAL_2018, run2_HB_2018, run2_HE_2018,run2_DT_2018, run2_SiPixel_2018,
run2_HLTconditions_2018, run2_muon_2018, run2_egamma_2018, ctpps_2018, stage2L1Trigger_2018
run2_HLTconditions_2018, run2_muon_2018, run2_egamma_2018, ctpps_2018, stage2L1Trigger_2018, run2_jme_2018
)
3 changes: 3 additions & 0 deletions Configuration/Eras/python/Modifier_run2_jme_2018_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

run2_jme_2018 =cms.Modifier()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

run3_jme_Winter22runsBCDEprompt =cms.Modifier()
16 changes: 14 additions & 2 deletions PhysicsTools/NanoAOD/python/jetsAK4_CHS_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
)
tightJetId = cms.EDProducer("PatJetIDValueMapProducer",
filterParams=cms.PSet(
version = cms.string('RUN2ULCHS'),
version = cms.string('RUN3WINTER22CHS'),
quality = cms.string('TIGHT'),
),
src = cms.InputTag("updatedJets")
)
tightJetIdLepVeto = cms.EDProducer("PatJetIDValueMapProducer",
filterParams=cms.PSet(
version = cms.string('RUN2ULCHS'),
version = cms.string('RUN3WINTER22CHS'),
quality = cms.string('TIGHTLEPVETO'),
),
src = cms.InputTag("updatedJets")
Expand All @@ -54,6 +54,18 @@
tightJetIdLepVeto.filterParams, version = "RUN2UL16CHS"
)

(run2_jme_2017 | run2_jme_2018).toModify(
tightJetId.filterParams, version = "RUN2ULCHS"
).toModify(
tightJetIdLepVeto.filterParams, version = "RUN2ULCHS"
)

run3_jme_Winter22runsBCDEprompt.toModify(
tightJetId.filterParams, version = "RUN3WINTER22CHSrunsBCDEprompt"
).toModify(
tightJetIdLepVeto.filterParams, version = "RUN3WINTER22CHSrunsBCDEprompt"
)

bJetVars = cms.EDProducer("JetRegressionVarProducer",
pvsrc = cms.InputTag("offlineSlimmedPrimaryVertices"),
src = cms.InputTag("updatedJets"),
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@

tightJetPuppiId = cms.EDProducer("PatJetIDValueMapProducer",
filterParams=cms.PSet(
version = cms.string('RUN2ULPUPPI'),
version = cms.string('RUN3WINTER22PUPPI'),
quality = cms.string('TIGHT'),
),
src = cms.InputTag("updatedJetsPuppi")
)
tightJetPuppiIdLepVeto = cms.EDProducer("PatJetIDValueMapProducer",
filterParams=cms.PSet(
version = cms.string('RUN2ULPUPPI'),
version = cms.string('RUN3WINTER22PUPPI'),
quality = cms.string('TIGHTLEPVETO'),
),
src = cms.InputTag("updatedJetsPuppi")
Expand Down
16 changes: 14 additions & 2 deletions PhysicsTools/NanoAOD/python/jetsAK8_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
)
tightJetIdAK8 = cms.EDProducer("PatJetIDValueMapProducer",
filterParams=cms.PSet(
version = cms.string('RUN2ULPUPPI'),
version = cms.string('RUN3WINTER22PUPPI'),
quality = cms.string('TIGHT'),
),
src = cms.InputTag("updatedJetsAK8")
)
tightJetIdLepVetoAK8 = cms.EDProducer("PatJetIDValueMapProducer",
filterParams=cms.PSet(
version = cms.string('RUN2ULPUPPI'),
version = cms.string('RUN3WINTER22PUPPI'),
quality = cms.string('TIGHTLEPVETO'),
),
src = cms.InputTag("updatedJetsAK8")
Expand All @@ -54,6 +54,18 @@
tightJetIdLepVetoAK8.filterParams, version = "RUN2UL16PUPPI"
)

(run2_jme_2017 | run2_jme_2018).toModify(
tightJetIdAK8.filterParams, version = "RUN2ULPUPPI"
).toModify(
tightJetIdLepVetoAK8.filterParams, version = "RUN2ULPUPPI"
)

run3_jme_Winter22runsBCDEprompt.toModify(
tightJetIdAK8.filterParams, version = "RUN3WINTER22PUPPIrunsBCDEprompt"
).toModify(
tightJetIdLepVetoAK8.filterParams, version = "RUN3WINTER22PUPPIrunsBCDEprompt"
)

updatedJetsAK8WithUserData = cms.EDProducer("PATJetUserDataEmbedder",
src = cms.InputTag("updatedJetsAK8"),
userFloats = cms.PSet(),
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/NanoAOD/python/nano_eras_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from Configuration.Eras.Modifier_run2_egamma_2018_cff import run2_egamma_2018
from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016
from Configuration.Eras.Modifier_run2_jme_2017_cff import run2_jme_2017
from Configuration.Eras.Modifier_run2_jme_2018_cff import run2_jme_2018
from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
from Configuration.Eras.Modifier_run2_muon_2018_cff import run2_muon_2018

Expand All @@ -15,6 +16,7 @@

from Configuration.Eras.Modifier_run3_nanoAOD_122_cff import run3_nanoAOD_122
from Configuration.Eras.Modifier_run3_nanoAOD_124_cff import run3_nanoAOD_124
from Configuration.Eras.Modifier_run3_jme_Winter22runsBCDEprompt_cff import run3_jme_Winter22runsBCDEprompt

run2_nanoAOD_ANY = (
run2_nanoAOD_106Xv2
Expand Down
Loading