From 7777bb4287d3712324d67efae3de9e1029bdac5e Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Fri, 26 Jan 2024 13:21:06 +0100 Subject: [PATCH 1/2] Set correct CC tag labels for ECAL RecHit Producer. --- .../clients/ecal_dqm_sourceclient-live_cfg.py | 2 ++ .../EcalRecProducers/python/ecalRecHit_cfi.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py index ef96ea65c011a..e53816afe6e6a 100644 --- a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py @@ -60,6 +60,8 @@ process.ecalMultiFitUncalibRecHit.cpu.algoPSet.outOfTimeThresholdGain61mEB = 5. process.ecalMultiFitUncalibRecHit.cpu.algoPSet.timeCalibTag = ':' process.ecalMultiFitUncalibRecHit.cpu.algoPSet.timeOffsetTag = ':' +process.ecalRecHit.cpu.timeCalibTag = ':' +process.ecalRecHit.cpu.timeOffsetTag = ':' process.ecalPhysicsFilter = cms.EDFilter("EcalMonitorPrescaler", cosmics = cms.untracked.uint32(1), diff --git a/RecoLocalCalo/EcalRecProducers/python/ecalRecHit_cfi.py b/RecoLocalCalo/EcalRecProducers/python/ecalRecHit_cfi.py index a7f2772724661..6ee0e23689449 100644 --- a/RecoLocalCalo/EcalRecProducers/python/ecalRecHit_cfi.py +++ b/RecoLocalCalo/EcalRecProducers/python/ecalRecHit_cfi.py @@ -99,6 +99,20 @@ recoverEBIsolatedChannels = False ) +# use CC timing method for Run3 and Phase 2 (carried over from Run3 era) +from Configuration.Eras.Modifier_run3_ecal_cff import run3_ecal +run3_ecal.toModify(ecalRecHit, + timeCalibTag = ':CC', + timeOffsetTag = ':CC' +) + +# this overrides the modifications made by run3_ecal if both modifiers are active +from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal +gpuValidationEcal.toModify(ecalRecHit, + timeCalibTag = ':', + timeOffsetTag = ':' +) + # Phase 2 modifications from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel phase2_ecal_devel.toModify(ecalRecHit, From d32ddc2160e9ccb664dcc1319f4611f67acf873f Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Wed, 31 Jan 2024 11:39:22 +0100 Subject: [PATCH 2/2] Update ecalRecHit config in ecalcalib sourceclient. --- .../python/clients/ecalcalib_dqm_sourceclient-live_cfg.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py index e1598f63dfb0c..46c1c388cc57d 100644 --- a/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py @@ -183,6 +183,8 @@ process.ecalRecHit.EEuncalibRecHitCollection = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEE" process.ecalRecHit.EBuncalibRecHitCollection = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEB" +process.ecalRecHit.timeCalibTag = ':' +process.ecalRecHit.timeOffsetTag = ':' process.ecalPNDiodeMonitorTask.verbosity = 0 process.ecalPNDiodeMonitorTask.commonParameters.onlineMode = True