Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ECAL ratio timing algorithm for Run 1 and Run 2, and CC timing algorithm for Run 3 and beyond #42928

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Use ECAL ratio timing algorithm for Run 1 and Run 2, and CC timing algorithm for Run 3 and beyond #42928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e5e58d
Get the CC labelled timing conditions for ECAL reconstruction for Run…
thomreis Sep 29, 2023
3814335
Drop CMS type specifications for ECAL time conditions modification.
thomreis Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Run3_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

4 changes: 4 additions & 0 deletions Configuration/Eras/python/Modifier_run3_ecal_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

run3_ecal = cms.Modifier()

10 changes: 5 additions & 5 deletions RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ edm::ParameterSetDescription EcalUncalibRecHitWorkerMultiFit::getAlgoDescription
edm::ParameterDescription<double>("addPedestalUncertaintyEB", 0., true) and
edm::ParameterDescription<double>("addPedestalUncertaintyEE", 0., true) and
edm::ParameterDescription<bool>("simplifiedNoiseModelForGainSwitch", true, true) and
edm::ParameterDescription<std::string>("timealgo", "crossCorrelationMethod", true) and
edm::ParameterDescription<std::string>("timealgo", "RatioMethod", true) and
edm::ParameterDescription<std::vector<double>>("EBtimeFitParameters",
{-2.015452e+00,
3.130702e+00,
Expand Down Expand Up @@ -773,10 +773,10 @@ edm::ParameterSetDescription EcalUncalibRecHitWorkerMultiFit::getAlgoDescription
edm::ParameterDescription<double>("EEtimeConstantTerm", 1.0, true) and
edm::ParameterDescription<double>("EBtimeNconst", 28.5, true) and
edm::ParameterDescription<double>("EEtimeNconst", 31.8, true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain12pEB", 2.5, true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain12mEB", 2.5, true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain61pEB", 2.5, true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain61mEB", 2.5, true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain12pEB", 5., true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain12mEB", 5., true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain61pEB", 5., true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain61mEB", 5., true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain12pEE", 1000, true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain12mEE", 1000, true) and
edm::ParameterDescription<double>("outOfTimeThresholdGain61pEE", 1000, true) and
Expand Down
14 changes: 14 additions & 0 deletions RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)
)