From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47124/head -> cms-sw/refs/pull/47124/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../plugins/EcalUncalibRecHitSoAToLegacy.cc | 11 +- .../alpaka/EcalPhase2DigiToPortableProducer.cc | 75 +++++++++++ ...alUncalibRecHitPhase2WeightsAlgoPortable.dev.cc | 80 ++++++++++++ .../EcalUncalibRecHitPhase2WeightsAlgoPortable.h | 19 +++ ...alUncalibRecHitPhase2WeightsProducerPortable.cc | 141 +++++++++++++++++++++ .../alpaka/EcalUncalibRecHitPhase2WeightsStruct.h | 15 +++ .../EcalRecProducers/python/ecalRecHit_cff.py | 10 ++ .../python/ecalUncalibRecHitPhase2_cff.py | 69 +++++----- 8 files changed, 380 insertions(+), 40 deletions(-) create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalPhase2DigiToPortableProducer.cc create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsAlgoPortable.dev.cc create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsAlgoPortable.h create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsProducerPortable.cc create mode 100644 RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitPhase2WeightsStruct.h Switched to branch 'from-CMSSW_15_1_X_2025-04-01-1100'