From 80f9d6697de03aa70581c25f6cafcb63f7f09974 Mon Sep 17 00:00:00 2001 From: gk199 Date: Tue, 20 Jun 2023 09:33:14 +0200 Subject: [PATCH] two files updated to match HCAL TDC LUT deployed online June 12 --- .../HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc | 12 ++++++------ .../HcalTrigPrimAlgos/interface/HcalFinegrainBit.h | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc b/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc index 96149a0560a0b..106e31fc103ae 100644 --- a/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc +++ b/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc @@ -286,12 +286,12 @@ void HcalDigiToRawuHTR::fillDescriptions(edm::ConfigurationDescriptions& descrip // Please change this to state exactly what you do use, even if it is no parameters edm::ParameterSetDescription desc; desc.addUntracked("Verbosity", 0); - desc.add>("tdc1", {8, 14, 15, 17, 8, 14, 15, 17, 8, 14, 14, 17, 8, 14, 14, 17, 8, 13, 14, 16, 8, 13, - 14, 16, 8, 12, 14, 15, 8, 12, 14, 15, 7, 12, 13, 15, 7, 12, 13, 15, 7, 12, 13, 15, - 7, 12, 13, 15, 7, 11, 12, 14, 7, 11, 12, 14, 7, 11, 12, 14, 7, 11, 12, 7}); - desc.add>("tdc2", {10, 16, 17, 19, 10, 16, 17, 19, 10, 16, 16, 19, 10, 16, 16, 19, 10, 15, 16, 18, 10, 15, - 16, 18, 10, 14, 16, 17, 10, 14, 16, 17, 9, 14, 15, 17, 9, 14, 15, 17, 9, 14, 15, 17, - 9, 14, 15, 17, 9, 13, 14, 16, 9, 13, 14, 16, 9, 13, 14, 16, 9, 13, 14, 9}); + desc.add>("tdc1", {12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12}); + desc.add>("tdc2", {14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14}); desc.add("packHBTDC", true); desc.add("ElectronicsMap", ""); desc.add("QIE10", edm::InputTag("simHcalDigis", "HFQIE10DigiCollection")); diff --git a/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFinegrainBit.h b/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFinegrainBit.h index f2a10aa6e7e8c..8129082d25961 100644 --- a/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFinegrainBit.h +++ b/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFinegrainBit.h @@ -27,13 +27,13 @@ class HcalFinegrainBit { // define prompt-delayed TDC range. Note this is offset from depth and ieta by 1 const int tdc_boundary[29][7] = { - {8, 14, 15, 17, 0, 0, 0}, {8, 14, 15, 17, 0, 0, 0}, {8, 14, 14, 17, 0, 0, 0}, {8, 14, 14, 17, 0, 0, 0}, - {8, 13, 14, 16, 0, 0, 0}, {8, 13, 14, 16, 0, 0, 0}, {8, 12, 14, 15, 0, 0, 0}, {8, 12, 14, 15, 0, 0, 0}, - {7, 12, 13, 15, 0, 0, 0}, {7, 12, 13, 15, 0, 0, 0}, {7, 12, 13, 15, 0, 0, 0}, {7, 12, 13, 15, 0, 0, 0}, - {7, 11, 12, 14, 0, 0, 0}, {7, 11, 12, 14, 0, 0, 0}, {7, 11, 12, 14, 0, 0, 0}, {7, 11, 12, 7, 0, 0, 0}, - {0, 12, 10, 0, 0, 0, 0}, {0, 9, 10, 9, 10, 0, 0}, {16, 9, 9, 9, 11, 10, 0}, {17, 8, 9, 8, 9, 10, 0}, - {9, 7, 7, 7, 9, 6, 0}, {8, 7, 7, 6, 6, 6, 0}, {8, 6, 6, 6, 7, 7, 0}, {7, 6, 6, 6, 7, 6, 0}, - {7, 6, 6, 6, 6, 6, 0}, {6, 6, 6, 6, 6, 6, 0}, {6, 5, 6, 6, 6, 7, 10}, {9, 9, 9, 5, 5, 6, 6}, + {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, + {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, + {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, + {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, {12, 12, 12, 12, 0, 0, 0}, + {0, 12, 10, 0, 0, 0, 0}, {0, 9, 10, 9, 10, 0, 0}, {16, 9, 9, 9, 11, 10, 0}, {17, 8, 9, 8, 9, 10, 0}, + {9, 7, 7, 7, 9, 6, 0}, {8, 7, 7, 6, 6, 6, 0}, {8, 6, 6, 6, 7, 7, 0}, {7, 6, 6, 6, 7, 6, 0}, + {7, 6, 6, 6, 6, 6, 0}, {6, 6, 6, 6, 6, 6, 0}, {6, 5, 6, 6, 6, 7, 10}, {9, 9, 9, 5, 5, 6, 6}, {0, 0, 0, 0, 0, 0, 0}}; };