From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47193/head -> cms-sw/refs/pull/47193/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../interface/DigitizedClusterCorrelator.h | 7 +- .../interface/GCTEmDigiCluster.h | 137 +++++++ .../interface/GCTHadDigiCluster.h | 84 ++++ DataFormats/L1TCalorimeterPhase2/src/classes.h | 8 +- .../L1TCalorimeterPhase2/src/classes_def.xml | 56 ++- .../interface/Phase2L1CaloBarrelToCorrelator.h | 27 ++ .../interface/Phase2L1CaloEGammaUtils.h | 48 +++ .../plugins/Phase2L1TCaloBarrelToCorrelator.cc | 446 +++++++++++++++++++++ ...hase2GCTBarrelToCorrelatorLayer1Emulator_cfi.py | 7 + 9 files changed, 796 insertions(+), 24 deletions(-) create mode 100644 DataFormats/L1TCalorimeterPhase2/interface/GCTEmDigiCluster.h create mode 100644 DataFormats/L1TCalorimeterPhase2/interface/GCTHadDigiCluster.h create mode 100644 L1Trigger/L1CaloTrigger/interface/Phase2L1CaloBarrelToCorrelator.h create mode 100644 L1Trigger/L1CaloTrigger/plugins/Phase2L1TCaloBarrelToCorrelator.cc create mode 100644 L1Trigger/L1CaloTrigger/python/l1tPhase2GCTBarrelToCorrelatorLayer1Emulator_cfi.py Switched to branch 'from-CMSSW_15_1_X_2025-02-14-1100'