From .
 * [new ref]                            -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/46360/head -> cms-sw/refs/pull/46360/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 L1Trigger/TrackFindingTracklet/README.md           |   2 +-
 .../TrackFindingTracklet/interface/Settings.h      |  40 +++-
 .../interface/TrackletConfigBuilder.h              |   1 +
 .../TrackFindingTracklet/interface/TrackletLUT.h   |   4 +-
 .../TrackFindingTracklet/interface/VMRouterCM.h    |  25 ++-
 .../interface/VMStubsTEMemory.h                    |   2 +-
 .../plugins/L1FPGATrackProducer.cc                 |  19 +-
 .../TrackFindingTracklet/plugins/ProducerAS.cc     |  97 ---------
 .../TrackFindingTracklet/plugins/ProducerKFout.cc  | 200 +++++++++----------
 .../TrackFindingTracklet/plugins/ProducerTT.cc     | 131 -------------
 .../TrackFindingTracklet/python/Analyzer_cff.py    |   1 -
 .../TrackFindingTracklet/python/Customize_cff.py   |   4 +
 .../TrackFindingTracklet/python/Producer_cff.py    |   2 -
 .../TrackFindingTracklet/python/Producer_cfi.py    |   3 +-
 .../python/l1tTTTracksFromTrackletEmulation_cfi.py |   9 +-
 L1Trigger/TrackFindingTracklet/src/FitTrack.cc     |   5 +-
 .../src/TrackletCalculatorDisplaced.cc             |   3 +
 .../src/TrackletConfigBuilder.cc                   | 188 +++++++++++++++---
 L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc  |  16 +-
 .../src/TrackletProcessorDisplaced.cc              |  47 ++++-
 L1Trigger/TrackFindingTracklet/src/VMRouterCM.cc   | 218 +++++++++++++++++----
 .../TrackFindingTracklet/src/VMStubsTEMemory.cc    |  28 +--
 L1Trigger/TrackFindingTracklet/test/AnalyzerTT.cc  | 129 ------------
 .../test/HybridTracksNewKF_cfg.py                  |   9 +-
 .../test/L1TrackNtupleMaker_cfg.py                 |  12 +-
 .../TrackFindingTracklet/test/L1TrackNtuplePlot.C  |  29 ++-
 L1Trigger/TrackFindingTracklet/test/makeHists.csh  |   2 +-
 L1Trigger/TrackerDTC/python/AnalyzerDAQ_cff.py     |   1 +
 L1Trigger/TrackerDTC/python/Analyzer_cff.py        |   1 +
 L1Trigger/TrackerDTC/test/testDAQ_cfg.py           |  34 ++--
 L1Trigger/TrackerDTC/test/test_cfg.py              |  26 +--
 L1Trigger/TrackerTFP/interface/DataFormats.h       |   6 +-
 32 files changed, 659 insertions(+), 635 deletions(-)
 delete mode 100644 L1Trigger/TrackFindingTracklet/plugins/ProducerAS.cc
 delete mode 100644 L1Trigger/TrackFindingTracklet/plugins/ProducerTT.cc
 delete mode 100644 L1Trigger/TrackFindingTracklet/test/AnalyzerTT.cc
Switched to branch 'from-CMSSW_14_2_X_2024-10-28-2300'