From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48061/head -> cms-sw/refs/pull/48061/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. CommonTools/UtilAlgos/interface/TFileService.h | 7 - CondCore/CondDB/src/DbCore.h | 139 ++++- CondCore/CondDB/src/IOVSchema.h | 24 +- CondCore/CondDB/src/RunInfoSchema.h | 18 +- Configuration/AlCa/python/autoCond.py | 18 +- Configuration/AlCa/python/autoCondModifiers.py | 2 +- .../Applications/python/cmsDriverOptions.py | 1 + Configuration/Geometry/python/dictRun4Geometry.py | 77 +-- DQM/EcalMonitorTasks/python/TrigPrimTask_cfi.py | 2 +- DataFormats/Common/test/BuildFile.xml | 45 +- DataFormats/Common/test/DataFrame_t.cpp | 139 ----- DataFormats/Common/test/DetSetNewTS_t.cpp | 302 ---------- DataFormats/Common/test/DetSetNew_t.cpp | 670 --------------------- DataFormats/Common/test/DictionaryTools_t.cpp | 103 ---- DataFormats/Common/test/MapOfVectors_t.cpp | 94 --- DataFormats/Common/test/RefCore_t.cpp | 88 --- DataFormats/Common/test/RefVector_t.cpp | 63 -- DataFormats/Common/test/Ref_t.cpp | 190 ------ DataFormats/Common/test/Trie_t.cpp | 227 ------- ...stBoostRange.cpp => test_catch2_BoostRange.cpp} | 0 DataFormats/Common/test/test_catch2_DataFrame.cpp | 116 ++++ DataFormats/Common/test/test_catch2_DetSetNew.cpp | 593 ++++++++++++++++++ .../Common/test/test_catch2_DetSetNewTS.cpp | 248 ++++++++ ...etVector_t.cpp => test_catch2_DetSetVector.cpp} | 0 ...t.cpp => test_catch2_DetSetVectorWithKey_t.cpp} | 0 .../Common/test/test_catch2_DictionaryTools.cpp | 76 +++ .../Common/test/test_catch2_MapOfVectors.cpp | 69 +++ .../{OwnVector_t.cpp => test_catch2_OwnVector.cpp} | 0 DataFormats/Common/test/test_catch2_Ref.cpp | 137 +++++ DataFormats/Common/test/test_catch2_RefCore.cpp | 62 ++ .../{reftobase_t.cpp => test_catch2_RefToBase.cpp} | 0 DataFormats/Common/test/test_catch2_RefVector.cpp | 50 ++ .../{StdArray_t.cpp => test_catch2_StdArray.cpp} | 1 - ...dRefSet_t.cpp => test_catch2_ThinnedRefSet.cpp} | 1 - DataFormats/Common/test/test_catch2_Trie.cpp | 195 ++++++ .../{Wrapper_t.cpp => test_catch2_Wrapper.cpp} | 0 .../test/{exDSTV.cpp => test_catch2_exDSTV.cpp} | 0 .../test/{exTrie.cpp => test_catch2_exTrie.cpp} | 0 DataFormats/Common/test/test_catch2_traits.cpp | 20 + DataFormats/Common/test/traits_t.cpp | 40 -- FWCore/Framework/interface/MakerMacros.h | 8 +- FWCore/Framework/interface/ScheduleItems.h | 3 +- .../Framework/interface/maker/MakerPluginFactory.h | 12 - FWCore/Framework/interface/maker/ModuleHolder.h | 39 +- .../maker/{WorkerMaker.h => ModuleMaker.h} | 41 +- .../interface/maker/ModuleMakerPluginFactory.h | 12 + FWCore/Framework/src/EventProcessor.cc | 2 +- FWCore/Framework/src/GlobalSchedule.cc | 2 +- FWCore/Framework/src/ModuleHolder.cc | 25 - .../src/{Factory.cc => ModuleHolderFactory.cc} | 25 +- .../src/{Factory.h => ModuleHolderFactory.h} | 20 +- .../src/{WorkerMaker.cc => ModuleMaker.cc} | 24 +- FWCore/Framework/src/ModuleRegistry.cc | 9 +- FWCore/Framework/src/Schedule.cc | 22 +- FWCore/Framework/src/ScheduleItems.cc | 5 +- FWCore/Framework/src/StreamSchedule.cc | 2 +- FWCore/Framework/test/BuildFile.xml | 2 +- .../test/edproducer_productregistry_callback.cc | 16 +- FWCore/Framework/test/global_filter_t.cppunit.cc | 4 +- FWCore/Framework/test/global_producer_t.cppunit.cc | 4 +- FWCore/Framework/test/limited_filter_t.cppunit.cc | 4 +- .../Framework/test/limited_producer_t.cppunit.cc | 4 +- FWCore/Framework/test/maker2_t.cppunit.cc | 4 +- FWCore/Framework/test/stream_filter_t.cppunit.cc | 4 +- FWCore/Framework/test/stream_producer_t.cppunit.cc | 4 +- ...ctory.cc => test_catch2_ModuleHolderFactory.cc} | 20 +- FWCore/MessageService/plugins/MessageLogger.h | 2 - .../ServiceRegistry/interface/ActivityRegistry.h | 19 +- FWCore/ServiceRegistry/interface/ProcessContext.h | 7 - FWCore/ServiceRegistry/interface/ServiceLegacy.h | 2 +- FWCore/ServiceRegistry/interface/ServiceMaker.h | 8 +- .../ServiceRegistry/interface/ServiceMakerBase.h | 10 +- FWCore/ServiceRegistry/interface/ServiceRegistry.h | 5 +- FWCore/ServiceRegistry/interface/ServicesManager.h | 5 +- FWCore/ServiceRegistry/src/ActivityRegistry.cc | 14 +- FWCore/ServiceRegistry/src/ProcessContext.cc | 18 +- FWCore/ServiceRegistry/src/ServiceRegistry.cc | 5 +- FWCore/ServiceRegistry/src/ServicesManager.cc | 37 +- .../test/servicesmanager_t.cppunit.cc | 13 - FWCore/Services/plugins/CPU.cc | 1 - FWCore/Services/plugins/CondorStatusUpdater.cc | 1 - FWCore/Services/plugins/InitRootHandlers.cc | 2 - .../Services/plugins/ResourceInformationService.cc | 2 - FWCore/Services/plugins/ZombieKillerService.cc | 6 - FWCore/Services/src/JobReportService.h | 1 - FWCore/Services/src/SiteLocalConfigService.h | 1 - FWCore/TestProcessor/src/TestProcessor.cc | 2 +- FWCore/TestProcessor/src/TestSourceProcessor.cc | 4 +- .../data/dd4hep/cmsExtendedGeometryRun4D122.xml | 2 +- .../python/cmsExtendedGeometryRun4D122XML_cfi.py | 2 +- .../CUDAServices/plugins/CUDAService.cc | 6 - .../ROCmServices/plugins/ROCmService.cc | 6 - IOPool/TFileAdaptor/src/TFileAdaptor.h | 6 - IgTools/IgProf/plugins/IgProfService.h | 1 - PerfTools/JeProf/plugins/JeProfService.cc | 1 - ...alUncalibRecHitPhase2WeightsAlgoPortable.dev.cc | 1 + .../TrackExtender/plugins/TrackExtenderWithMTD.cc | 101 ++-- .../plugins/RechitClusterProducer.cc | 1 - 98 files changed, 1928 insertions(+), 2498 deletions(-) delete mode 100644 DataFormats/Common/test/DataFrame_t.cpp delete mode 100644 DataFormats/Common/test/DetSetNewTS_t.cpp delete mode 100644 DataFormats/Common/test/DetSetNew_t.cpp delete mode 100644 DataFormats/Common/test/DictionaryTools_t.cpp delete mode 100644 DataFormats/Common/test/MapOfVectors_t.cpp delete mode 100644 DataFormats/Common/test/RefCore_t.cpp delete mode 100644 DataFormats/Common/test/RefVector_t.cpp delete mode 100644 DataFormats/Common/test/Ref_t.cpp delete mode 100644 DataFormats/Common/test/Trie_t.cpp rename DataFormats/Common/test/{testBoostRange.cpp => test_catch2_BoostRange.cpp} (100%) create mode 100644 DataFormats/Common/test/test_catch2_DataFrame.cpp create mode 100644 DataFormats/Common/test/test_catch2_DetSetNew.cpp create mode 100644 DataFormats/Common/test/test_catch2_DetSetNewTS.cpp rename DataFormats/Common/test/{DetSetVector_t.cpp => test_catch2_DetSetVector.cpp} (100%) rename DataFormats/Common/test/{DetSetVectorWithKey_t.cpp => test_catch2_DetSetVectorWithKey_t.cpp} (100%) create mode 100644 DataFormats/Common/test/test_catch2_DictionaryTools.cpp create mode 100644 DataFormats/Common/test/test_catch2_MapOfVectors.cpp rename DataFormats/Common/test/{OwnVector_t.cpp => test_catch2_OwnVector.cpp} (100%) create mode 100644 DataFormats/Common/test/test_catch2_Ref.cpp create mode 100644 DataFormats/Common/test/test_catch2_RefCore.cpp rename DataFormats/Common/test/{reftobase_t.cpp => test_catch2_RefToBase.cpp} (100%) create mode 100644 DataFormats/Common/test/test_catch2_RefVector.cpp rename DataFormats/Common/test/{StdArray_t.cpp => test_catch2_StdArray.cpp} (98%) rename DataFormats/Common/test/{ThinnedRefSet_t.cpp => test_catch2_ThinnedRefSet.cpp} (99%) create mode 100644 DataFormats/Common/test/test_catch2_Trie.cpp rename DataFormats/Common/test/{Wrapper_t.cpp => test_catch2_Wrapper.cpp} (100%) rename DataFormats/Common/test/{exDSTV.cpp => test_catch2_exDSTV.cpp} (100%) rename DataFormats/Common/test/{exTrie.cpp => test_catch2_exTrie.cpp} (100%) create mode 100644 DataFormats/Common/test/test_catch2_traits.cpp delete mode 100644 DataFormats/Common/test/traits_t.cpp delete mode 100644 FWCore/Framework/interface/maker/MakerPluginFactory.h rename FWCore/Framework/interface/maker/{WorkerMaker.h => ModuleMaker.h} (59%) create mode 100644 FWCore/Framework/interface/maker/ModuleMakerPluginFactory.h delete mode 100644 FWCore/Framework/src/ModuleHolder.cc rename FWCore/Framework/src/{Factory.cc => ModuleHolderFactory.cc} (53%) rename FWCore/Framework/src/{Factory.h => ModuleHolderFactory.h} (67%) rename FWCore/Framework/src/{WorkerMaker.cc => ModuleMaker.cc} (81%) rename FWCore/Framework/test/{test_catch2_Factory.cc => test_catch2_ModuleHolderFactory.cc} (95%) Switched to branch 'from-CMSSW_15_1_X_2025-06-15-2300'