From 545958108da3695567236f7991c839c4bfb2b2d6 Mon Sep 17 00:00:00 2001 From: Efe Yigitbasi Date: Fri, 21 Oct 2022 14:45:25 +0200 Subject: [PATCH 1/2] Added support for using Run 3 2022 PC LUTs --- L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc | 5 +++-- L1Trigger/L1TMuonEndCap/src/SectorProcessorLUT.cc | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc b/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc index 94120b717ecae..41b8673e1d00a 100644 --- a/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc +++ b/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc @@ -75,15 +75,16 @@ unsigned int ConditionHelper::get_pc_lut_version() const { // because of rigid CondFormats naming conventions - AWB 02.06.17 // std::cout << " - Getting proper PC LUT version from ConditionHelper: version = " << params_->PhiMatchWindowSt1_ << std::endl; // return params_->PhiMatchWindowSt1_; - // Hack until we figure out why the database is returning "0" for 2017 data - AWB 04.08.17 // std::cout << " - Getting hacked PC LUT version from ConditionHelper: version = " << (params_->firmwareVersion_ >= 50000) << std::endl; if (params_->firmwareVersion_ < 50000) { // For 2016 return 0; } else if (params_->firmwareVersion_ < 1537467271) { // From the beginning of 2017 return 1; // Corresponding to FW timestamps before Sept. 20, 2018 - } else { + } else if (params_->firmwareVersion_ < 1664468309){ // Corresponds to September 29, 2022. The firmware got deployed on October 6, 2022. return 2; // Starting September 26, 2018 with run 323556 (data only, not in MC) + } else { + return 3; // Starting October 6, 2022 with run 359924 (data only, not in MC) } } diff --git a/L1Trigger/L1TMuonEndCap/src/SectorProcessorLUT.cc b/L1Trigger/L1TMuonEndCap/src/SectorProcessorLUT.cc index 88449d68a5997..ddc3bc9e7279b 100644 --- a/L1Trigger/L1TMuonEndCap/src/SectorProcessorLUT.cc +++ b/L1Trigger/L1TMuonEndCap/src/SectorProcessorLUT.cc @@ -25,6 +25,8 @@ void SectorProcessorLUT::read(bool pc_lut_data, int pc_lut_version) { coord_lut_dir = "ph_lut_v2"; // Beginning of 2017, improved alignment from ideal CMS geometry (MC) else if (pc_lut_version == 2 && pc_lut_data) coord_lut_dir = "ph_lut_v3_data"; // Update in September 2017 from ReReco alignment, data only + else if (pc_lut_version == 3 && pc_lut_data) + coord_lut_dir = "ph_lut_Run3_2022_data"; // Update in October 2022 from Run 3 2022 alignment, data only else if (pc_lut_version == 2) coord_lut_dir = "ph_lut_v2"; // MC still uses ideal CMS aligment else if (pc_lut_version == -1 && pc_lut_data) From 1735dc0cd06e980f5c955f56e667f9923b0d12c1 Mon Sep 17 00:00:00 2001 From: Efe Yigitbasi Date: Fri, 21 Oct 2022 14:48:44 +0200 Subject: [PATCH 2/2] Code format --- L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc b/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc index 41b8673e1d00a..742c311c28e5e 100644 --- a/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc +++ b/L1Trigger/L1TMuonEndCap/src/ConditionHelper.cc @@ -81,8 +81,9 @@ unsigned int ConditionHelper::get_pc_lut_version() const { return 0; } else if (params_->firmwareVersion_ < 1537467271) { // From the beginning of 2017 return 1; // Corresponding to FW timestamps before Sept. 20, 2018 - } else if (params_->firmwareVersion_ < 1664468309){ // Corresponds to September 29, 2022. The firmware got deployed on October 6, 2022. - return 2; // Starting September 26, 2018 with run 323556 (data only, not in MC) + } else if (params_->firmwareVersion_ < + 1664468309) { // Corresponds to September 29, 2022. The firmware got deployed on October 6, 2022. + return 2; // Starting September 26, 2018 with run 323556 (data only, not in MC) } else { return 3; // Starting October 6, 2022 with run 359924 (data only, not in MC) }