From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48538/head -> cms-sw/refs/pull/48538/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Geometry/HGCalCommonData/interface/HGCalDDDConstants.h       |  1 +
 Geometry/HGCalCommonData/interface/HGCalGeomParameters.h     |  2 +-
 Geometry/HGCalCommonData/src/HGCalDDDConstants.cc            | 12 ++++++++++++
 Geometry/HGCalCommonData/src/HGCalGeomParameters.cc          |  8 ++++----
 Geometry/HGCalGeometry/test/HGCalGeometryDump.cc             |  9 +++++++++
 .../HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py    |  2 +-
 6 files changed, 28 insertions(+), 6 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-07-13-0000'