From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48519/head -> cms-sw/refs/pull/48519/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../ALCARECOTkAlHLTTracksZMuMu_Output_cff.py | 17 +- .../python/ALCARECOTkAlHLTTracks_Output_cff.py | 13 +- Alignment/OfflineValidation/README.md | 2 +- Alignment/OfflineValidation/README_PixBary.md | 16 +- .../python/TkAlAllInOneTool/PixBary.py | 40 +- .../PixelBaryCentreAnalyzer_cfg.py | 2 +- .../OfflineValidation/scripts/extractBaryCentre.py | 82 ++- .../test/testingScripts/test_unitPixBary.sh | 16 +- Alignment/OfflineValidation/test/unit_test.json | 8 +- Alignment/OfflineValidation/test/unit_test.yaml | 7 + Calibration/HcalCalibAlgos/macros/CalibCorr.C | 6 +- Calibration/HcalCalibAlgos/macros/CalibMain.C | 5 + .../HcalCalibAlgos/macros/CalibPlotProperties.C | 634 +++++++++++++++++- Calibration/HcalCalibAlgos/macros/PFCuts2025.txt | 274 ++++++++ .../plugins/LHCInfoPerFill_PayloadInspector.cc | 16 +- .../plugins/LHCInfoPerLS_PayloadInspector.cc | 17 +- CondCore/RunInfoPlugins/plugins/utils.h | 15 + Configuration/StandardSequences/python/Mixing.py | 1 + FWCore/Framework/interface/GlobalSchedule.h | 19 +- FWCore/Framework/interface/ModuleInPath.h | 21 + FWCore/Framework/interface/ModuleRegistry.h | 9 + FWCore/Framework/interface/OutputModuleCore.h | 2 - .../interface/PathsAndConsumesOfModules.h | 9 +- FWCore/Framework/interface/Schedule.h | 8 +- FWCore/Framework/interface/StreamSchedule.h | 116 ++-- FWCore/Framework/interface/WorkerManager.h | 27 +- FWCore/Framework/interface/WorkerRegistry.h | 17 +- FWCore/Framework/interface/global/EDAnalyzerBase.h | 3 - FWCore/Framework/interface/global/EDFilterBase.h | 3 - FWCore/Framework/interface/global/EDProducerBase.h | 3 - .../Framework/interface/limited/EDAnalyzerBase.h | 3 - FWCore/Framework/interface/limited/EDFilterBase.h | 3 - .../Framework/interface/limited/EDProducerBase.h | 4 - FWCore/Framework/interface/maker/ModuleHolder.h | 27 +- .../Framework/interface/maker/ModuleSignalSentry.h | 5 +- FWCore/Framework/interface/maker/Worker.h | 17 - FWCore/Framework/interface/maker/WorkerT.h | 8 - FWCore/Framework/interface/one/EDAnalyzerBase.h | 3 - FWCore/Framework/interface/one/EDFilterBase.h | 3 - FWCore/Framework/interface/one/EDProducerBase.h | 3 - .../interface/stream/EDAnalyzerAdaptorBase.h | 3 - .../interface/stream/ProducingModuleAdaptorBase.h | 2 - FWCore/Framework/src/GlobalSchedule.cc | 22 +- FWCore/Framework/src/ModuleHolderT.cc | 184 +++++- FWCore/Framework/src/PathsAndConsumesOfModules.cc | 131 ++-- FWCore/Framework/src/Schedule.cc | 209 ++---- FWCore/Framework/src/ScheduleBuilder.cc | 705 +++++++++++++++++++++ FWCore/Framework/src/ScheduleBuilder.h | 49 ++ FWCore/Framework/src/StreamSchedule.cc | 658 ++----------------- FWCore/Framework/src/WorkerManager.cc | 49 +- FWCore/Framework/src/WorkerRegistry.cc | 21 - FWCore/Framework/src/WorkerT.cc | 20 - FWCore/Framework/test/BuildFile.xml | 6 + .../test/global_outputmodule_t.cppunit.cc | 137 ++-- .../test/limited_outputmodule_t.cppunit.cc | 134 ++-- .../Framework/test/one_outputmodule_t.cppunit.cc | 135 ++-- .../Framework/test/test_catch2_ScheduleBuilder.cc | 247 ++++++++ .../test/unit_test_outputs/testConsumesInfo_1.log | 206 +++--- FWCore/ParameterSet/python/Modules.py | 13 +- .../python/ScoutingMuonTriggerAnalyzer_cfi.py | 4 +- Mixing/Base/src/SecondaryEventProvider.cc | 15 +- Mixing/Base/src/SecondaryEventProvider.h | 1 + .../plugins/ModuleEventAllocMonitor.cc | 5 +- .../HGCalRecAlgos/interface/RecHitTools.h | 15 + RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc | 54 ++ ..._25ns_Run3pp13p6TeVSpring25_PoissonOOTPU_cfi.py | 36 ++ .../RecoTrack/plugins/SimpleTrackValidation.cc | 101 ++- Validation/RecoTrack/test/BuildFile.xml | 1 + .../RecoTrack/test/SimpleTrackValidation_cfg.py | 112 ++++ .../RecoTrack/test/test_SimpleTrackValidation.sh | 8 + 70 files changed, 3281 insertions(+), 1486 deletions(-) create mode 100644 Calibration/HcalCalibAlgos/macros/PFCuts2025.txt create mode 100644 CondCore/RunInfoPlugins/plugins/utils.h create mode 100644 FWCore/Framework/interface/ModuleInPath.h create mode 100644 FWCore/Framework/src/ScheduleBuilder.cc create mode 100644 FWCore/Framework/src/ScheduleBuilder.h create mode 100644 FWCore/Framework/test/test_catch2_ScheduleBuilder.cc create mode 100644 SimGeneral/MixingModule/python/mix_2025_25ns_Run3pp13p6TeVSpring25_PoissonOOTPU_cfi.py create mode 100644 Validation/RecoTrack/test/SimpleTrackValidation_cfg.py create mode 100755 Validation/RecoTrack/test/test_SimpleTrackValidation.sh Switched to branch 'from-CMSSW_15_1_X_2025-07-13-0000'