From . * [new ref] -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/46543/head -> cms-sw/refs/pull/46543/head Switched to branch 'merge-attempt' Auto-merging L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc Merge made by the 'ort' strategy. L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc | 12 ++--- L1Trigger/L1TCaloLayer1/plugins/L1TCaloSummary.cc | 15 +++--- L1Trigger/L1TCaloLayer1/src/UCTLayer1.cc | 4 +- L1Trigger/L1TCaloLayer1/src/UCTLayer1.hh | 5 +- L1Trigger/L1TCaloLayer1/src/UCTRegion.cc | 29 +++++----- L1Trigger/L1TCaloLayer1/src/UCTRegion.hh | 17 +++--- L1Trigger/L1TCaloLayer1/src/UCTSummaryCard.cc | 65 ++++++----------------- L1Trigger/L1TCaloLayer1/src/UCTSummaryCard.hh | 51 +++++++----------- L1Trigger/L1TCaloLayer1/test/testUCTLayer1.cpp | 2 +- L1Trigger/L1TCaloLayer1/test/testUCTLayer1HF.cpp | 2 +- 10 files changed, 82 insertions(+), 120 deletions(-) Switched to branch 'from-CMSSW_14_2_X_2024-10-30-1100'