From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47339/head -> cms-sw/refs/pull/47339/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. DataFormats/Common/interface/Association.h | 2 +- DataFormats/Common/interface/AssociationMap.h | 23 ++++----- DataFormats/Common/interface/AssociationVector.h | 2 +- DataFormats/Common/interface/ContainerMask.h | 2 +- DataFormats/Common/interface/ContainerMaskTraits.h | 2 +- DataFormats/Common/interface/DataFrameContainer.h | 11 ++-- DataFormats/Common/interface/DetSetVectorNew.h | 22 ++++---- DataFormats/Common/interface/HLTGlobalStatus.h | 34 ++++++------ DataFormats/Common/interface/HLTPathStatus.h | 3 +- DataFormats/Common/interface/MapOfVectors.h | 8 +-- DataFormats/Common/interface/MultiAssociation.h | 20 +++++--- DataFormats/Common/interface/Ptr.h | 4 +- DataFormats/Common/interface/RangeMap.h | 4 +- DataFormats/Common/interface/RefToBase.h | 8 +-- DataFormats/Common/interface/RefToBaseVector.h | 6 ++- DataFormats/Common/interface/Trie.h | 28 +++++----- DataFormats/Common/interface/TriggerResults.h | 8 +-- DataFormats/Common/interface/View.h | 4 +- .../Common/interface/getThinned_implementation.h | 16 +++--- DataFormats/Common/src/MultiAssociation.cc | 10 ++-- DataFormats/Common/src/PtrVectorBase.cc | 2 +- DataFormats/Common/test/DetSetNew_t.cpp | 6 +-- DataFormats/Common/test/MapOfVectors_t.cpp | 2 +- DataFormats/Common/test/TestWriteTriggerResults.cc | 2 +- DataFormats/Common/test/exDSTV.cpp | 6 +-- DataFormats/Common/test/testMultiAssociation.cc | 29 ++++++----- .../Common/test/testOneToManyAssociation.cc | 4 +- DataFormats/Common/test/testOneToOneAssociation.cc | 2 +- DataFormats/Provenance/interface/IndexIntoFile.h | 6 +-- DataFormats/Provenance/src/BranchIDListHelper.cc | 16 +++--- DataFormats/Provenance/src/IndexIntoFile.cc | 60 ++++++++++++---------- .../Provenance/src/ProductResolverIndexHelper.cc | 24 ++++----- FWCore/Common/interface/TriggerNames.h | 4 +- FWCore/Common/interface/TriggerResultsByName.h | 9 ++-- FWCore/Common/src/OutputProcessBlockHelper.cc | 3 +- FWCore/Common/src/ProcessBlockHelper.cc | 13 ++--- FWCore/Common/src/ProcessBlockHelperBase.cc | 6 ++- FWCore/Common/src/TriggerNames.cc | 4 +- FWCore/Common/src/TriggerResultsByName.cc | 24 ++++----- FWCore/Concurrency/interface/LimitedTaskQueue.h | 2 +- FWCore/FWLite/test/ref_t.cppunit.cpp | 18 +++---- FWCore/Framework/interface/ESProducer.h | 2 +- FWCore/Framework/interface/EventSetupsController.h | 2 +- FWCore/Framework/interface/ProductRegistryHelper.h | 10 ++-- FWCore/Framework/interface/TriggerNamesService.h | 2 +- .../interface/TriggerResultsBasedEventSelector.h | 2 +- FWCore/Framework/interface/global/implementors.h | 2 +- FWCore/Framework/interface/limited/implementors.h | 2 +- FWCore/Framework/interface/one/implementors.h | 2 +- FWCore/Framework/src/EDConsumerBase.cc | 15 +++--- FWCore/Framework/test/stubs/ToyIntProducers.cc | 4 +- FWCore/Integration/plugins/RandomIntProducer.cc | 4 +- FWCore/Integration/plugins/ViewAnalyzer.cc | 4 +- FWCore/MessageLogger/src/JobReport.cc | 2 +- .../plugins/MessageServicePSetValidation.cc | 6 +-- FWCore/MessageService/src/ELoutput.cc | 4 +- FWCore/MessageService/src/ELstatistics.cc | 2 +- FWCore/ParameterSet/interface/DocFormatHelper.h | 27 +++++----- FWCore/ParameterSet/src/DocFormatHelper.cc | 7 +-- .../ParameterSet/src/ParameterDescriptionBase.cc | 2 +- FWCore/ParameterSet/src/ParameterSwitchBase.cc | 2 +- FWCore/ParameterSet/src/ParameterWildcardBase.cc | 4 +- FWCore/ParameterSet/src/defaultModuleLabel.cc | 7 +-- FWCore/ParameterSet/src/types.cc | 13 ++--- FWCore/PrescaleService/interface/PrescaleService.h | 4 +- FWCore/PrescaleService/src/PrescaleService.cc | 4 +- .../PythonParameterSet/src/PyBind11ProcessDesc.cc | 2 +- .../PythonParameterSet/test/makepset_t.cppunit.cc | 2 +- FWCore/Reflection/src/FunctionWithDict.cc | 8 +-- FWCore/SOA/interface/Table.h | 6 +-- FWCore/SOA/interface/TableItr.h | 4 +- FWCore/SOA/interface/TableView.h | 9 ++-- FWCore/SOA/test/table_filling_t.cppunit.cpp | 18 +++---- FWCore/SOA/test/table_t.cppunit.cpp | 44 ++++++++-------- FWCore/Services/plugins/StallMonitor.cc | 4 +- FWCore/Services/plugins/monitor_file_utilities.cc | 2 +- FWCore/Services/plugins/tracer_setupFile.cc | 2 +- FWCore/SharedMemory/interface/ROOTDeserializer.h | 2 +- FWCore/SharedMemory/src/WriteBuffer.cc | 2 +- FWCore/SharedMemory/test/test_catch2_serialize.cc | 4 +- FWCore/SharedMemory/test/test_monitorthread.cc | 2 +- FWCore/Sources/interface/IDGeneratorSourceBase.h | 2 +- FWCore/TestProcessor/interface/TestProcessor.h | 10 ++-- FWCore/Utilities/bin/adler32.cc | 4 +- FWCore/Utilities/interface/EDPutToken.h | 2 +- FWCore/Utilities/interface/OStreamColumn.h | 6 +-- FWCore/Utilities/interface/OffsetToBase.h | 2 +- FWCore/Utilities/interface/SoATuple.h | 6 +-- FWCore/Utilities/interface/SoATupleHelper.h | 14 ++--- FWCore/Utilities/interface/isFinite.h | 2 +- FWCore/Utilities/src/CPUTimer.cc | 6 ++- FWCore/Utilities/src/ChildrenCPUTimer.cc | 4 +- FWCore/Utilities/src/Digest.cc | 20 ++++---- FWCore/Utilities/src/ESInputTag.cc | 2 +- FWCore/Utilities/src/Exception.cc | 2 +- FWCore/Utilities/src/OStreamColumn.cc | 4 +- FWCore/Utilities/src/Parse.cc | 2 +- FWCore/Utilities/src/ReleaseVersion.cc | 4 +- FWCore/Utilities/src/TimeOfDay.cc | 2 +- FWCore/Utilities/src/WallclockTimer.cc | 3 +- FWCore/Utilities/src/typelookup.cc | 2 +- FWCore/Utilities/test/RunningAverage_t.cpp | 6 +-- FWCore/Utilities/test/cputimer_t.cppunit.cpp | 2 +- FWCore/Utilities/test/soatuple_t.cppunit.cpp | 18 +++---- FWCore/Utilities/test/test_catch2_Exception.cc | 4 +- IOMC/RandomEngine/interface/TRandomAdaptor.h | 2 +- IOMC/RandomEngine/src/TRandomAdaptor.cc | 8 +-- IOPool/Input/test/ProductInfo.h | 4 +- IOPool/Streamer/bin/DiagStreamerFile.cpp | 6 +-- IOPool/Streamer/interface/EventMessage.h | 2 +- IOPool/Streamer/interface/EventMsgBuilder.h | 2 +- IOPool/Streamer/interface/InitMessage.h | 2 +- IOPool/Streamer/interface/InitMsgBuilder.h | 2 +- IOPool/Streamer/interface/MsgHeader.h | 2 +- IOPool/Streamer/interface/MsgTools.h | 34 ++++++------ IOPool/TFileAdaptor/src/ReadRepacker.cc | 14 ++--- IOPool/TFileAdaptor/src/TFileAdaptor.cc | 8 +-- IOPool/TFileAdaptor/src/TStorageFactoryFile.cc | 2 +- .../RandomEngine/src/RandomEngineStates.cc | 4 +- .../General/test/test_precomputed_value_sort.cpp | 14 ++--- 120 files changed, 484 insertions(+), 456 deletions(-) Switched to branch 'from-CMSSW_15_1_X_2025-02-12-1100'