diff --git a/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cff.py b/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cff.py index 81c0a71986c78..4d8f415e40170 100644 --- a/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cff.py +++ b/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cff.py @@ -26,23 +26,24 @@ # ECAL multifit running on GPU from RecoLocalCalo.EcalRecProducers.ecalUncalibRecHitProducerGPU_cfi import ecalUncalibRecHitProducerGPU as _ecalUncalibRecHitProducerGPU ecalMultiFitUncalibRecHitGPU = _ecalUncalibRecHitProducerGPU.clone( - digisLabelEB = cms.InputTag('ecalDigisGPU', 'ebDigis'), - digisLabelEE = cms.InputTag('ecalDigisGPU', 'eeDigis'), + digisLabelEB = 'ecalDigisGPU:ebDigis', + digisLabelEE = 'ecalDigisGPU:eeDigis', ) # copy the uncalibrated rechits from GPU to CPU from RecoLocalCalo.EcalRecProducers.ecalCPUUncalibRecHitProducer_cfi import ecalCPUUncalibRecHitProducer as _ecalCPUUncalibRecHitProducer ecalMultiFitUncalibRecHitSoA = _ecalCPUUncalibRecHitProducer.clone( - recHitsInLabelEB = cms.InputTag('ecalMultiFitUncalibRecHitGPU', 'EcalUncalibRecHitsEB'), - recHitsInLabelEE = cms.InputTag('ecalMultiFitUncalibRecHitGPU', 'EcalUncalibRecHitsEE'), + recHitsInLabelEB = 'ecalMultiFitUncalibRecHitGPU:EcalUncalibRecHitsEB', + recHitsInLabelEE = 'ecalMultiFitUncalibRecHitGPU:EcalUncalibRecHitsEE', + containsTimingInformation = True ) # convert the uncalibrated rechits from SoA to legacy format from RecoLocalCalo.EcalRecProducers.ecalUncalibRecHitConvertGPU2CPUFormat_cfi import ecalUncalibRecHitConvertGPU2CPUFormat as _ecalUncalibRecHitConvertGPU2CPUFormat gpu.toModify(ecalMultiFitUncalibRecHit, cuda = _ecalUncalibRecHitConvertGPU2CPUFormat.clone( - recHitsLabelGPUEB = cms.InputTag('ecalMultiFitUncalibRecHitSoA', 'EcalUncalibRecHitsEB'), - recHitsLabelGPUEE = cms.InputTag('ecalMultiFitUncalibRecHitSoA', 'EcalUncalibRecHitsEE'), + recHitsLabelGPUEB = 'ecalMultiFitUncalibRecHitSoA:EcalUncalibRecHitsEB', + recHitsLabelGPUEE = 'ecalMultiFitUncalibRecHitSoA:EcalUncalibRecHitsEE', ) ) diff --git a/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py b/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py index 07b6de10f698a..00f1034335eaf 100644 --- a/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py +++ b/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py @@ -17,3 +17,16 @@ ) ) +# this overrides the modifications made by run3_ecal if both modifiers are active +from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal +gpuValidationEcal.toModify(ecalMultiFitUncalibRecHit, + algoPSet = dict(timealgo = 'RatioMethod', + outOfTimeThresholdGain12pEB = 5., + outOfTimeThresholdGain12mEB = 5., + outOfTimeThresholdGain61pEB = 5., + outOfTimeThresholdGain61mEB = 5., + timeCalibTag = ':', + timeOffsetTag = ':' + ) +) +