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. FWCore/Framework/interface/GlobalSchedule.h | 2 +- FWCore/Framework/interface/ModuleInPath.h | 21 + FWCore/Framework/interface/ModuleRegistry.h | 8 + FWCore/Framework/interface/OutputModuleCore.h | 2 - .../interface/PathsAndConsumesOfModules.h | 10 +- FWCore/Framework/interface/Schedule.h | 6 +- FWCore/Framework/interface/StreamSchedule.h | 83 +-- FWCore/Framework/interface/WorkerManager.h | 24 +- FWCore/Framework/interface/WorkerRegistry.h | 11 +- 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 | 24 + .../Framework/interface/maker/ModuleSignalSentry.h | 5 +- FWCore/Framework/interface/maker/Worker.h | 11 - 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 | 17 +- FWCore/Framework/src/ModuleHolderT.cc | 184 +++++- FWCore/Framework/src/PathsAndConsumesOfModules.cc | 129 ++-- FWCore/Framework/src/Schedule.cc | 196 ++---- FWCore/Framework/src/ScheduleBuilder.cc | 730 +++++++++++++++++++++ FWCore/Framework/src/ScheduleBuilder.h | 49 ++ FWCore/Framework/src/StreamSchedule.cc | 657 ++----------------- FWCore/Framework/src/WorkerManager.cc | 42 +- FWCore/Framework/src/WorkerRegistry.cc | 20 - 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 +++--- Mixing/Base/src/SecondaryEventProvider.cc | 15 +- 41 files changed, 1836 insertions(+), 1336 deletions(-) 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 Switched to branch 'from-CMSSW_15_1_X_2025-07-09-1800'