From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47798/head -> cms-sw/refs/pull/47798/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 DataFormats/L1TParticleFlow/interface/PFJet.h      |  32 +++++
 DataFormats/L1TParticleFlow/interface/datatypes.h  |  12 +-
 .../L1TParticleFlow/interface/gt_datatypes.h       |  24 +++-
 DataFormats/L1TParticleFlow/interface/jets.h       |  81 +++++++++--
 DataFormats/L1TParticleFlow/src/classes_def.xml    |   3 +-
 DataFormats/L1TParticleFlow/src/jets.cpp           |  20 +++
 .../Configuration/python/SimL1Emulator_cff.py      |   4 +
 .../Phase2L1ParticleFlow/interface/L1TSC4NGJetID.h |  50 +++++++
 .../interface/l1-converters/tkinput_ref.h          |  14 +-
 .../plugins/L1TSC4NGJetProducer.cc                 | 123 +++++++++++++++++
 .../Phase2L1ParticleFlow/python/l1pfJetMet_cff.py  |   4 +-
 L1Trigger/Phase2L1ParticleFlow/src/L1TSC4NGJet.cc  | 153 +++++++++++++++++++++
 .../src/l1-converters/tkinput_ref.cpp              |  52 +++++++
 13 files changed, 547 insertions(+), 25 deletions(-)
 create mode 100644 DataFormats/L1TParticleFlow/src/jets.cpp
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/interface/L1TSC4NGJetID.h
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/plugins/L1TSC4NGJetProducer.cc
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/src/L1TSC4NGJet.cc
Switched to branch 'from-CMSSW_15_1_X_2025-04-07-1100'