From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47792/head -> cms-sw/refs/pull/47792/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 DataFormats/L1TParticleFlow/interface/PFJet.h      |  2 +-
 DataFormats/L1TParticleFlow/interface/datatypes.h  |  2 +
 .../L1TParticleFlow/interface/gt_datatypes.h       | 87 ++++++++++++++++++++
 DataFormats/L1TParticleFlow/interface/jets.h       | 44 +++++++---
 .../Configuration/python/SimL1Emulator_cff.py      |  9 +--
 .../interface/jetmet/L1SeedConePFJetEmulator.h     | 31 +++++++-
 .../plugins/L1SeedConePFJetProducer.cc             | 90 ++++++++++++++-------
 .../Phase2L1ParticleFlow/python/l1pfJetMet_cff.py  | 19 ++++-
 .../src/jetmet/L1SeedConePFJetEmulator.cc          | 93 +++++++++++++++++++---
 .../test/make_l1ct_binaryFiles_cfg.py              |  1 +
 10 files changed, 319 insertions(+), 59 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-04-03-2300'