Skip to content
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
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Run3_2022_rereco_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Run3_cff import Run3
from Configuration.Eras.Modifier_run3_egamma_2022_rereco_cff import run3_egamma_2022_rereco

Run3_2022_rereco = cms.ModifierChain(Run3, run3_egamma_2022_rereco)
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

run3_egamma_2022_rereco = cms.Modifier()
1 change: 1 addition & 0 deletions Configuration/StandardSequences/python/Eras.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def __init__(self):
'Run2_2018_highBetaStar',
'Run2_2018_noMkFit',
'Run3',
'Run3_2022_rereco',
'Run3_noMkFit',
'Run3_pp_on_PbPb',
'Run3_dd4hep',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import FWCore.ParameterSet.Config as cms

from RecoParticleFlow.PFClusterProducer.particleFlowRecHitHBHE_cfi import _thresholdsHBphase1, _thresholdsHEphase1
from RecoParticleFlow.PFClusterProducer.particleFlowRecHitHBHE_cfi import _thresholdsHBphase1, _thresholdsHEphase1, _thresholdsHBphase1_2022_rereco

egammaHBHERecHit = cms.PSet(
hbheRecHits = cms.InputTag('hbhereco'),
recHitEThresholdHB = _thresholdsHBphase1,
recHitEThresholdHE = _thresholdsHEphase1,
maxHcalRecHitSeverity = cms.int32(9),
)

egammaHBHERecHit_2022_rereco = egammaHBHERecHit.clone(
recHitEThresholdHB = _thresholdsHBphase1_2022_rereco
)

from Configuration.Eras.Modifier_run3_egamma_2022_rereco_cff import run3_egamma_2022_rereco
run3_egamma_2022_rereco.toReplaceWith(egammaHBHERecHit,egammaHBHERecHit_2022_rereco)
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
_seedingThresholdsHE = cms.vdouble(1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1)
_seedingThresholdsHBphase1 = cms.vdouble(0.125, 0.25, 0.35, 0.35)
_seedingThresholdsHEphase1 = cms.vdouble(0.1375, 0.275, 0.275, 0.275, 0.275, 0.275, 0.275)

#updated HB RecHit threshold for 2022 rereco
_thresholdsHBphase1_2022_rereco = cms.vdouble(0.25, 0.25, 0.3, 0.3)
#updated HB seeding threshold for 2022_rereco
_seedingThresholdsHBphase1_2022_rereco = cms.vdouble(0.3625, 0.375, 0.425, 0.425)

#### PF CLUSTER HCAL ####
particleFlowClusterHBHE = cms.EDProducer(
Expand Down Expand Up @@ -142,6 +145,18 @@
),
)

# offline 2022 rereco
from Configuration.Eras.Modifier_run3_egamma_2022_rereco_cff import run3_egamma_2022_rereco
run3_egamma_2022_rereco.toModify(particleFlowClusterHBHE,
seedFinder = dict(thresholdsByDetector = {0 : dict(seedingThreshold = _seedingThresholdsHBphase1_2022_rereco) } ),
initialClusteringStep = dict(thresholdsByDetector = {0 : dict(gatheringThreshold = _thresholdsHBphase1_2022_rereco) } ),
pfClusterBuilder = dict(
recHitEnergyNorms = {0 : dict(recHitEnergyNorm = _thresholdsHBphase1_2022_rereco) },
positionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2022_rereco) } ),
allCellsPositionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2022_rereco) } ),
),
)

# HCALonly WF
particleFlowClusterHBHEOnly = particleFlowClusterHBHE.clone(
recHitsSource = "particleFlowRecHitHBHEOnly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
_thresholdsHE = cms.vdouble(0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8)
_thresholdsHBphase1 = cms.vdouble(0.1, 0.2, 0.3, 0.3)
_thresholdsHEphase1 = cms.vdouble(0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2)
#updated HB RecHit threshold for 2022 rereco
_thresholdsHBphase1_2022_rereco = cms.vdouble(0.25, 0.25, 0.3, 0.3)

particleFlowClusterHCAL = cms.EDProducer('PFMultiDepthClusterProducer',
clustersSource = cms.InputTag("particleFlowClusterHBHE"),
Expand Down Expand Up @@ -51,6 +53,14 @@
),
)

# offline 2022 rereco
from Configuration.Eras.Modifier_run3_egamma_2022_rereco_cff import run3_egamma_2022_rereco
run3_egamma_2022_rereco.toModify(particleFlowClusterHCAL,
pfClusterBuilder = dict(
allCellsPositionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2022_rereco) } ),
),
)

# HCALonly WF
particleFlowClusterHCALOnly = particleFlowClusterHCAL.clone(
clustersSource = "particleFlowClusterHBHEOnly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
_thresholdsHE = cms.vdouble(0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8)
_thresholdsHBphase1 = cms.vdouble(0.1, 0.2, 0.3, 0.3)
_thresholdsHEphase1 = cms.vdouble(0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2)
#updated HB RecHit threshold for 2022 rereco
_thresholdsHBphase1_2022_rereco = cms.vdouble(0.25, 0.25, 0.3, 0.3)

particleFlowRecHitHBHE = cms.EDProducer("PFRecHitProducer",
navigator = cms.PSet(
Expand Down Expand Up @@ -54,6 +56,11 @@
producers = {0 : dict(qualityTests = {0 : dict(cuts = {0 : dict(threshold = _thresholdsHBphase1) } ) } ) },
)

from Configuration.Eras.Modifier_run3_egamma_2022_rereco_cff import run3_egamma_2022_rereco
run3_egamma_2022_rereco.toModify(particleFlowRecHitHBHE,
producers = {0 : dict(qualityTests = {0 : dict(cuts = {0 : dict(threshold = _thresholdsHBphase1_2022_rereco) } ) } ) },
)

# HCALonly WF
particleFlowRecHitHBHEOnly = particleFlowRecHitHBHE.clone(
producers = { 0: dict(src = "hbheprereco") }
Expand Down