From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47324/head -> cms-sw/refs/pull/47324/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../CocoaModel/src/DeviationsFromFileSensor2D.cc | 2 + Alignment/CocoaModel/src/Measurement.cc | 4 +- Alignment/OfflineValidation/bin/haddws.C | 2 +- Alignment/OfflineValidation/macros/loopAndPlot.C | 2 +- .../CastorCalib/src/CastorDbHardcode.cc | 1 - .../CastorCalib/src/CastorPedestalAnalysis.cc | 1 - .../EcalLaserAnalyzer/src/MELaserPrim.cc | 2 - .../SiPixelObjects/interface/PixelConfigBase.h | 2 +- CalibFormats/SiPixelObjects/src/PixelFEDCard.cc | 209 +- .../plugins/SiPixelGainCalibrationAnalysis.cc | 9 +- CalibTracker/SiStripAPVAnalysis/src/TT6ApvMask.cc | 2 - CondCore/Utilities/bin/conddb_copy_iov.cpp | 1 - CondCore/Utilities/bin/conddb_edit_tag.cpp | 1 - CondCore/Utilities/bin/conddb_import.cpp | 1 - CondCore/Utilities/bin/conddb_test.cpp | 1 - CondCore/Utilities/bin/conddb_test_gt_load.cpp | 1 - CondCore/Utilities/bin/conddb_test_gt_perf.cpp | 1 - CondCore/Utilities/bin/conddb_test_read.cpp | 1 - CondCore/Utilities/src/CondDBImport.cc | 1 - CondFormats/DTObjects/src/DTReadOutMapping.cc | 1 - CondFormats/L1TObjects/src/L1GtTriggerMenu.cc | 1 - CondTools/DT/src/DTExpandMap.cc | 1 - CondTools/DT/src/DTHVStatusHandler.cc | 1 - .../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 + DQM/Physics/src/SingleTopTChannelLeptonDQM.cc | 11 +- .../src/SingleTopTChannelLeptonDQM_miniAOD.cc | 17 +- DQM/Physics/src/TopSingleLeptonDQM.cc | 12 +- DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc | 17 +- DQM/Physics/test/topDQM_harvesting_cfg.py | 2 +- DQM/Physics/test/topDQM_harvesting_miniAOD.py | 51 + DQM/Physics/test/topDQM_production_cfg.py | 2 +- DQM/Physics/test/topDQM_production_miniAOD.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 +- PhysicsTools/NanoAOD/plugins/BuildFile.xml | 1 + .../NanoAOD/plugins/GenCandMotherTableProducer.cc | 145 + .../NanoAOD/plugins/JetConstituentTableProducer.cc | 25 +- .../plugins/PackedCandMCMatchTableProducer.cc | 77 + PhysicsTools/NanoAOD/python/btvMC_cff.py | 305 +- PhysicsTools/NanoAOD/python/custom_btv_cff.py | 77 +- PhysicsTools/NanoAOD/test/BuildFile.xml | 5 + PhysicsTools/NanoAOD/test/test-btvNano.py | 49 + PhysicsTools/NanoAOD/test/test-btvNano.sh | 1 + .../DetLayers/src/ETLDetLayerGeometryBuilder.cc | 3 +- 71 files changed, 11113 insertions(+), 460 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 DQM/Physics/test/topDQM_harvesting_miniAOD.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 create mode 100644 PhysicsTools/NanoAOD/plugins/GenCandMotherTableProducer.cc create mode 100644 PhysicsTools/NanoAOD/plugins/PackedCandMCMatchTableProducer.cc create mode 100755 PhysicsTools/NanoAOD/test/test-btvNano.py create mode 100755 PhysicsTools/NanoAOD/test/test-btvNano.sh Switched to branch 'from-CMSSW_15_1_X_2025-03-19-2300'