From ea69aac905ca910b894e271f51d3ed22ba957bf5 Mon Sep 17 00:00:00 2001 From: Vincenzo Innocente Date: Thu, 30 Jul 2020 21:12:48 +0200 Subject: [PATCH] Apply code formatting (#524) --- EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h | 6 ++++-- .../EcalRecProducers/plugins/DeclsForKernels.h | 10 +++++----- .../EcalRecProducers/plugins/EcalRecHitProducerGPU.cc | 5 +++-- .../plugins/EcalUncalibRecHitProducerGPU.cc | 5 +++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h b/EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h index 343b329165f55..a6429121adc82 100644 --- a/EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h +++ b/EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h @@ -39,8 +39,10 @@ namespace ecal { DigisCollection<::calo::common::DevStoragePolicy> digisEB, digisEE; void allocate(ConfigurationParameters const &config, cudaStream_t cudaStream) { - digisEB.data = cms::cuda::make_device_unique(config.maxChannelsEB * EcalDataFrame::MAXSAMPLES, cudaStream); - digisEE.data = cms::cuda::make_device_unique(config.maxChannelsEE * EcalDataFrame::MAXSAMPLES, cudaStream); + digisEB.data = + cms::cuda::make_device_unique(config.maxChannelsEB * EcalDataFrame::MAXSAMPLES, cudaStream); + digisEE.data = + cms::cuda::make_device_unique(config.maxChannelsEE * EcalDataFrame::MAXSAMPLES, cudaStream); digisEB.ids = cms::cuda::make_device_unique(config.maxChannelsEB, cudaStream); digisEE.ids = cms::cuda::make_device_unique(config.maxChannelsEE, cudaStream); } diff --git a/RecoLocalCalo/EcalRecProducers/plugins/DeclsForKernels.h b/RecoLocalCalo/EcalRecProducers/plugins/DeclsForKernels.h index aa4f88c58c4e8..c11cddac00275 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/DeclsForKernels.h +++ b/RecoLocalCalo/EcalRecProducers/plugins/DeclsForKernels.h @@ -100,8 +100,8 @@ namespace ecal { void allocate(ConfigurationParameters const& configParameters, cudaStream_t cudaStream) { auto const sizeEB = configParameters.maxNumberHitsEB; - recHitsEB.amplitudesAll = - cms::cuda::make_device_unique(sizeEB * EcalDataFrame::MAXSAMPLES, cudaStream); + recHitsEB.amplitudesAll = cms::cuda::make_device_unique( + sizeEB * EcalDataFrame::MAXSAMPLES, cudaStream); recHitsEB.amplitude = cms::cuda::make_device_unique(sizeEB, cudaStream); recHitsEB.chi2 = cms::cuda::make_device_unique(sizeEB, cudaStream); recHitsEB.pedestal = cms::cuda::make_device_unique(sizeEB, cudaStream); @@ -115,8 +115,8 @@ namespace ecal { recHitsEB.flags = cms::cuda::make_device_unique(sizeEB, cudaStream); auto const sizeEE = configParameters.maxNumberHitsEE; - recHitsEE.amplitudesAll = - cms::cuda::make_device_unique(sizeEE * EcalDataFrame::MAXSAMPLES, cudaStream); + recHitsEE.amplitudesAll = cms::cuda::make_device_unique( + sizeEE * EcalDataFrame::MAXSAMPLES, cudaStream); recHitsEE.amplitude = cms::cuda::make_device_unique(sizeEE, cudaStream); recHitsEE.chi2 = cms::cuda::make_device_unique(sizeEE, cudaStream); recHitsEE.pedestal = cms::cuda::make_device_unique(sizeEE, cudaStream); @@ -278,7 +278,7 @@ namespace ecal { uint32_t flagmask; uint32_t maxNumberHitsEB; uint32_t maxNumberHitsEE; - + // // bool shouldRunTimingComputation; }; diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitProducerGPU.cc b/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitProducerGPU.cc index f34925fe87ad8..46c9fcd6ab444 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitProducerGPU.cc +++ b/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitProducerGPU.cc @@ -124,7 +124,7 @@ EcalRecHitProducerGPU::EcalRecHitProducerGPU(const edm::ParameterSet& ps) { // max number of digis to allocate for configParameters_.maxNumberHitsEB = ps.getParameter("maxNumberHitsEB"); configParameters_.maxNumberHitsEE = ps.getParameter("maxNumberHitsEE"); - + flagmask_ = 0; flagmask_ |= 0x1 << EcalRecHit::kNeighboursRecovered; flagmask_ |= 0x1 << EcalRecHit::kTowerRecovered; @@ -166,7 +166,8 @@ void EcalRecHitProducerGPU::acquire(edm::Event const& event, // std::cout << " [EcalRecHitProducerGPU::acquire] neb_:nee_ = " << neb_ << " : " << nee_ << std::endl; if ((neb_ > configParameters_.maxNumberHitsEB) || (nee_ > configParameters_.maxNumberHitsEE)) { - edm::LogError("EcalRecHitProducerGPU") << "max number of channels exceeded. See options 'maxNumberHitsEB and maxNumberHitsEE' "; + edm::LogError("EcalRecHitProducerGPU") + << "max number of channels exceeded. See options 'maxNumberHitsEB and maxNumberHitsEE' "; } int nchannelsEB = ebUncalibRecHits.size; // --> offsetForInput, first EB and then EE diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc index fed87e073eef8..a90017c0ae6db 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc +++ b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitProducerGPU.cc @@ -148,7 +148,7 @@ EcalUncalibRecHitProducerGPU::EcalUncalibRecHitProducerGPU(const edm::ParameterS // max number of digis to allocate for configParameters_.maxNumberHitsEB = ps.getParameter("maxNumberHitsEB"); configParameters_.maxNumberHitsEE = ps.getParameter("maxNumberHitsEE"); - + // switch to run timing computation kernels configParameters_.shouldRunTimingComputation = ps.getParameter("shouldRunTimingComputation"); @@ -213,7 +213,8 @@ void EcalUncalibRecHitProducerGPU::acquire(edm::Event const& event, nee_ = eeDigis.size; if ((neb_ > configParameters_.maxNumberHitsEB) || (nee_ > configParameters_.maxNumberHitsEE)) { - edm::LogError("EcalUncalibRecHitProducerGPU") << "max number of channels exceeded. See options 'maxNumberHitsEB and maxNumberHitsEE' "; + edm::LogError("EcalUncalibRecHitProducerGPU") + << "max number of channels exceeded. See options 'maxNumberHitsEB and maxNumberHitsEE' "; } // conditions