From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47910/head -> cms-sw/refs/pull/47910/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Geometry/HGCalCommonData/src/HGCalDDDConstants.cc  | 61 +++++++++++++++-------
 Geometry/HGCalCommonData/src/HGCalTileIndex.cc     |  9 +++-
 .../HGCalCommonData/test/HGCalParameterTester.cc   |  3 +-
 .../test/python/testHGCalParametersDD4hep_cfg.py   |  4 +-
 .../test/python/testHGCalParametersDDD_cfg.py      |  4 +-
 Geometry/HGCalGeometry/src/HGCalGeometry.cc        |  4 +-
 6 files changed, 56 insertions(+), 29 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-04-18-2300'