From 51067fbc70af1ef57a0f6a0f2d7297deefbeba45 Mon Sep 17 00:00:00 2001 From: swagata87 Date: Sun, 7 May 2023 14:59:05 +0200 Subject: [PATCH] new HB thresholds for 2022 data rereco --- .../Eras/python/Era_Run3_2022_rereco_cff.py | 6 ++++++ .../Modifier_run3_egamma_2022_rereco_cff.py | 3 +++ Configuration/StandardSequences/python/Eras.py | 1 + .../python/egammaHBHERecHitThreshold_cff.py | 9 ++++++++- .../python/particleFlowClusterHBHE_cfi.py | 17 ++++++++++++++++- .../python/particleFlowClusterHCAL_cfi.py | 10 ++++++++++ .../python/particleFlowRecHitHBHE_cfi.py | 7 +++++++ 7 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 Configuration/Eras/python/Era_Run3_2022_rereco_cff.py create mode 100644 Configuration/Eras/python/Modifier_run3_egamma_2022_rereco_cff.py diff --git a/Configuration/Eras/python/Era_Run3_2022_rereco_cff.py b/Configuration/Eras/python/Era_Run3_2022_rereco_cff.py new file mode 100644 index 0000000000000..d4f6ed994170c --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_2022_rereco_cff.py @@ -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) diff --git a/Configuration/Eras/python/Modifier_run3_egamma_2022_rereco_cff.py b/Configuration/Eras/python/Modifier_run3_egamma_2022_rereco_cff.py new file mode 100644 index 0000000000000..bb0924bfb4593 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run3_egamma_2022_rereco_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +run3_egamma_2022_rereco = cms.Modifier() diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index be0e15b298cbe..45681124bf649 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -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', diff --git a/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py index a020211b9329e..2b4896da6e272 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py @@ -1,6 +1,6 @@ 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'), @@ -8,3 +8,10 @@ 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) diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py index 3c0e046f48a1c..91870dda03a05 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py @@ -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( @@ -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" diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py index 645f2d1e1b4db..b7b0e994327d0 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py @@ -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"), @@ -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" diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py index 815e60d3c2b5a..f2553c6da6025 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py @@ -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( @@ -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") }