From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48002/head -> cms-sw/refs/pull/48002/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 DataFormats/L1TCorrelator/src/TkEm.cc              |     2 -
 .../L1TParticleFlow/interface/PFCandidate.h        |     9 +-
 DataFormats/L1TParticleFlow/interface/PFCluster.h  |    60 +-
 .../L1TParticleFlow/interface/bit_encoding.h       |   172 +-
 DataFormats/L1TParticleFlow/interface/datatypes.h  |    10 +
 .../L1TParticleFlow/interface/layer1_emulator.h    |    23 +-
 .../L1TParticleFlow/interface/layer1_objs.h        |   307 +-
 DataFormats/L1TParticleFlow/src/classes_def.xml    |    15 +-
 .../L1TParticleFlow/src/layer1_emulator.cpp        |    35 +
 .../Configuration/python/SimL1Emulator_cff.py      |     9 +
 L1Trigger/DemonstratorTools/src/utilities.cc       |    14 +-
 .../L1CaloTrigger/plugins/L1NNCaloTauEmulator.cc   |     4 +-
 .../L1CaloTrigger/plugins/L1NNCaloTauProducer.cc   |     5 +-
 .../plugins/Phase2L1TCaloBarrelToCorrelator.cc     |     6 +
 .../data/egamma/compositeID_EB_v0.json             |  6489 ++++
 .../data/egamma/compositeID_EB_v1.json             | 10689 +++++++
 .../data/egamma/compositeID_EE_v0.json             |  1726 ++
 .../data/egamma/compositeID_EE_v1.json             |  1629 +
 .../data/multiclassID/multiclass_EE.json           | 29986 +++++++++++++++++++
 .../interface/HGC3DClusterEgID.h                   |     3 +-
 .../L1TCorrelatorLayer1PatternFileWriter.h         |    35 +-
 .../interface/ParametricResolution.h               |    23 +-
 L1Trigger/Phase2L1ParticleFlow/interface/conifer.h |   174 +
 .../Phase2L1ParticleFlow/interface/corrector.h     |    28 +-
 .../interface/egamma/pftkegalgo_ref.h              |   301 +-
 .../interface/l1-converters/gcteminput_ref.h       |    66 +
 .../interface/l1-converters/gcthadinput_ref.h      |    40 +
 .../interface/l1-converters/hgcalinput_ref.h       |    71 +-
 .../interface/l1-converters/nn_activation.h        |   103 +
 .../interface/l1-converters/nnet_common.h          |    71 +
 .../interface/puppi/linpuppi_ref.h                 |     2 +-
 .../regionizer/tdr_regionizer_elements_ref.h       |    25 +-
 .../regionizer/tdr_regionizer_elements_ref.icc     |   152 +-
 .../plugins/DeregionizerProducer.cc                |    43 +-
 .../plugins/L1TCorrelatorLayer1Producer.cc         |   619 +-
 .../plugins/PFClusterProducerFromHGC3DClusters.cc  |   179 -
 .../plugins/PFClusterProducerFromL1EGClusters.cc   |    48 +-
 .../python/l1TkEgAlgoEmulator_cfi.py               |    88 +-
 .../Phase2L1ParticleFlow/python/l1ctLayer1_cff.py  |   173 +-
 .../python/l1ctLayer1_patternWriters_cff.py        |   150 +-
 .../python/l1tPFClustersFromHGC3DClusters_cfi.py   |    15 +
 .../python/l1tPFClustersFromL1EGClusters_cfi.py    |     4 +-
 .../Phase2L1ParticleFlow/src/HGC3DClusterEgID.cc   |    17 +-
 .../src/L1TCorrelatorLayer1PatternFileWriter.cc    |   377 +-
 .../src/ParametricResolution.cc                    |     5 +
 L1Trigger/Phase2L1ParticleFlow/src/corrector.cc    |    99 +-
 .../src/egamma/pfeginput_ref.cpp                   |     6 +-
 .../src/egamma/pftkegalgo_ref.cpp                  |   486 +-
 .../src/l1-converters/gcteminput_ref.cpp           |    66 +
 .../src/l1-converters/gcthadinput_ref.cpp          |    46 +
 .../src/l1-converters/hgcalinputt_ref.cpp          |   235 +-
 .../src/l1-converters/tkinput_ref.cpp              |     4 +-
 .../Phase2L1ParticleFlow/src/pf/pfalgo2hgc_ref.cpp |     2 +-
 .../Phase2L1ParticleFlow/src/pf/pfalgo3_ref.cpp    |     4 +-
 .../src/puppi/linpuppi_ref.cpp                     |    29 +-
 .../src/regionizer/multififo_regionizer_ref.cpp    |     4 +-
 .../src/regionizer/tdr_regionizer_ref.cpp          |    15 +-
 .../test/make_l1ctLayer1_dumpFiles_fromRAW_cfg.py  |     9 +-
 .../test/make_l1ct_binaryFiles_cfg.py              |    83 +-
 59 files changed, 54109 insertions(+), 981 deletions(-)
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/data/egamma/compositeID_EB_v0.json
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/data/egamma/compositeID_EB_v1.json
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/data/egamma/compositeID_EE_v0.json
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/data/egamma/compositeID_EE_v1.json
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/data/multiclassID/multiclass_EE.json
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/interface/conifer.h
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/interface/l1-converters/gcteminput_ref.h
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/interface/l1-converters/gcthadinput_ref.h
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/interface/l1-converters/nn_activation.h
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/interface/l1-converters/nnet_common.h
 delete mode 100644 L1Trigger/Phase2L1ParticleFlow/plugins/PFClusterProducerFromHGC3DClusters.cc
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/src/l1-converters/gcteminput_ref.cpp
 create mode 100644 L1Trigger/Phase2L1ParticleFlow/src/l1-converters/gcthadinput_ref.cpp
Switched to branch 'from-CMSSW_15_1_X_2025-05-13-1100'