From 3707636de27f70b296e9041852f89630b526a8b0 Mon Sep 17 00:00:00 2001 From: swagata87 Date: Mon, 13 Feb 2023 18:50:05 +0100 Subject: [PATCH 1/3] update HB threshold for egamma --- .../Eras/python/Era_Run3_2023_cff.py | 20 +++++++++++++++++++ .../python/Modifier_run3_egamma_2023_cff.py | 3 +++ .../StandardSequences/python/Eras.py | 1 + .../python/egammaHBHERecHitThreshold_cff.py | 9 ++++++++- .../python/particleFlowRecHitHBHE_cfi.py | 2 ++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Configuration/Eras/python/Era_Run3_2023_cff.py create mode 100644 Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py diff --git a/Configuration/Eras/python/Era_Run3_2023_cff.py b/Configuration/Eras/python/Era_Run3_2023_cff.py new file mode 100644 index 0000000000000..6ac9acd227d62 --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_2023_cff.py @@ -0,0 +1,20 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 +from Configuration.Eras.Modifier_run3_common_cff import run3_common +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +from Configuration.Eras.Modifier_run3_HB_cff import run3_HB +from Configuration.Eras.Modifier_run3_HFSL_cff import run3_HFSL +from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017 +from Configuration.Eras.Modifier_stage2L1Trigger_2021_cff import stage2L1Trigger_2021 +from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018 +from Configuration.Eras.Modifier_ctpps_2022_cff import ctpps_2022 +from Configuration.ProcessModifiers.dd4hep_cff import dd4hep +from Configuration.Eras.Modifier_run3_egamma_cff import run3_egamma +from Configuration.Eras.Modifier_run2_egamma_2018_cff import run2_egamma_2018 +from Configuration.Eras.Modifier_run3_RPC_cff import run3_RPC +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 + +Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018, run2_egamma_2018]), + run3_common, run3_egamma, run3_egamma_2023, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC) + diff --git a/Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py b/Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py new file mode 100644 index 0000000000000..dc3296a329635 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +run3_egamma_2023 =cms.Modifier() diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 79f7f21b075d7..b40b26f0c254b 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_2023', 'Run3_noMkFit', 'Run3_pp_on_PbPb', 'Run3_pp_on_PbPb_approxSiStripClusters', diff --git a/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py index a020211b9329e..c276700ed4760 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_2023 egammaHBHERecHit = cms.PSet( hbheRecHits = cms.InputTag('hbhereco'), @@ -8,3 +8,10 @@ recHitEThresholdHE = _thresholdsHEphase1, maxHcalRecHitSeverity = cms.int32(9), ) + +egammaHBHERecHit_2023 = egammaHBHERecHit.clone( + recHitEThresholdHB = _thresholdsHBphase1_2023 +) + +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 +run3_egamma_2023.toReplaceWith(egammaHBHERecHit,egammaHBHERecHit_2023) diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py index 815e60d3c2b5a..5d2780e4a414f 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 2023 +_thresholdsHBphase1_2023 = cms.vdouble(0.4, 0.3, 0.3, 0.3) particleFlowRecHitHBHE = cms.EDProducer("PFRecHitProducer", navigator = cms.PSet( From 90231a857d878a0967ff80350076882bc85c72cc Mon Sep 17 00:00:00 2001 From: swagata87 Date: Mon, 13 Feb 2023 19:27:16 +0100 Subject: [PATCH 2/3] fix typo --- Configuration/Eras/python/Era_Run3_2023_cff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Eras/python/Era_Run3_2023_cff.py b/Configuration/Eras/python/Era_Run3_2023_cff.py index 6ac9acd227d62..2337aec44c491 100644 --- a/Configuration/Eras/python/Era_Run3_2023_cff.py +++ b/Configuration/Eras/python/Era_Run3_2023_cff.py @@ -15,6 +15,6 @@ from Configuration.Eras.Modifier_run3_RPC_cff import run3_RPC from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 -Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018, run2_egamma_2018]), +Run3_2023 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018, run2_egamma_2018]), run3_common, run3_egamma, run3_egamma_2023, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC) From e7779012529f626bf2dbb0c177ec2d22ad99a07e Mon Sep 17 00:00:00 2001 From: swagata87 Date: Mon, 13 Feb 2023 19:49:09 +0100 Subject: [PATCH 3/3] clean up Run3_2023 era --- Configuration/Eras/python/Era_Run3_2023_cff.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/Configuration/Eras/python/Era_Run3_2023_cff.py b/Configuration/Eras/python/Era_Run3_2023_cff.py index 2337aec44c491..8b14afa323e92 100644 --- a/Configuration/Eras/python/Era_Run3_2023_cff.py +++ b/Configuration/Eras/python/Era_Run3_2023_cff.py @@ -1,20 +1,6 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 -from Configuration.Eras.Modifier_run3_common_cff import run3_common -from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM -from Configuration.Eras.Modifier_run3_HB_cff import run3_HB -from Configuration.Eras.Modifier_run3_HFSL_cff import run3_HFSL -from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017 -from Configuration.Eras.Modifier_stage2L1Trigger_2021_cff import stage2L1Trigger_2021 -from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018 -from Configuration.Eras.Modifier_ctpps_2022_cff import ctpps_2022 -from Configuration.ProcessModifiers.dd4hep_cff import dd4hep -from Configuration.Eras.Modifier_run3_egamma_cff import run3_egamma -from Configuration.Eras.Modifier_run2_egamma_2018_cff import run2_egamma_2018 -from Configuration.Eras.Modifier_run3_RPC_cff import run3_RPC +from Configuration.Eras.Era_Run3_cff import Run3 from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 -Run3_2023 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018, run2_egamma_2018]), - run3_common, run3_egamma, run3_egamma_2023, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC) - +Run3_2023 = cms.ModifierChain(Run3, run3_egamma_2023)