From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47946/head -> cms-sw/refs/pull/47946/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml  |  2 +-
 Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml  |  2 +-
 .../HGCalCommonData/data/hgcal/v17ng/hgcal.xml     |  2 +-
 Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml  |  2 +-
 .../HGCalCommonData/data/hgcal/v18ng/hgcal.xml     |  2 +-
 .../data/hgcalCons/v16/hgcalCons.xml               |  2 +-
 .../data/hgcalCons/v17/hgcalCons.xml               |  2 +-
 .../data/hgcalCons/v17n/hgcalCons.xml              |  2 +-
 .../data/hgcalCons/v18/hgcalCons.xml               |  2 +-
 .../data/hgcalCons/v18n/hgcalCons.xml              |  2 +-
 .../data/hgcalCons/v19/hgcalCons.xml               |  2 +-
 Geometry/HGCalCommonData/src/HGCalDDDConstants.cc  | 64 +++++++++++++++-------
 Geometry/HGCalGeometry/src/HGCalGeometry.cc        |  2 +-
 Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc  |  8 ++-
 14 files changed, 62 insertions(+), 34 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-04-24-2300'