From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48111/head -> cms-sw/refs/pull/48111/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../python/TkAlAllInOneTool/DiMuonV_cfg.py | 5 +- .../python/TkAlAllInOneTool/JetHT_cfg.py | 5 +- .../python/TkAlAllInOneTool/PV_cfg.py | 14 +- .../python/TkAlAllInOneTool/SplitV_cfg.py | 5 +- .../python/TkAlAllInOneTool/Zmumu_cfg.py | 5 +- .../test/PVValidation_TEMPL_cfg.py | 10 +- .../OfflineValidation/test/PVValidation_T_cfg.py | 10 +- .../test/PrimaryVertexResolution_cfg.py | 5 +- .../test/PrimaryVertexResolution_templ_cfg.py | 9 +- .../testPrimaryVertexRelatedValidations_cfg.py | 11 +- .../OfflineValidation/test/test_all_Phase2_cfg.py | 15 +- Alignment/OfflineValidation/test/test_all_cfg.py | 11 +- .../plugins/BeamSpotCompatibilityChecker.cc | 187 ++++++++++++++------- .../plugins/BeamSpotOnlineProducer.cc | 8 +- .../test/testBeamSpotCompatibility.cc | 4 +- .../test/testBeamSpotCompatibility_cfg.py | 15 +- 16 files changed, 205 insertions(+), 114 deletions(-) Switched to branch 'from-CMSSW_15_1_X_2025-05-16-1100'