From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47454/head -> cms-sw/refs/pull/47454/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/Applications/python/ConfigBuilder.py |  36 +-
 .../python/upgradeWorkflowComponents.py            |  37 ++
 .../interface/CPUServiceBase.h                     |  12 +-
 .../interface/RootHandlers.h                       |  13 +-
 .../interface/TimingServiceBase.h                  |  12 +-
 FWCore/AbstractServices/src/CPUServiceBase.cc      |  18 +
 .../src/TimingServiceBase.cc                       |   8 +-
 FWCore/Framework/bin/BuildFile.xml                 |   7 +
 FWCore/Framework/bin/cmsRun.cpp                    |   2 +-
 FWCore/Framework/interface/Principal.h             |   2 -
 FWCore/Framework/src/EventProcessor.cc             |   7 +-
 FWCore/Framework/src/Principal.cc                  |  17 -
 FWCore/Framework/src/PrincipalCache.cc             |   2 -
 FWCore/Services/plugins/CPU.cc                     |   2 +-
 FWCore/Services/plugins/CondorStatusUpdater.cc     |   2 +-
 FWCore/Services/plugins/InitRootHandlers.cc        |   2 +-
 FWCore/Services/plugins/Timing.cc                  |   5 +-
 FWCore/Services/plugins/tracer_setupFile.cc        |   2 +-
 FWCore/Utilities/src/CPUServiceBase.cc             |  19 -
 .../data/mfshield/2023/v3/mfshield.xml             | 632 ++++++++++++++++++++
 Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml | 661 +++++++++++++++++++++
 .../python/testExtendedGeometry2025QXML_cfi.py     | 386 ++++++++++++
 .../test/python/g4OverlapCheck2021_cfg.py          |   4 +-
 .../HLT_75e33/modules/hltL1GTAcceptFilter_cfi.py   |   6 +
 .../python/HLT_75e33/paths/DST_PFScouting_cfi.py   |  64 ++
 .../HLT_75e33/sequences/HLTTrackingSequence_cfi.py |   9 +-
 .../Configuration/python/HLT_NGTScouting_cff.py    | 295 +++++++++
 .../scripts/hltPhase2UpgradeIntegrationTests       |   2 +-
 IOPool/Common/BuildFile.xml                        |   1 +
 IOPool/Common/src/RootServiceChecker.cc            |   2 +-
 IOPool/Output/BuildFile.xml                        |   1 +
 IOPool/Output/src/RootOutputTree.cc                |   2 +-
 IOPool/Streamer/src/StreamerInputSource.cc         |   2 -
 PerfTools/AllocMonitor/plugins/BuildFile.xml       |   3 +-
 .../AllocMonitor/plugins/moduleAlloc_setupFile.cc  |   2 +-
 .../KalmanVertexFit/interface/KalmanVertexFitter.h |  12 +-
 .../KalmanVertexFit/src/KalmanVertexFitter.cc      |  14 +-
 .../VertexTools/interface/SequentialVertexFitter.h |   7 +
 38 files changed, 2212 insertions(+), 98 deletions(-)
 rename FWCore/{Utilities => AbstractServices}/interface/CPUServiceBase.h (60%)
 rename FWCore/{Utilities => AbstractServices}/interface/RootHandlers.h (71%)
 rename FWCore/{Utilities => AbstractServices}/interface/TimingServiceBase.h (78%)
 create mode 100644 FWCore/AbstractServices/src/CPUServiceBase.cc
 rename FWCore/{Utilities => AbstractServices}/src/TimingServiceBase.cc (75%)
 delete mode 100644 FWCore/Utilities/src/CPUServiceBase.cc
 create mode 100644 Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml
 create mode 100644 Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml
 create mode 100644 Geometry/MuonCommonData/python/testExtendedGeometry2025QXML_cfi.py
 create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltL1GTAcceptFilter_cfi.py
 create mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/DST_PFScouting_cfi.py
 create mode 100644 HLTrigger/Configuration/python/HLT_NGTScouting_cff.py
Switched to branch 'from-CMSSW_15_1_X_2025-03-05-2300'