From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47829/head -> cms-sw/refs/pull/47829/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../interface/HGCalMappingParameterSoA.h           |  1 +
 .../plugins/alpaka/HGCalMappingCellESProducer.cc   | 45 +++++++++++-
 Geometry/HGCalMapping/python/hgcalmapping_cff.py   |  6 +-
 .../alpaka/HGCalRecHitCalibrationAlgorithms.h      |  7 +-
 .../alpaka/HGCalRecHitCalibrationAlgorithms.dev.cc | 83 +++++++++++++++++++---
 .../plugins/alpaka/HGCalRecHitProducers.cc         | 17 ++++-
 6 files changed, 145 insertions(+), 14 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-04-09-1100'