From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47535/head -> cms-sw/refs/pull/47535/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../GeometryDD4hepExtendedRun4D118Reco_cff.py      |   61 +
 .../python/GeometryDD4hepExtendedRun4D118_cff.py   |   17 +
 .../GeometryDD4hepExtendedRun4D119Reco_cff.py      |   61 +
 .../python/GeometryDD4hepExtendedRun4D119_cff.py   |   17 +
 .../python/GeometryExtendedRun4D118Reco_cff.py     |   61 +
 .../python/GeometryExtendedRun4D118_cff.py         |   15 +
 .../python/GeometryExtendedRun4D119Reco_cff.py     |   61 +
 .../python/GeometryExtendedRun4D119_cff.py         |   15 +
 Configuration/Geometry/python/dictRun4Geometry.py  |   58 +
 .../PyReleaseValidation/python/relval_Run4.py      |    2 +
 .../python/upgradeWorkflowComponents.py            |   18 +
 .../StandardSequences/python/GeometryConf.py       |    4 +
 DataFormats/ForwardDetId/src/ETLDetId.cc           |    5 +-
 .../data/dd4hep/cmsExtendedGeometryRun4D118.xml    |  124 +
 .../data/dd4hep/cmsExtendedGeometryRun4D119.xml    |  124 +
 .../python/cmsExtendedGeometryRun4D118XML_cfi.py   |  128 +
 .../python/cmsExtendedGeometryRun4D119XML_cfi.py   |  128 +
 Geometry/MTDCommonData/data/etl/v10/etl.xml        | 4434 ++++++++++++++++++
 Geometry/MTDCommonData/data/etl/v9/etl.xml         | 4725 ++++++++++++++++++++
 .../data/mtdParameters/v7/mtdParameters.xml        |   16 +
 .../data/mtdParameters/v7/mtdStructureTopology.xml |   30 +
 .../data/mtdParameters/v8/mtdParameters.xml        |   16 +
 .../data/mtdParameters/v8/mtdStructureTopology.xml |   30 +
 Geometry/MTDCommonData/interface/MTDTopologyMode.h |   18 +-
 Geometry/MTDCommonData/src/ETLNumberingScheme.cc   |   64 +-
 Geometry/MTDCommonData/src/MTDTopologyMode.cc      |    4 +
 .../MTDGeometryBuilder/interface/MTDTopology.h     |    2 +-
 .../MTDGeometryBuilder/plugins/MTDTopologyEP.cc    |  109 +-
 .../MTDGeometryBuilder/src/MTDParametersFromDD.cc  |  110 +-
 Geometry/MTDGeometryBuilder/src/MTDTopology.cc     |   64 +-
 .../DetLayers/src/ETLDetLayerGeometryBuilder.cc    |    3 +-
 31 files changed, 10395 insertions(+), 129 deletions(-)
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D118Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D118_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D119Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D119_cff.py
 create mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D118.xml
 create mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D119.xml
 create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D118XML_cfi.py
 create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D119XML_cfi.py
 create mode 100644 Geometry/MTDCommonData/data/etl/v10/etl.xml
 create mode 100644 Geometry/MTDCommonData/data/etl/v9/etl.xml
 create mode 100644 Geometry/MTDCommonData/data/mtdParameters/v7/mtdParameters.xml
 create mode 100644 Geometry/MTDCommonData/data/mtdParameters/v7/mtdStructureTopology.xml
 create mode 100644 Geometry/MTDCommonData/data/mtdParameters/v8/mtdParameters.xml
 create mode 100644 Geometry/MTDCommonData/data/mtdParameters/v8/mtdStructureTopology.xml
Switched to branch 'from-CMSSW_15_1_X_2025-03-09-2300'