From . * [new ref] -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/45665/head -> cms-sw/refs/pull/45665/head Switched to branch 'merge-attempt' Auto-merging CondFormats/HGCalObjects/BuildFile.xml Merge made by the 'ort' strategy. .../DataRecord/interface/HGCalDenseIndexInfoRcd.h | 29 + .../interface/HGCalModuleConfigurationRcd.h | 28 + .../DataRecord/src/HGCalDenseIndexInfoRcd.cc | 15 + .../DataRecord/src/HGCalModuleConfigurationRcd.cc | 15 + .../interface/HGCalCalibrationParameterHost.h | 19 + .../interface/HGCalCalibrationParameterSoA.h | 47 + .../HGCalObjects/interface/HGCalConfiguration.h | 68 ++ .../interface/HGCalMappingModuleIndexer.h | 164 +++- ...ostCollection.h => HGCalMappingParameterHost.h} | 13 +- .../interface/HGCalMappingParameterSoA.h | 17 +- .../alpaka/HGCalCalibrationParameterDevice.h | 23 + ...eCollection.h => HGCalMappingParameterDevice.h} | 18 +- .../HGCalObjects/src/ES_HGCalMappingParameter.cc | 5 - .../HGCalObjects/src/HGCalMappingParameterHost.cc | 6 + .../T_EventSetup_HGCalCalibrationParameterHost.cc | 5 + .../src/T_EventSetup_HGCalConfiguration.cc | 4 + .../src/alpaka/ES_HGCalMappingParameter.cc | 5 - .../src/alpaka/HGCalMappingParameterDevice.cc | 6 + ...T_EventSetup_HGCalCalibrationParameterDevice.cc | 5 + CondFormats/HGCalObjects/src/classes_def.xml | 46 +- CondFormats/HGCalObjects/src/headers.h | 3 +- CondFormats/HGCalObjects/test/BuildFile.xml | 2 +- .../test/testSerializationHGCalCondDataFormats.cc | 2 +- DataFormats/HGCalDigi/BuildFile.xml | 5 + .../HGCalDigi/interface/HGCROCChannelDataFrame.h | 3 +- .../HGCalDigi/interface/HGCalDigiCollections.h | 4 +- DataFormats/HGCalDigi/interface/HGCalDigiHost.h | 14 + DataFormats/HGCalDigi/interface/HGCalDigiSoA.h | 26 + .../HGCalDigi/interface/HGCalECONDPacketInfoHost.h | 14 + .../HGCalDigi/interface/HGCalECONDPacketInfoSoA.h | 74 ++ .../HGCalDigi/interface/HGCalRawDataDefinitions.h | 74 ++ .../HGCalDigi/interface/alpaka/HGCalDigiDevice.h | 23 + .../interface/alpaka/HGCalECONDPacketInfoDevice.h | 23 + DataFormats/HGCalDigi/src/alpaka/classes_cuda.h | 6 + .../HGCalDigi/src/alpaka/classes_cuda_def.xml | 8 + DataFormats/HGCalDigi/src/alpaka/classes_rocm.h | 6 + .../HGCalDigi/src/alpaka/classes_rocm_def.xml | 8 + DataFormats/HGCalDigi/src/classes.cc | 6 + DataFormats/HGCalDigi/src/classes.h | 5 +- DataFormats/HGCalDigi/src/classes_def.xml | 58 +- DataFormats/HGCalRecHit/BuildFile.xml | 11 + .../HGCalRecHit/interface/HGCalRecHitHost.h | 14 + DataFormats/HGCalRecHit/interface/HGCalRecHitSoA.h | 24 + .../interface/alpaka/HGCalRecHitDevice.h | 23 + DataFormats/HGCalRecHit/src/alpaka/classes_cuda.h | 4 + .../HGCalRecHit/src/alpaka/classes_cuda_def.xml | 5 + DataFormats/HGCalRecHit/src/alpaka/classes_rocm.h | 4 + .../HGCalRecHit/src/alpaka/classes_rocm_def.xml | 5 + DataFormats/HGCalRecHit/src/classes.cc | 4 + DataFormats/HGCalRecHit/src/classes.h | 3 + DataFormats/HGCalRecHit/src/classes_def.xml | 6 + EventFilter/HGCalRawToDigi/BuildFile.xml | 3 + .../HGCalRawToDigi/interface/HGCalFrameGenerator.h | 95 -- .../interface/HGCalModuleTreeReader.h | 42 - .../interface/HGCalRawDataDefinitions.h | 96 -- .../HGCalRawToDigi/interface/HGCalUnpacker.h | 243 ++--- EventFilter/HGCalRawToDigi/plugins/BuildFile.xml | 2 - .../HGCalRawToDigi/plugins/HGCalRawToDigi.cc | 170 ++-- .../HGCalRawToDigi/plugins/HGCalSlinkEmulator.cc | 168 ---- .../HGCalRawToDigi/src/HGCalFrameGenerator.cc | 309 ------- .../HGCalRawToDigi/src/HGCalModuleTreeReader.cc | 103 --- EventFilter/HGCalRawToDigi/src/HGCalUnpacker.cc | 986 +++++++-------------- EventFilter/HGCalRawToDigi/test/BuildFile.xml | 9 - .../HGCalRawToDigi/test/HGCalUnpackerTest.cc | 88 +- .../test/emulation_and_unpacking_cfg.py | 145 --- .../HGCalMapping/interface/HGCalMappingTools.h | 6 + Geometry/HGCalMapping/plugins/BuildFile.xml | 5 +- .../HGCalMapping/plugins/HGCalMappingESProducer.cc | 32 +- .../alpaka/HGCalDenseIndexInfoESProducer.cc | 162 ++++ .../plugins/alpaka/HGCalMappingCellESProducer.cc | 10 +- .../plugins/alpaka/HGCalMappingModuleESProducer.cc | 13 +- Geometry/HGCalMapping/python/hgcalmapping_cff.py | 26 + .../test/HGCalMappingESSourceTester.cc | 102 ++- .../test/alpaka/HGCalMappingESSourceTester.cc | 433 +++++++++ .../test/testMappingModuleIndexer_cfg.py | 22 +- RecoLocalCalo/HGCalRecAlgos/BuildFile.xml | 14 +- .../alpaka/HGCalRecHitCalibrationAlgorithms.h | 49 + RecoLocalCalo/HGCalRecAlgos/plugins/BuildFile.xml | 26 + .../plugins/HGCalConfigurationESProducer.cc | 231 +++++ .../alpaka/HGCalRecHitCalibrationAlgorithms.dev.cc | 202 +++++ .../alpaka/HGCalRecHitCalibrationESProducer.cc | 169 ++++ .../alpaka/HGCalRecHitConfigurationESProducer.cc | 99 +++ .../plugins/alpaka/HGCalRecHitProducers.cc | 147 +++ RecoLocalCalo/HGCalRecAlgos/test/BuildFile.xml | 13 + .../test/alpaka/TestHGCalRecHitESProducers.cc | 139 +++ .../test/testHGCalRecHitESProducers_cfg.py | 146 +++ SimCalorimetry/HGCalSimAlgos/BuildFile.xml | 1 + .../HGCalSimAlgos}/interface/HGCalECONDEmulator.h | 8 +- .../interface/HGCalECONDEmulatorInfo.h | 4 +- .../interface/HGCalECONDEmulatorParameters.h | 4 +- .../interface/HGCalRawDataPackingTools.h | 18 +- .../HGCalSimAlgos}/interface/SlinkTypes.h | 8 +- .../src/HGCalECONDEmulatorParameters.cc | 4 +- .../HGCalSimAlgos}/src/HGCalRawDataPackingTools.cc | 17 +- .../HGCalSimAlgos}/src/TrivialEmulator.cc | 6 +- SimCalorimetry/HGCalSimProducers/BuildFile.xml | 2 +- .../HGCalSimProducers/plugins/BuildFile.xml | 22 +- 97 files changed, 3492 insertions(+), 2112 deletions(-) create mode 100644 CondFormats/DataRecord/interface/HGCalDenseIndexInfoRcd.h create mode 100644 CondFormats/DataRecord/interface/HGCalModuleConfigurationRcd.h create mode 100644 CondFormats/DataRecord/src/HGCalDenseIndexInfoRcd.cc create mode 100644 CondFormats/DataRecord/src/HGCalModuleConfigurationRcd.cc create mode 100644 CondFormats/HGCalObjects/interface/HGCalCalibrationParameterHost.h create mode 100644 CondFormats/HGCalObjects/interface/HGCalCalibrationParameterSoA.h create mode 100644 CondFormats/HGCalObjects/interface/HGCalConfiguration.h rename CondFormats/HGCalObjects/interface/{HGCalMappingParameterHostCollection.h => HGCalMappingParameterHost.h} (60%) create mode 100644 CondFormats/HGCalObjects/interface/alpaka/HGCalCalibrationParameterDevice.h rename CondFormats/HGCalObjects/interface/alpaka/{HGCalMappingParameterDeviceCollection.h => HGCalMappingParameterDevice.h} (51%) delete mode 100644 CondFormats/HGCalObjects/src/ES_HGCalMappingParameter.cc create mode 100644 CondFormats/HGCalObjects/src/HGCalMappingParameterHost.cc create mode 100644 CondFormats/HGCalObjects/src/T_EventSetup_HGCalCalibrationParameterHost.cc create mode 100644 CondFormats/HGCalObjects/src/T_EventSetup_HGCalConfiguration.cc delete mode 100644 CondFormats/HGCalObjects/src/alpaka/ES_HGCalMappingParameter.cc create mode 100644 CondFormats/HGCalObjects/src/alpaka/HGCalMappingParameterDevice.cc create mode 100644 CondFormats/HGCalObjects/src/alpaka/T_EventSetup_HGCalCalibrationParameterDevice.cc create mode 100644 DataFormats/HGCalDigi/interface/HGCalDigiHost.h create mode 100644 DataFormats/HGCalDigi/interface/HGCalDigiSoA.h create mode 100644 DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoHost.h create mode 100644 DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoSoA.h create mode 100644 DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h create mode 100644 DataFormats/HGCalDigi/interface/alpaka/HGCalDigiDevice.h create mode 100644 DataFormats/HGCalDigi/interface/alpaka/HGCalECONDPacketInfoDevice.h create mode 100644 DataFormats/HGCalDigi/src/alpaka/classes_cuda.h create mode 100644 DataFormats/HGCalDigi/src/alpaka/classes_cuda_def.xml create mode 100644 DataFormats/HGCalDigi/src/alpaka/classes_rocm.h create mode 100644 DataFormats/HGCalDigi/src/alpaka/classes_rocm_def.xml create mode 100644 DataFormats/HGCalDigi/src/classes.cc create mode 100644 DataFormats/HGCalRecHit/BuildFile.xml create mode 100644 DataFormats/HGCalRecHit/interface/HGCalRecHitHost.h create mode 100644 DataFormats/HGCalRecHit/interface/HGCalRecHitSoA.h create mode 100644 DataFormats/HGCalRecHit/interface/alpaka/HGCalRecHitDevice.h create mode 100644 DataFormats/HGCalRecHit/src/alpaka/classes_cuda.h create mode 100644 DataFormats/HGCalRecHit/src/alpaka/classes_cuda_def.xml create mode 100644 DataFormats/HGCalRecHit/src/alpaka/classes_rocm.h create mode 100644 DataFormats/HGCalRecHit/src/alpaka/classes_rocm_def.xml create mode 100644 DataFormats/HGCalRecHit/src/classes.cc create mode 100644 DataFormats/HGCalRecHit/src/classes.h create mode 100644 DataFormats/HGCalRecHit/src/classes_def.xml delete mode 100644 EventFilter/HGCalRawToDigi/interface/HGCalFrameGenerator.h delete mode 100644 EventFilter/HGCalRawToDigi/interface/HGCalModuleTreeReader.h delete mode 100644 EventFilter/HGCalRawToDigi/interface/HGCalRawDataDefinitions.h delete mode 100644 EventFilter/HGCalRawToDigi/plugins/HGCalSlinkEmulator.cc delete mode 100644 EventFilter/HGCalRawToDigi/src/HGCalFrameGenerator.cc delete mode 100644 EventFilter/HGCalRawToDigi/src/HGCalModuleTreeReader.cc delete mode 100644 EventFilter/HGCalRawToDigi/test/emulation_and_unpacking_cfg.py create mode 100644 Geometry/HGCalMapping/plugins/alpaka/HGCalDenseIndexInfoESProducer.cc create mode 100644 Geometry/HGCalMapping/python/hgcalmapping_cff.py create mode 100644 Geometry/HGCalMapping/test/alpaka/HGCalMappingESSourceTester.cc create mode 100644 RecoLocalCalo/HGCalRecAlgos/interface/alpaka/HGCalRecHitCalibrationAlgorithms.h create mode 100644 RecoLocalCalo/HGCalRecAlgos/plugins/BuildFile.xml create mode 100644 RecoLocalCalo/HGCalRecAlgos/plugins/HGCalConfigurationESProducer.cc create mode 100644 RecoLocalCalo/HGCalRecAlgos/plugins/alpaka/HGCalRecHitCalibrationAlgorithms.dev.cc create mode 100644 RecoLocalCalo/HGCalRecAlgos/plugins/alpaka/HGCalRecHitCalibrationESProducer.cc create mode 100644 RecoLocalCalo/HGCalRecAlgos/plugins/alpaka/HGCalRecHitConfigurationESProducer.cc create mode 100644 RecoLocalCalo/HGCalRecAlgos/plugins/alpaka/HGCalRecHitProducers.cc create mode 100644 RecoLocalCalo/HGCalRecAlgos/test/alpaka/TestHGCalRecHitESProducers.cc create mode 100644 RecoLocalCalo/HGCalRecAlgos/test/testHGCalRecHitESProducers_cfg.py rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/interface/HGCalECONDEmulator.h (72%) rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/interface/HGCalECONDEmulatorInfo.h (92%) rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/interface/HGCalECONDEmulatorParameters.h (88%) rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/interface/HGCalRawDataPackingTools.h (90%) rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/interface/SlinkTypes.h (78%) rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/src/HGCalECONDEmulatorParameters.cc (96%) rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/src/HGCalRawDataPackingTools.cc (94%) rename {EventFilter/HGCalRawToDigi => SimCalorimetry/HGCalSimAlgos}/src/TrivialEmulator.cc (72%) Switched to branch 'from-CMSSW_14_2_X_2024-10-08-1100'