From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47353/head -> cms-sw/refs/pull/47353/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/Geometry/README.md                   |    2 +
 .../GeometryDD4hepExtendedRun4D117Reco_cff.py      |   61 +
 .../python/GeometryDD4hepExtendedRun4D117_cff.py   |   17 +
 .../python/GeometryExtendedRun4D117Reco_cff.py     |   61 +
 .../python/GeometryExtendedRun4D117_cff.py         |   15 +
 Configuration/Geometry/python/dictRun4Geometry.py  |   29 +
 .../PyReleaseValidation/python/relval_Run4.py      |    1 +
 .../python/upgradeWorkflowComponents.py            |    9 +
 .../StandardSequences/python/GeometryConf.py       |    2 +
 DataFormats/ForwardDetId/interface/BTLDetId.h      |  201 +++-
 DataFormats/ForwardDetId/interface/ETLDetId.h      |    2 -
 DataFormats/ForwardDetId/src/BTLDetId.cc           |   19 +-
 DataFormats/TrackReco/src/HitPattern.cc            |    2 +-
 .../data/dd4hep/cmsExtendedGeometryRun4D117.xml    |  124 +++
 .../python/cmsExtendedGeometryRun4D117XML_cfi.py   |  128 +++
 Geometry/MTDCommonData/data/btl/v4/btl.xml         | 1161 ++++++++++++++++++++
 .../data/mtdParameters/v6/mtdParameters.xml        |   16 +
 .../data/mtdParameters/v6/mtdStructureTopology.xml |   32 +
 .../interface/BTLElectronicsMapping.h              |   86 ++
 .../MTDCommonData/interface/BTLNumberingScheme.h   |    3 +-
 Geometry/MTDCommonData/interface/MTDTopologyMode.h |   58 +-
 .../MTDCommonData/src/BTLElectronicsMapping.cc     |  218 ++++
 Geometry/MTDCommonData/src/BTLNumberingScheme.cc   |  289 +++--
 Geometry/MTDCommonData/src/MTDTopologyMode.cc      |   16 +-
 Geometry/MTDCommonData/test/BuildFile.xml          |    1 +
 .../test/DD4hep_TestMTDIdealGeometry.cc            |   29 +-
 Geometry/MTDCommonData/test/testMTDinDD4hep.py     |    5 +-
 .../MTDGeometryBuilder/src/MTDParametersFromDD.cc  |    8 +-
 .../test/DD4hep_TestPixelTopology.cc               |   16 +-
 .../plugins/CmsMTDConstruction.cc                  |   12 +-
 .../MTDNumberingBuilder/src/CmsMTDStringToEnum.cc  |    1 +
 .../DetLayers/src/ETLDetLayerGeometryBuilder.cc    |    8 +-
 RecoMTD/DetLayers/src/MTDDetLayerGeometry.cc       |    4 +-
 RecoMTD/DetLayers/test/mtd_cfg.py                  |    3 +-
 34 files changed, 2408 insertions(+), 231 deletions(-)
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D117Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D117_cff.py
 create mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D117.xml
 create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D117XML_cfi.py
 create mode 100644 Geometry/MTDCommonData/data/btl/v4/btl.xml
 create mode 100644 Geometry/MTDCommonData/data/mtdParameters/v6/mtdParameters.xml
 create mode 100644 Geometry/MTDCommonData/data/mtdParameters/v6/mtdStructureTopology.xml
 create mode 100644 Geometry/MTDCommonData/interface/BTLElectronicsMapping.h
 create mode 100644 Geometry/MTDCommonData/src/BTLElectronicsMapping.cc
Switched to branch 'from-CMSSW_15_1_X_2025-02-17-2300'