From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47803/head -> cms-sw/refs/pull/47803/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../interface/SiStripClusterizerConditions.h       |  19 +-
 .../PyReleaseValidation/python/relval_nano.py      |   5 +-
 .../src/TrackToTrackComparisonHists.cc             |  45 ++---
 DQMOffline/JetMET/interface/JetAnalyzer.h          |   6 +
 DQMOffline/JetMET/python/jetAnalyzer_cff.py        |   2 +-
 DQMOffline/JetMET/python/jetAnalyzer_cfi.py        |  22 +--
 DQMOffline/JetMET/src/JetAnalyzer.cc               |  79 +++++++-
 .../Core/python/nanoDQMIO_perLSoutput_cff.py       |   9 +
 PhysicsTools/NanoAOD/python/autoNANO.py            |   2 +
 .../NanoAOD/python/custom_run3scouting_cff.py      |  75 +++++++-
 .../Run3ScoutingPFJetIDSelectionFunctor.h          | 206 +++++++++++++++++++++
 .../interface/ThreeThresholdAlgorithm.h            | 116 ------------
 .../plugins/ClustersFromRawProducer.cc             |  74 +++-----
 .../src/ThreeThresholdAlgorithm.cc                 | 114 ++++++++++++
 .../python/outInSeedsFromStandaloneMuons_cfi.py    |  27 +--
 .../src/OutsideInMuonSeeder.cc                     |  60 ++++--
 .../TkNavigation/plugins/CosmicNavigationSchool.cc |  21 +--
 .../CosmicsNavigationSchoolESProducer_cfi.py       |  23 +--
 Utilities/XrdAdaptor/src/XrdRequestManager.cc      |  10 +-
 19 files changed, 621 insertions(+), 294 deletions(-)
 create mode 100644 PhysicsTools/SelectorUtils/interface/Run3ScoutingPFJetIDSelectionFunctor.h
Switched to branch 'from-CMSSW_15_1_X_2025-04-07-1100'