diff --git a/Configuration/Eras/python/Era_Run3_cff.py b/Configuration/Eras/python/Era_Run3_cff.py index 1ed3d37cc9caa..51f5f2bee57fe 100644 --- a/Configuration/Eras/python/Era_Run3_cff.py +++ b/Configuration/Eras/python/Era_Run3_cff.py @@ -14,7 +14,8 @@ from Configuration.Eras.Modifier_run2_egamma_2018_cff import run2_egamma_2018 from Configuration.Eras.Modifier_run2_HLTconditions_2018_cff import run2_HLTconditions_2018 from Configuration.Eras.Modifier_run3_RPC_cff import run3_RPC +from Configuration.Eras.Modifier_run3_ecal_cff import run3_ecal Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018, run2_egamma_2018, run2_HLTconditions_2018]), - run3_common, run3_egamma, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC) + run3_common, run3_egamma, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC, run3_ecal) diff --git a/Configuration/Eras/python/Modifier_run3_ecal_cff.py b/Configuration/Eras/python/Modifier_run3_ecal_cff.py new file mode 100644 index 0000000000000..7c2966e2f5269 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run3_ecal_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +run3_ecal = cms.Modifier() + diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc index b23e670065b8c..39753547ee7ca 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc +++ b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc @@ -740,7 +740,7 @@ edm::ParameterSetDescription EcalUncalibRecHitWorkerMultiFit::getAlgoDescription edm::ParameterDescription("addPedestalUncertaintyEB", 0., true) and edm::ParameterDescription("addPedestalUncertaintyEE", 0., true) and edm::ParameterDescription("simplifiedNoiseModelForGainSwitch", true, true) and - edm::ParameterDescription("timealgo", "crossCorrelationMethod", true) and + edm::ParameterDescription("timealgo", "RatioMethod", true) and edm::ParameterDescription>("EBtimeFitParameters", {-2.015452e+00, 3.130702e+00, @@ -773,10 +773,10 @@ edm::ParameterSetDescription EcalUncalibRecHitWorkerMultiFit::getAlgoDescription edm::ParameterDescription("EEtimeConstantTerm", 1.0, true) and edm::ParameterDescription("EBtimeNconst", 28.5, true) and edm::ParameterDescription("EEtimeNconst", 31.8, true) and - edm::ParameterDescription("outOfTimeThresholdGain12pEB", 2.5, true) and - edm::ParameterDescription("outOfTimeThresholdGain12mEB", 2.5, true) and - edm::ParameterDescription("outOfTimeThresholdGain61pEB", 2.5, true) and - edm::ParameterDescription("outOfTimeThresholdGain61mEB", 2.5, true) and + edm::ParameterDescription("outOfTimeThresholdGain12pEB", 5., true) and + edm::ParameterDescription("outOfTimeThresholdGain12mEB", 5., true) and + edm::ParameterDescription("outOfTimeThresholdGain61pEB", 5., true) and + edm::ParameterDescription("outOfTimeThresholdGain61mEB", 5., true) and edm::ParameterDescription("outOfTimeThresholdGain12pEE", 1000, true) and edm::ParameterDescription("outOfTimeThresholdGain12mEE", 1000, true) and edm::ParameterDescription("outOfTimeThresholdGain61pEE", 1000, true) and diff --git a/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py b/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py index 33d4a1caac468..07b6de10f698a 100644 --- a/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py +++ b/RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py @@ -3,3 +3,17 @@ # producer of rechits starting from digis ecalMultiFitUncalibRecHit = _mod.ecalMultiFitUncalibRecHitProducer.clone() +# use CC timing method for Run3 and Phase 2 (carried over from Run3 era) +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Modifier_run3_ecal_cff import run3_ecal +run3_ecal.toModify(ecalMultiFitUncalibRecHit, + algoPSet = dict(timealgo = 'crossCorrelationMethod', + outOfTimeThresholdGain12pEB = 2.5, + outOfTimeThresholdGain12mEB = 2.5, + outOfTimeThresholdGain61pEB = 2.5, + outOfTimeThresholdGain61mEB = 2.5, + timeCalibTag = ':CC', + timeOffsetTag = ':CC' + ) +) +