From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47551/head -> cms-sw/refs/pull/47551/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. Configuration/Geometry/README.md | 52 ++--- Configuration/Geometry/python/dict2021Geometry.py | 234 ++++++++++++++++++--- .../data/dd4hep/cmsExtendedGeometry2021.xml | 4 +- .../cmsExtendedGeometry2021FlatMinus05Percent.xml | 4 +- .../cmsExtendedGeometry2021FlatMinus10Percent.xml | 4 +- .../cmsExtendedGeometry2021FlatPlus05Percent.xml | 4 +- .../cmsExtendedGeometry2021FlatPlus10Percent.xml | 4 +- .../dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml | 4 +- .../data/dd4hep/cmsExtendedGeometry2023.xml | 4 +- .../cmsExtendedGeometry2023FlatMinus05Percent.xml | 4 +- .../cmsExtendedGeometry2023FlatMinus10Percent.xml | 4 +- .../cmsExtendedGeometry2023FlatPlus05Percent.xml | 4 +- .../cmsExtendedGeometry2023FlatPlus10Percent.xml | 4 +- .../dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml | 4 +- .../data/dd4hep/cmsExtendedGeometry2024.xml | 4 +- .../cmsExtendedGeometry2024FlatMinus05Percent.xml | 4 +- .../cmsExtendedGeometry2024FlatMinus10Percent.xml | 4 +- .../cmsExtendedGeometry2024FlatPlus05Percent.xml | 4 +- .../cmsExtendedGeometry2024FlatPlus10Percent.xml | 4 +- .../dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml | 4 +- .../data/dd4hep/cmsExtendedGeometry2025.xml | 4 +- .../cmsExtendedGeometry2025FlatMinus05Percent.xml | 4 +- .../cmsExtendedGeometry2025FlatMinus10Percent.xml | 4 +- .../cmsExtendedGeometry2025FlatPlus05Percent.xml | 4 +- .../cmsExtendedGeometry2025FlatPlus10Percent.xml | 4 +- .../dd4hep/cmsExtendedGeometry2025ZeroMaterial.xml | 4 +- ...xtendedGeometry2021FlatMinus05PercentXML_cfi.py | 4 +- ...xtendedGeometry2021FlatMinus10PercentXML_cfi.py | 4 +- ...ExtendedGeometry2021FlatPlus05PercentXML_cfi.py | 4 +- ...ExtendedGeometry2021FlatPlus10PercentXML_cfi.py | 4 +- .../python/cmsExtendedGeometry2021XML_cfi.py | 4 +- .../cmsExtendedGeometry2021ZeroMaterialXML_cfi.py | 4 +- ...xtendedGeometry2023FlatMinus05PercentXML_cfi.py | 4 +- ...xtendedGeometry2023FlatMinus10PercentXML_cfi.py | 4 +- ...ExtendedGeometry2023FlatPlus05PercentXML_cfi.py | 4 +- ...ExtendedGeometry2023FlatPlus10PercentXML_cfi.py | 4 +- .../python/cmsExtendedGeometry2023XML_cfi.py | 4 +- .../cmsExtendedGeometry2023ZeroMaterialXML_cfi.py | 4 +- ...xtendedGeometry2024FlatMinus05PercentXML_cfi.py | 4 +- ...xtendedGeometry2024FlatMinus10PercentXML_cfi.py | 4 +- ...ExtendedGeometry2024FlatPlus05PercentXML_cfi.py | 4 +- ...ExtendedGeometry2024FlatPlus10PercentXML_cfi.py | 4 +- .../python/cmsExtendedGeometry2024XML_cfi.py | 4 +- .../cmsExtendedGeometry2024ZeroMaterialXML_cfi.py | 4 +- ...xtendedGeometry2025FlatMinus05PercentXML_cfi.py | 4 +- ...xtendedGeometry2025FlatMinus10PercentXML_cfi.py | 4 +- ...ExtendedGeometry2025FlatPlus05PercentXML_cfi.py | 4 +- ...ExtendedGeometry2025FlatPlus10PercentXML_cfi.py | 4 +- .../python/cmsExtendedGeometry2025XML_cfi.py | 4 +- .../cmsExtendedGeometry2025ZeroMaterialXML_cfi.py | 4 +- 50 files changed, 331 insertions(+), 147 deletions(-) Switched to branch 'from-CMSSW_15_1_X_2025-03-10-2300'