From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48093/head -> cms-sw/refs/pull/48093/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../L1Scouting/interface/L1ScoutingCaloTower.h     |  37 +++++++
 .../L1Scouting/interface/L1ScoutingFastJet.h       |  37 +++++++
 DataFormats/L1Scouting/interface/OrbitCollection.h |   2 +-
 DataFormats/L1Scouting/src/classes.h               |   2 +
 DataFormats/L1Scouting/src/classes_def.xml         |  22 +++-
 .../L1Scouting/test/TestL1ScoutingFormat.sh        |  11 +-
 DataFormats/L1Scouting/test/TestReadL1Scouting.cc  |  50 ++++++++-
 DataFormats/L1Scouting/test/TestWriteL1Scouting.cc |  32 +++++-
 .../test/create_L1Scouting_test_file_cfg.py        |   2 +
 DataFormats/L1Scouting/test/read_L1Scouting_cfg.py |   7 +-
 .../L1ScoutingRawData/interface/SDSNumbering.h     |   4 +-
 EventFilter/L1ScoutingRawToDigi/interface/blocks.h |   9 ++
 EventFilter/L1ScoutingRawToDigi/interface/masks.h  |  14 +++
 EventFilter/L1ScoutingRawToDigi/interface/shifts.h |  14 +++
 .../plugins/ScCaloTowerRawToDigi.cc                | 119 +++++++++++++++++++++
 .../plugins/ScCaloTowerRawToDigi.h                 |  45 ++++++++
 L1TriggerScouting/OnlineProcessing/BuildFile.xml   |   1 +
 .../OnlineProcessing/plugins/BuildFile.xml         |   1 +
 .../plugins/ScoutingJetProducer.cc                 | 115 ++++++++++++++++++++
 L1TriggerScouting/Utilities/interface/conversion.h |   8 ++
 L1TriggerScouting/Utilities/interface/scales.h     |   8 ++
 21 files changed, 529 insertions(+), 11 deletions(-)
 create mode 100644 DataFormats/L1Scouting/interface/L1ScoutingCaloTower.h
 create mode 100644 DataFormats/L1Scouting/interface/L1ScoutingFastJet.h
 create mode 100644 EventFilter/L1ScoutingRawToDigi/plugins/ScCaloTowerRawToDigi.cc
 create mode 100644 EventFilter/L1ScoutingRawToDigi/plugins/ScCaloTowerRawToDigi.h
 create mode 100644 L1TriggerScouting/OnlineProcessing/plugins/ScoutingJetProducer.cc
Switched to branch 'from-CMSSW_15_1_X_2025-05-15-1100'