From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47627/head -> cms-sw/refs/pull/47627/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. CUDADataFormats/HcalDigi/BuildFile.xml | 8 - .../HcalDigi/interface/DigiCollection.h | 160 --- CUDADataFormats/HcalDigi/src/classes.h | 3 - CUDADataFormats/HcalDigi/src/classes_def.xml | 36 - CUDADataFormats/HcalRecHitSoA/BuildFile.xml | 7 - .../HcalRecHitSoA/interface/RecHitCollection.h | 38 - CUDADataFormats/HcalRecHitSoA/src/classes.h | 3 - CUDADataFormats/HcalRecHitSoA/src/classes_def.xml | 13 - .../EcalTPGTools/interface/EcalReadoutTools.h | 2 +- CommonTools/CandAlgos/interface/CandCombiner.h | 2 +- .../DataRecord/interface/HcalCombinedRecordsGPU.h | 19 - .../DataRecord/src/HcalCombinedRecordsGPU.cc | 5 - CondFormats/HcalObjects/BuildFile.xml | 6 - .../HcalObjects/interface/HcalChannelQualityGPU.h | 37 - .../HcalConvertedEffectivePedestalWidthsGPU.h | 12 - .../interface/HcalConvertedEffectivePedestalsGPU.h | 14 - .../interface/HcalConvertedPedestalWidthsGPU.h | 43 - .../interface/HcalConvertedPedestalsGPU.h | 42 - .../HcalObjects/interface/HcalGainWidthsGPU.h | 40 - CondFormats/HcalObjects/interface/HcalGainsGPU.h | 37 - .../HcalObjects/interface/HcalLUTCorrsGPU.h | 36 - .../HcalObjects/interface/HcalPedestalWidthsGPU.h | 71 -- .../HcalObjects/interface/HcalPedestalsGPU.h | 46 - .../HcalObjects/interface/HcalQIECodersGPU.h | 41 - .../HcalObjects/interface/HcalQIETypesGPU.h | 36 - .../HcalObjects/interface/HcalRecoParamsGPU.h | 40 - .../HcalObjects/interface/HcalRespCorrsGPU.h | 36 - .../interface/HcalSiPMCharacteristicsGPU.h | 43 - .../HcalObjects/interface/HcalSiPMParametersGPU.h | 42 - .../HcalObjects/interface/HcalTimeCorrsGPU.h | 36 - .../HcalObjects/src/HcalChannelQualityGPU.cc | 39 - .../src/HcalConvertedEffectivePedestalWidthsGPU.cc | 4 - .../src/HcalConvertedEffectivePedestalsGPU.cc | 4 - .../src/HcalConvertedPedestalWidthsGPU.cc | 150 --- .../HcalObjects/src/HcalConvertedPedestalsGPU.cc | 122 -- CondFormats/HcalObjects/src/HcalGainWidthsGPU.cc | 54 - CondFormats/HcalObjects/src/HcalGainsGPU.cc | 46 - CondFormats/HcalObjects/src/HcalLUTCorrsGPU.cc | 38 - .../HcalObjects/src/HcalPedestalWidthsGPU.cc | 121 -- CondFormats/HcalObjects/src/HcalPedestalsGPU.cc | 65 - CondFormats/HcalObjects/src/HcalQIECodersGPU.cc | 51 - CondFormats/HcalObjects/src/HcalQIETypesGPU.cc | 38 - CondFormats/HcalObjects/src/HcalRecoParamsGPU.cc | 44 - CondFormats/HcalObjects/src/HcalRespCorrsGPU.cc | 38 - .../HcalObjects/src/HcalSiPMCharacteristicsGPU.cc | 63 - .../HcalObjects/src/HcalSiPMParametersGPU.cc | 61 - CondFormats/HcalObjects/src/HcalTimeCorrsGPU.cc | 38 - Configuration/Eras/python/Era_Run3_2025_cff.py | 4 +- .../Eras/python/Modifier_run3_CSC_2025_cff.py | 4 + Configuration/Geometry/README.md | 2 + .../GeometryDD4hepExtendedRun4D120Reco_cff.py | 61 + .../python/GeometryDD4hepExtendedRun4D120_cff.py | 17 + .../python/GeometryExtendedRun4D120Reco_cff.py | 61 + .../python/GeometryExtendedRun4D120_cff.py | 15 + Configuration/Geometry/python/dictRun4Geometry.py | 76 ++ .../PyReleaseValidation/python/relval_Run4.py | 1 + .../python/upgradeWorkflowComponents.py | 17 +- .../StandardSequences/python/GeometryConf.py | 2 + .../clients/l1scouting_dqm_clientPB-live_cfg.py | 48 + DQM/L1ScoutingMonitor/plugins/BuildFile.xml | 23 + DQM/L1ScoutingMonitor/plugins/L1ScoutingMonitor.cc | 69 ++ DQM/L1ScoutingMonitor/plugins/L1ScoutingMonitor.h | 72 ++ .../python/L1ScoutingMonitor_cff.py | 4 + .../python/L1ScoutingMonitor_cfi.py | 10 + DQM/L1ScoutingMonitor/test/testL1SMonitor.py | 88 ++ EventFilter/HcalRawToDigi/bin/BuildFile.xml | 7 - .../bin/makeHcalRaw2DigiGpuValidationPlots.cpp | 386 ------ EventFilter/HcalRawToDigi/plugins/BuildFile.xml | 10 - .../HcalRawToDigi/plugins/DeclsForKernels.h | 86 -- EventFilter/HcalRawToDigi/plugins/DecodeGPU.cu | 593 --------- EventFilter/HcalRawToDigi/plugins/DecodeGPU.h | 23 - .../HcalRawToDigi/plugins/ElectronicsMappingGPU.cc | 63 - .../HcalRawToDigi/plugins/ElectronicsMappingGPU.h | 48 - .../HcalRawToDigi/plugins/HcalCPUDigisProducer.cc | 117 -- .../HcalRawToDigi/plugins/HcalDigisProducerGPU.cc | 235 ---- .../HcalRawToDigi/plugins/HcalESProducerGPUDefs.cc | 10 - .../HcalRawToDigi/plugins/HcalRawToDigiGPU.cc | 195 --- FWCore/Concurrency/README.md | 39 +- FWCore/Framework/src/EventProcessor.cc | 7 +- FWCore/ServiceRegistry/interface/ServicesManager.h | 2 +- FWCore/Utilities/src/EDMException.cc | 8 +- FWCore/Utilities/test/test_catch2_EDMException.cc | 4 +- .../data/dd4hep/cmsExtendedGeometryRun4D120.xml | 125 ++ .../python/cmsExtendedGeometryRun4D120XML_cfi.py | 129 ++ Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml | 16 +- .../HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml | 178 +-- .../data/hgcalwafer/v19/hgcalwafer.xml | 64 +- .../plugins/DDHGCalSiliconRotatedCassette.cc | 11 +- .../python/Tools/confdbOfflineConverter.py | 29 +- .../python/cscTriggerPrimitiveDigis_cfi.py | 8 +- .../python/params/showerParams.py | 82 ++ RecoHGCal/TICL/python/ticlDumper_cff.py | 11 +- .../python/RecoLocalCalo_Cosmics_cff.py | 2 +- .../Configuration/python/customiseHBHEreco.py | 20 +- .../Configuration/python/hcalGlobalReco_cff.py | 21 +- .../Configuration/python/hcalLocalReco_cff.py | 42 +- RecoLocalCalo/HcalRecAlgos/BuildFile.xml | 3 - .../interface/HcalMahiPulseOffsetsGPU.h | 35 - .../interface/HcalRecoParamsWithPulseShapesGPU.h | 54 - .../HcalRecAlgos/src/HcalMahiPulseOffsetsGPU.cc | 34 - .../src/HcalRecoParamsWithPulseShapesGPU.cc | 222 ---- .../test/run_mahidebugger_run3data_cfg.py | 2 +- RecoLocalCalo/HcalRecProducers/BuildFile.xml | 9 - RecoLocalCalo/HcalRecProducers/bin/BuildFile.xml | 6 - .../bin/makeHcalRecHitGpuValidationPlots.cpp | 283 ----- .../python/HBHE_custom_25nsMethod.py | 4 +- .../python/hbheRecHitProducerGPUTask_cff.py | 67 -- .../HcalRecProducers/src/DeclsForKernels.h | 107 -- .../HcalRecProducers/src/HBHERecHitProducerGPU.cc | 269 ----- .../HcalRecProducers/src/HCALGPUAnalyzer.cc | 307 ----- .../HcalRecProducers/src/HcalCPURecHitsProducer.cc | 132 -- .../HcalRecProducers/src/HcalESProducersGPUDefs.cc | 127 -- .../src/HcalMahiPulseOffsetsGPUESProducer.cc | 59 - RecoLocalCalo/HcalRecProducers/src/KernelHelpers.h | 220 ---- RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu | 1272 -------------------- RecoLocalCalo/HcalRecProducers/src/SimpleAlgoGPU.h | 19 - .../test/make_GPUvsCPU_HCAL_plots.py | 28 - .../test/make_GPUvsCPU_HCAL_rechits.py | 149 --- .../src/PFClusterEMEnergyCorrector.cc | 4 +- .../src/L1TauTriggerFilterObjectProducer.cc | 64 + Validation/Configuration/python/ECALHCAL.py | 4 +- 121 files changed, 1207 insertions(+), 7348 deletions(-) delete mode 100644 CUDADataFormats/HcalDigi/BuildFile.xml delete mode 100644 CUDADataFormats/HcalDigi/interface/DigiCollection.h delete mode 100644 CUDADataFormats/HcalDigi/src/classes.h delete mode 100644 CUDADataFormats/HcalDigi/src/classes_def.xml delete mode 100644 CUDADataFormats/HcalRecHitSoA/BuildFile.xml delete mode 100644 CUDADataFormats/HcalRecHitSoA/interface/RecHitCollection.h delete mode 100644 CUDADataFormats/HcalRecHitSoA/src/classes.h delete mode 100644 CUDADataFormats/HcalRecHitSoA/src/classes_def.xml delete mode 100644 CondFormats/DataRecord/interface/HcalCombinedRecordsGPU.h delete mode 100644 CondFormats/DataRecord/src/HcalCombinedRecordsGPU.cc delete mode 100644 CondFormats/HcalObjects/interface/HcalChannelQualityGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalConvertedEffectivePedestalWidthsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalConvertedEffectivePedestalsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalConvertedPedestalWidthsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalConvertedPedestalsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalGainWidthsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalGainsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalLUTCorrsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalPedestalWidthsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalPedestalsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalQIECodersGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalQIETypesGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalRecoParamsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalRespCorrsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalSiPMCharacteristicsGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalSiPMParametersGPU.h delete mode 100644 CondFormats/HcalObjects/interface/HcalTimeCorrsGPU.h delete mode 100644 CondFormats/HcalObjects/src/HcalChannelQualityGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalConvertedEffectivePedestalWidthsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalConvertedEffectivePedestalsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalConvertedPedestalWidthsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalConvertedPedestalsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalGainWidthsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalGainsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalLUTCorrsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalPedestalWidthsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalPedestalsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalQIECodersGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalQIETypesGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalRecoParamsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalRespCorrsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalSiPMCharacteristicsGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalSiPMParametersGPU.cc delete mode 100644 CondFormats/HcalObjects/src/HcalTimeCorrsGPU.cc create mode 100644 Configuration/Eras/python/Modifier_run3_CSC_2025_cff.py create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D120Reco_cff.py create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtendedRun4D120_cff.py create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D120Reco_cff.py create mode 100644 Configuration/Geometry/python/GeometryExtendedRun4D120_cff.py create mode 100644 DQM/Integration/python/clients/l1scouting_dqm_clientPB-live_cfg.py create mode 100644 DQM/L1ScoutingMonitor/plugins/BuildFile.xml create mode 100644 DQM/L1ScoutingMonitor/plugins/L1ScoutingMonitor.cc create mode 100644 DQM/L1ScoutingMonitor/plugins/L1ScoutingMonitor.h create mode 100644 DQM/L1ScoutingMonitor/python/L1ScoutingMonitor_cff.py create mode 100644 DQM/L1ScoutingMonitor/python/L1ScoutingMonitor_cfi.py create mode 100644 DQM/L1ScoutingMonitor/test/testL1SMonitor.py delete mode 100644 EventFilter/HcalRawToDigi/bin/BuildFile.xml delete mode 100644 EventFilter/HcalRawToDigi/bin/makeHcalRaw2DigiGpuValidationPlots.cpp delete mode 100644 EventFilter/HcalRawToDigi/plugins/DeclsForKernels.h delete mode 100644 EventFilter/HcalRawToDigi/plugins/DecodeGPU.cu delete mode 100644 EventFilter/HcalRawToDigi/plugins/DecodeGPU.h delete mode 100644 EventFilter/HcalRawToDigi/plugins/ElectronicsMappingGPU.cc delete mode 100644 EventFilter/HcalRawToDigi/plugins/ElectronicsMappingGPU.h delete mode 100644 EventFilter/HcalRawToDigi/plugins/HcalCPUDigisProducer.cc delete mode 100644 EventFilter/HcalRawToDigi/plugins/HcalDigisProducerGPU.cc delete mode 100644 EventFilter/HcalRawToDigi/plugins/HcalESProducerGPUDefs.cc delete mode 100644 EventFilter/HcalRawToDigi/plugins/HcalRawToDigiGPU.cc create mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D120.xml create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D120XML_cfi.py delete mode 100644 RecoLocalCalo/HcalRecAlgos/interface/HcalMahiPulseOffsetsGPU.h delete mode 100644 RecoLocalCalo/HcalRecAlgos/interface/HcalRecoParamsWithPulseShapesGPU.h delete mode 100644 RecoLocalCalo/HcalRecAlgos/src/HcalMahiPulseOffsetsGPU.cc delete mode 100644 RecoLocalCalo/HcalRecAlgos/src/HcalRecoParamsWithPulseShapesGPU.cc delete mode 100644 RecoLocalCalo/HcalRecProducers/bin/BuildFile.xml delete mode 100644 RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp delete mode 100644 RecoLocalCalo/HcalRecProducers/python/hbheRecHitProducerGPUTask_cff.py delete mode 100644 RecoLocalCalo/HcalRecProducers/src/DeclsForKernels.h delete mode 100644 RecoLocalCalo/HcalRecProducers/src/HBHERecHitProducerGPU.cc delete mode 100644 RecoLocalCalo/HcalRecProducers/src/HCALGPUAnalyzer.cc delete mode 100644 RecoLocalCalo/HcalRecProducers/src/HcalCPURecHitsProducer.cc delete mode 100644 RecoLocalCalo/HcalRecProducers/src/HcalESProducersGPUDefs.cc delete mode 100644 RecoLocalCalo/HcalRecProducers/src/HcalMahiPulseOffsetsGPUESProducer.cc delete mode 100644 RecoLocalCalo/HcalRecProducers/src/KernelHelpers.h delete mode 100644 RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu delete mode 100644 RecoLocalCalo/HcalRecProducers/src/SimpleAlgoGPU.h delete mode 100644 RecoLocalCalo/HcalRecProducers/test/make_GPUvsCPU_HCAL_plots.py delete mode 100644 RecoLocalCalo/HcalRecProducers/test/make_GPUvsCPU_HCAL_rechits.py create mode 100644 RecoTauTag/HLTProducers/src/L1TauTriggerFilterObjectProducer.cc Switched to branch 'from-CMSSW_15_1_X_2025-03-27-2300'