From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48289/head -> cms-sw/refs/pull/48289/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 FWCore/Framework/src/EventProcessor.cc             |  32 +++--
 .../hltPfDeepFlavourJetTagsModEta2p4_cfi.py        |   2 +-
 .../modules/hltPfDeepFlavourJetTags_cfi.py         |   2 +-
 ...70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py |  39 ------
 ...75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py |  43 ------
 HLTrigger/Configuration/python/HLT_75e33_cff.py    |   4 -
 .../plugins/L1TrackVertexAssociationProducer.cc    |   2 +-
 .../Phase2L1ParticleFlow/interface/NNVtxAssoc.h    |  45 ++++++
 .../interface/puppi/linpuppi_ref.h                 |  42 +++++-
 .../Phase2L1ParticleFlow/python/l1ctLayer1_cff.py  |  13 +-
 .../python/mlAssociation_cfi.py                    |  11 ++
 L1Trigger/Phase2L1ParticleFlow/src/NNVtxAssoc.cc   | 108 +++++++++++++++
 .../src/puppi/linpuppi_ref.cpp                     |  57 +++++++-
 L1Trigger/VertexFinder/src/VertexFinder.cc         |   5 +-
 .../plugins/BMTFStubMultiBxSelector.cc             | 151 +++++++++++++++++++++
 .../OnlineProcessing/test/L1ScoutingSelector.py    |  31 ++++-
 .../HGCalSimProducers/interface/HGCFEElectronics.h |   4 +-
 .../HGCalSimProducers/plugins/HGCDigitizer.cc      |   3 +
 .../HGCalSimProducers/src/HGCFEElectronics.cc      |  82 ++++++-----
 19 files changed, 526 insertions(+), 150 deletions(-)
 delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py
 delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/interface/NNVtxAssoc.h
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/python/mlAssociation_cfi.py
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/src/NNVtxAssoc.cc
 create mode 100644 L1TriggerScouting/OnlineProcessing/plugins/BMTFStubMultiBxSelector.cc
Switched to branch 'from-CMSSW_15_1_X_2025-06-10-1100'