From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47937/head -> cms-sw/refs/pull/47937/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../CondHDF5ESSource/plugins/CondHDF5ESSource.cc | 18 + CondCore/ESSources/plugins/CondDBESSource.cc | 17 + CondCore/ESSources/plugins/CondDBESSource.h | 2 + Configuration/HLT/python/autoCondHLT.py | 8 +- Configuration/HLT/python/autoHLT.py | 2 +- .../python/phase2_hlt_vertexTrimming_cff.py | 5 + Configuration/PyReleaseValidation/README.md | 3 + .../PyReleaseValidation/python/relval_gpu.py | 2 + .../python/upgradeWorkflowComponents.py | 41 +- .../python/HLTScoutingDqmOffline_cff.py | 7 +- FWCore/Framework/interface/EDConsumerBase.h | 69 +- .../interface/ESModuleConsumesMinimalInfo.h | 38 + FWCore/Framework/interface/ESModuleProducesInfo.h | 29 + FWCore/Framework/interface/ESProducer.h | 9 +- .../ESProductResolverArgumentFactoryTemplate.h | 2 + .../interface/ESProductResolverFactoryBase.h | 2 + .../interface/ESProductResolverFactoryProducer.h | 2 + .../interface/ESProductResolverProvider.h | 5 + FWCore/Framework/interface/ESTagGetter.h | 4 +- .../interface/ModuleConsumesMinimalESInfo.h | 41 + .../interface/PathsAndConsumesOfModules.h | 13 +- FWCore/Framework/interface/Schedule.h | 10 - FWCore/Framework/interface/maker/Worker.h | 13 +- FWCore/Framework/interface/maker/WorkerT.h | 18 +- .../interface/stream/EDAnalyzerAdaptorBase.h | 14 +- .../interface/stream/ProducingModuleAdaptorBase.h | 13 +- FWCore/Framework/src/EDConsumerBase.cc | 203 +- FWCore/Framework/src/ESProducer.cc | 53 +- .../src/ESProductResolverFactoryProducer.cc | 9 + FWCore/Framework/src/ESTagGetter.cc | 1 - FWCore/Framework/src/EventProcessor.cc | 2 +- FWCore/Framework/src/PathsAndConsumesOfModules.cc | 484 +- FWCore/Framework/src/Schedule.cc | 73 +- FWCore/Framework/src/WorkerT.cc | 7 - .../Framework/src/stream/EDAnalyzerAdaptorBase.cc | 22 +- .../src/stream/ProducingModuleAdaptorBase.cc | 25 +- .../test/DummyESProductResolverProvider.h | 10 + .../test/ESProductResolverFactoryTemplate.h | 1 + FWCore/Framework/test/dependentrecord_t.cppunit.cc | 18 + FWCore/Framework/test/esproducer_t.cppunit.cc | 128 + .../Framework/test/eventsetuprecord_t.cppunit.cc | 7 + FWCore/Integration/plugins/ESTestProducers.cc | 11 + .../Integration/plugins/TestESConcurrentSource.cc | 14 + FWCore/Integration/plugins/TestESSource.cc | 11 + FWCore/Services/plugins/tracer_setupFile.cc | 2 +- .../TestProcessor/interface/EventSetupTestHelper.h | 2 + FWCore/TestProcessor/src/EventSetupTestHelper.cc | 9 + .../HGCalCommonData/interface/HGCalParameters.h | 2 +- Geometry/HGCalCommonData/src/HGCalDDDConstants.cc | 6 +- Geometry/HGCalCommonData/src/HGCalTileIndex.cc | 9 +- .../test/python/testHGCalNumbering_cfg.py | 4 +- Geometry/HGCalGeometry/src/HGCalGeometry.cc | 2 +- Geometry/HGCalGeometry/test/HGCalSizeTester.cc | 1 + .../test/python/testHGCalGeometry_cfg.py | 4 +- .../HGCalGeometry/test/python/testHGCalSize_cfg.py | 4 +- .../test/python/testHGCalWaferCell_cfg.py | 4 +- .../test/python/testHGCalWaferInFileTest_cfg.py | 5 +- .../{HLT_2024v14_cff.py => HLT_2025v10_cff.py} | 27564 ++++++++-------- .../modules/hltHighPtTripletStepHitDoublets_cfi.py | 3 + ...letStepTrackingRegionFromTrimmedVertices_cfi.py | 29 + .../HLT_75e33/modules/hltInitialStepSeeds_cfi.py | 3 + .../modules/hltPhase2TrimmedPixelVertices_cfi.py | 11 + .../python/HLT_75e33/paths/DST_PFScouting_cfi.py | 16 +- .../HLTHighPtTripletStepSeedingSequence_cfi.py | 6 + .../HLT_75e33/sequences/HLTTrackingSequence_cfi.py | 6 + HLTrigger/Configuration/python/HLT_FULL_cff.py | 31500 +++++++++--------- HLTrigger/Configuration/python/HLT_Fake1_cff.py | 4 +- HLTrigger/Configuration/python/HLT_Fake2_cff.py | 4 +- HLTrigger/Configuration/python/HLT_Fake_cff.py | 4 +- HLTrigger/Configuration/python/HLT_GRun_cff.py | 11427 ++++--- HLTrigger/Configuration/python/HLT_HIon_cff.py | 16896 +++++----- HLTrigger/Configuration/python/HLT_PIon_cff.py | 36 +- HLTrigger/Configuration/python/HLT_PRef_cff.py | 2347 +- HLTrigger/Configuration/python/HLT_Special_cff.py | 1453 +- .../python/HLTrigger_Datasets_GRun_cff.py | 4254 +-- .../python/HLTrigger_Datasets_HIon_cff.py | 15650 ++++----- .../python/HLTrigger_Datasets_PIon_cff.py | 4 +- .../python/HLTrigger_Datasets_PRef_cff.py | 1524 +- .../python/HLTrigger_Datasets_Special_cff.py | 358 +- HLTrigger/Configuration/python/Tools/options.py | 2 +- .../Configuration/python/customizeHLTforCMSSW.py | 21 - .../Configuration/scripts/utils/hltPathOwners.json | 311 +- HLTrigger/Configuration/scripts/utils/readme.md | 4 +- HLTrigger/Configuration/tables/GRun.txt | 24 +- HLTrigger/Configuration/tables/makeOnlineSpecial | 6 +- HLTrigger/Configuration/tables/online_grun.txt | 24 +- ...OnLine_HLT_2024v14.py => OnLine_HLT_2025v10.py} | 28265 ++++++++--------- HLTrigger/Configuration/test/OnLine_HLT_FULL.py | 31529 ++++++++++--------- HLTrigger/Configuration/test/OnLine_HLT_Fake.py | 21 +- HLTrigger/Configuration/test/OnLine_HLT_Fake1.py | 21 +- HLTrigger/Configuration/test/OnLine_HLT_Fake2.py | 21 +- HLTrigger/Configuration/test/OnLine_HLT_GRun.py | 11454 ++++--- HLTrigger/Configuration/test/OnLine_HLT_HIon.py | 16911 +++++----- HLTrigger/Configuration/test/OnLine_HLT_PIon.py | 51 +- HLTrigger/Configuration/test/OnLine_HLT_PRef.py | 2362 +- HLTrigger/Configuration/test/OnLine_HLT_Special.py | 1468 +- HLTrigger/Configuration/test/cmsDriver.csh | 12 +- HLTrigger/Configuration/test/getFrozenHLT.sh | 2 +- HLTrigger/Configuration/test/runIntegration.csh | 4 +- HLTrigger/Configuration/test/runOne.csh | 4 +- .../Scouting/plugins/ElectronEfficiencyPlotter.cc | 189 +- .../plugins/PatElectronTagProbeAnalyzer.cc | 1088 +- .../Scouting/plugins/ScoutingCollectionMonitor.cc | 1110 + .../plugins/ScoutingEGammaCollectionMonitoring.cc | 229 +- .../plugins/ScoutingElectronTagProbeAnalyzer.cc | 266 +- .../python/ElectronEfficiencyPlotter_cfi.py | 1 + .../python/PatElectronTagProbeAnalyzer_cfi.py | 46 + .../python/ScoutingCollectionMonitor_cfi.py | 20 + .../ScoutingEGammaCollectionMonitoring_cfi.py | 42 + .../python/ScoutingElectronTagProbeAnalyzer_cfi.py | 7 +- ...unScoutingMonitoringDQM_EGammaOnly_step1_cfg.py | 48 +- PhysicsTools/CondLiteIO/plugins/FWLiteESSource.cc | 22 + .../plugins/EcalUncalibRecHitSoAToLegacy.cc | 11 +- .../alpaka/EcalPhase2DigiToPortableProducer.cc | 85 + ...alUncalibRecHitPhase2WeightsAlgoPortable.dev.cc | 80 + .../EcalUncalibRecHitPhase2WeightsAlgoPortable.h | 19 + ...alUncalibRecHitPhase2WeightsProducerPortable.cc | 142 + .../alpaka/EcalUncalibRecHitPhase2WeightsStruct.h | 15 + .../EcalRecProducers/python/ecalRecHit_cff.py | 10 + .../python/ecalUncalibRecHitPhase2_cff.py | 69 +- SimG4CMS/Calo/macros/MakeHitStudyPlots.C | 177 +- Validation/EcalDigis/test/BuildFile.xml | 21 + Validation/EcalDigis/test/EcalDigiStudy.cc | 464 + Validation/EcalDigis/test/runEcalDigiStudy_cfg.py | 59 + Validation/HcalDigis/test/runHcalDigiStudy_cfg.py | 2 +- 125 files changed, 109429 insertions(+), 101929 deletions(-) create mode 100644 Configuration/ProcessModifiers/python/phase2_hlt_vertexTrimming_cff.py create mode 100644 FWCore/Framework/interface/ESModuleConsumesMinimalInfo.h create mode 100644 FWCore/Framework/interface/ESModuleProducesInfo.h create mode 100644 FWCore/Framework/interface/ModuleConsumesMinimalESInfo.h rename HLTrigger/Configuration/python/{HLT_2024v14_cff.py => HLT_2025v10_cff.py} (88%) create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackingRegionFromTrimmedVertices_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TrimmedPixelVertices_cfi.py rename HLTrigger/Configuration/test/{OnLine_HLT_2024v14.py => OnLine_HLT_2025v10.py} (88%) create mode 100644 HLTriggerOffline/Scouting/plugins/ScoutingCollectionMonitor.cc create mode 100644 HLTriggerOffline/Scouting/python/ScoutingCollectionMonitor_cfi.py create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalPhase2DigiToPortableProducer.cc create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsAlgoPortable.dev.cc create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsAlgoPortable.h create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsProducerPortable.cc create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsStruct.h create mode 100644 Validation/EcalDigis/test/BuildFile.xml create mode 100644 Validation/EcalDigis/test/EcalDigiStudy.cc create mode 100644 Validation/EcalDigis/test/runEcalDigiStudy_cfg.py Switched to branch 'from-CMSSW_15_1_X_2025-04-23-1100'