From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/46929/head -> cms-sw/refs/pull/46929/head
Switched to branch 'merge-attempt'
Auto-merging FWCore/Framework/interface/SubProcess.h
Auto-merging FWCore/Framework/interface/maker/Worker.h
Auto-merging FWCore/Framework/interface/maker/WorkerT.h
Auto-merging FWCore/Framework/interface/stream/ProducingModuleAdaptorBase.h
Auto-merging FWCore/Framework/src/EventProcessor.cc
Auto-merging FWCore/Framework/src/Schedule.cc
Auto-merging FWCore/Framework/src/StreamSchedule.cc
Auto-merging FWCore/Framework/src/SubProcess.cc
Auto-merging FWCore/Framework/src/WorkerT.cc
Auto-merging FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
Merge made by the 'ort' strategy.
 FWCore/Framework/interface/Callback.h              |   2 +-
 FWCore/Framework/interface/CallbackBase.h          |  20 +-
 FWCore/Framework/interface/CallbackExternalWork.h  |   4 +-
 .../Framework/interface/CallbackProductResolver.h  |   6 +-
 .../interface/DependentRecordImplementation.h      |   4 +-
 FWCore/Framework/interface/EDConsumerBase.h        |  72 +-
 FWCore/Framework/interface/ESConsumesCollector.h   |  16 +-
 FWCore/Framework/interface/ESProducer.h            |  17 +-
 FWCore/Framework/interface/ESProductResolver.h     |   4 +
 .../interface/ESRecordsToProductResolverIndices.h  |   9 +-
 FWCore/Framework/interface/ESTagGetter.h           |   2 +
 FWCore/Framework/interface/EventProcessor.h        |   2 -
 FWCore/Framework/interface/EventSetupProvider.h    |   2 +
 FWCore/Framework/interface/EventSetupRecordImpl.h  |   2 +
 .../Framework/interface/EventSetupRecordProvider.h |   5 +
 FWCore/Framework/interface/GlobalSchedule.h        |   2 +
 .../interface/PathsAndConsumesOfModules.h          |  65 +-
 FWCore/Framework/interface/Schedule.h              |  12 +-
 FWCore/Framework/interface/SubProcess.h            |   6 +-
 FWCore/Framework/interface/WorkerManager.h         |   2 +
 .../interface/es_impl/MayConsumeChooserBase.h      |   1 -
 FWCore/Framework/interface/maker/Worker.h          |  14 +-
 FWCore/Framework/interface/maker/WorkerT.h         |  20 +-
 .../interface/stream/EDAnalyzerAdaptorBase.h       |  17 +-
 .../interface/stream/ProducingModuleAdaptorBase.h  |  17 +-
 FWCore/Framework/src/EDConsumerBase.cc             | 103 ++-
 FWCore/Framework/src/ESProducer.cc                 | 144 ++++
 FWCore/Framework/src/ESProductResolver.cc          |   2 +
 .../src/ESRecordsToProductResolverIndices.cc       |  26 +-
 FWCore/Framework/src/EventProcessor.cc             |  26 +-
 FWCore/Framework/src/EventSetupProvider.cc         |  15 +-
 FWCore/Framework/src/EventSetupRecordImpl.cc       |   9 +
 FWCore/Framework/src/EventSetupRecordProvider.cc   |  15 +
 FWCore/Framework/src/GlobalSchedule.cc             |   6 +
 FWCore/Framework/src/PathsAndConsumesOfModules.cc  | 112 ++-
 FWCore/Framework/src/Schedule.cc                   |  34 +-
 FWCore/Framework/src/StreamSchedule.cc             |   7 +-
 FWCore/Framework/src/SubProcess.cc                 |  26 +-
 FWCore/Framework/src/WorkerManager.cc              |   6 +
 FWCore/Framework/src/WorkerT.cc                    |  19 +
 .../Framework/src/stream/EDAnalyzerAdaptorBase.cc  |  26 +-
 .../src/stream/ProducingModuleAdaptorBase.cc       |  29 +-
 ...heckForModuleDependencyCorrectness_t.cppunit.cc |  39 +-
 .../Framework/test/eventsetuprecord_t.cppunit.cc   |   6 +-
 ...atch2notTP_ESRecordsToProductResolverIndices.cc |  13 +-
 FWCore/Integration/plugins/BuildFile.xml           |   7 +-
 .../plugins/ConsumeIOVTestInfoAnalyzer.cc          |  56 ++
 FWCore/Integration/plugins/ConsumeWhatsIt.cc       | 200 +++++
 FWCore/Integration/plugins/MayConsumeWhatsIt.cc    | 103 +++
 FWCore/Integration/plugins/RunLumiESAnalyzer.cc    |  51 +-
 FWCore/Integration/plugins/RunLumiESSource.cc      |  20 +
 FWCore/Integration/test/run_TestGetBy.sh           |   2 +-
 FWCore/Integration/test/testConsumesInfo_cfg.py    | 108 +++
 .../test/unit_test_outputs/testConsumesInfo_1.log  | 903 +++++++++++++++------
 .../ServiceRegistry/interface/ActivityRegistry.h   |  10 +
 .../interface/ESModuleConsumesInfo.h               |  56 ++
 .../interface/ModuleConsumesESInfo.h               |  50 ++
 .../{ConsumesInfo.h => ModuleConsumesInfo.h}       |  26 +-
 .../interface/PathsAndConsumesOfModulesBase.h      | 102 ++-
 .../ServiceRegistry/interface/ServiceRegistryfwd.h |   3 +
 FWCore/ServiceRegistry/src/ActivityRegistry.cc     |   2 +
 FWCore/ServiceRegistry/src/ConsumesInfo.cc         |  21 -
 FWCore/ServiceRegistry/src/ESModuleConsumesInfo.cc |  24 +
 FWCore/ServiceRegistry/src/ModuleConsumesESInfo.cc |  21 +
 FWCore/ServiceRegistry/src/ModuleConsumesInfo.cc   |  21 +
 FWCore/Services/plugins/Tracer.cc                  | 375 +++++++--
 FWCore/Utilities/interface/ESGetToken.h            |   6 +-
 FWCore/Utilities/interface/Transition.h            |   3 +
 68 files changed, 2605 insertions(+), 551 deletions(-)
 create mode 100644 FWCore/Integration/plugins/ConsumeIOVTestInfoAnalyzer.cc
 create mode 100644 FWCore/Integration/plugins/ConsumeWhatsIt.cc
 create mode 100644 FWCore/Integration/plugins/MayConsumeWhatsIt.cc
 create mode 100644 FWCore/ServiceRegistry/interface/ESModuleConsumesInfo.h
 create mode 100644 FWCore/ServiceRegistry/interface/ModuleConsumesESInfo.h
 rename FWCore/ServiceRegistry/interface/{ConsumesInfo.h => ModuleConsumesInfo.h} (71%)
 delete mode 100644 FWCore/ServiceRegistry/src/ConsumesInfo.cc
 create mode 100644 FWCore/ServiceRegistry/src/ESModuleConsumesInfo.cc
 create mode 100644 FWCore/ServiceRegistry/src/ModuleConsumesESInfo.cc
 create mode 100644 FWCore/ServiceRegistry/src/ModuleConsumesInfo.cc
Switched to branch 'from-CMSSW_15_0_X_2025-02-06-1100'