Skip to content

Commit 58bb9a8

Browse files
author
AdrianoDee
committed
Code formatting
1 parent 8cbe916 commit 58bb9a8

File tree

15 files changed

+247
-225
lines changed

15 files changed

+247
-225
lines changed

‎CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ namespace gpuClustering {
1111
#else
1212
// optimized for real data PU 50
1313
// tested on MC events with 55-75 pileup events
14-
constexpr uint32_t maxHitsInIter() { return 160; } //TODO better tuning for PU 140-200
14+
constexpr uint32_t maxHitsInIter() { return 160; } //TODO better tuning for PU 140-200
1515
#endif
1616
constexpr uint32_t maxHitsInModule() { return 1024; }
1717

18-
constexpr uint32_t maxNumDigis = 3*256*1024; // @PU=200 µ=530k σ=50k this is >4σ away
18+
constexpr uint32_t maxNumDigis = 3 * 256 * 1024; // @PU=200 µ=530k σ=50k this is >4σ away
1919
constexpr uint16_t maxNumModules = 4000;
2020

2121
constexpr int32_t maxNumClustersPerModules = maxHitsInModule();

‎CUDADataFormats/TrackingRecHit/src/TrackingRecHit2DHeterogeneous.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ cms::cuda::host::unique_ptr<float[]> TrackingRecHit2DGPU::localCoordToHostAsync(
1414
template <>
1515
cms::cuda::host::unique_ptr<uint32_t[]> TrackingRecHit2DGPU::hitsModuleStartToHostAsync(cudaStream_t stream) const {
1616
auto ret = cms::cuda::make_host_unique<uint32_t[]>(nMaxModules() + 1, stream);
17-
cudaCheck(cudaMemcpyAsync(
18-
ret.get(), m_hitsModuleStart, sizeof(uint32_t) * (nMaxModules() + 1), cudaMemcpyDefault, stream));
17+
cudaCheck(
18+
cudaMemcpyAsync(ret.get(), m_hitsModuleStart, sizeof(uint32_t) * (nMaxModules() + 1), cudaMemcpyDefault, stream));
1919
return ret;
2020
}
2121

‎Geometry/TrackerGeometryBuilder/interface/pixelTopology.h‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,35 @@ namespace phase2PixelTopology {
210210
constexpr uint32_t numberOfModules = 3892;
211211
constexpr uint8_t numberOfLayers = 28;
212212

213-
constexpr uint32_t layerStart[numberOfLayers + 1] = {
214-
0, 108, 324, 504, //Barrel
215-
756, 864, 972, 1080, 1188, 1296, 1404, 1512, 1620, 1796, 1972, 2148, //Fp
216-
2324, 2432, 2540, 2648, 2756, 2864, 2972, 3080, 3188, 3364, 3540, 3716, //Np
217-
numberOfModules};
213+
constexpr uint32_t layerStart[numberOfLayers + 1] = {0,
214+
108,
215+
324,
216+
504, //Barrel
217+
756,
218+
864,
219+
972,
220+
1080,
221+
1188,
222+
1296,
223+
1404,
224+
1512,
225+
1620,
226+
1796,
227+
1972,
228+
2148, //Fp
229+
2324,
230+
2432,
231+
2540,
232+
2648,
233+
2756,
234+
2864,
235+
2972,
236+
3080,
237+
3188,
238+
3364,
239+
3540,
240+
3716, //Np
241+
numberOfModules};
218242

219243
constexpr uint16_t findMaxModuleStride() {
220244
bool go = true;

‎RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterCUDA.cc‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,18 @@ SiPixelRawToClusterCUDA::SiPixelRawToClusterCUDA(const edm::ParameterSet& iConfi
9696
maxFedWords_(iConfig.getParameter<uint32_t>("MaxFEDWords")),
9797
clusterThresholds_{iConfig.getParameter<int32_t>("clusterThreshold_layer1"),
9898
iConfig.getParameter<int32_t>("clusterThreshold_otherLayers")} {
99-
if(isRun2_ and isUpgrade_)
100-
{
99+
if (isRun2_ and isUpgrade_) {
101100
throw cms::Exception("SiPixelRawToClusterCUDA") << "Cannot use isRun2 and isUpgrade at the same time\n";
102101
}
103102

104-
if (isUpgrade_)
105-
{
103+
if (isUpgrade_) {
106104
pixelDigiToken_ = consumes<edm::DetSetVector<PixelDigi>>(iConfig.getParameter<edm::InputTag>("InputDigis"));
107-
}
108-
else
109-
{
110-
rawGetToken_ = consumes<FEDRawDataCollection>(iConfig.getParameter<edm::InputTag>("InputLabel"));
111-
gpuMapToken_ = esConsumes<SiPixelROCsStatusAndMappingWrapper, CkfComponentsRecord>();
112-
gainsToken_ = esConsumes<SiPixelGainCalibrationForHLTGPU, SiPixelGainCalibrationForHLTGPURcd>();
113-
cablingMapToken_ = esConsumes<SiPixelFedCablingMap, SiPixelFedCablingMapRcd>( edm::ESInputTag("", iConfig.getParameter<std::string>("CablingMapLabel")));
114-
105+
} else {
106+
rawGetToken_ = consumes<FEDRawDataCollection>(iConfig.getParameter<edm::InputTag>("InputLabel"));
107+
gpuMapToken_ = esConsumes<SiPixelROCsStatusAndMappingWrapper, CkfComponentsRecord>();
108+
gainsToken_ = esConsumes<SiPixelGainCalibrationForHLTGPU, SiPixelGainCalibrationForHLTGPURcd>();
109+
cablingMapToken_ = esConsumes<SiPixelFedCablingMap, SiPixelFedCablingMapRcd>(
110+
edm::ESInputTag("", iConfig.getParameter<std::string>("CablingMapLabel")));
115111
}
116112

117113
if (includeErrors_) {
@@ -158,8 +154,7 @@ void SiPixelRawToClusterCUDA::acquire(const edm::Event& iEvent,
158154
edm::WaitingTaskWithArenaHolder waitingTaskHolder) {
159155
cms::cuda::ScopedContextAcquire ctx{iEvent.streamID(), std::move(waitingTaskHolder), ctxState_};
160156

161-
if (!isUpgrade_)
162-
{
157+
if (!isUpgrade_) {
163158
auto hgpuMap = iSetup.getHandle(gpuMapToken_);
164159
if (hgpuMap->hasQuality() != useQuality_) {
165160
throw cms::Exception("LogicError")
@@ -179,8 +174,8 @@ void SiPixelRawToClusterCUDA::acquire(const edm::Event& iEvent,
179174
if (regions_) {
180175
regions_->run(iEvent, iSetup);
181176
LogDebug("SiPixelRawToCluster") << "region2unpack #feds: " << regions_->nFEDs();
182-
LogDebug("SiPixelRawToCluster") << "region2unpack #modules (BPIX,EPIX,total): " << regions_->nBarrelModules() << " "
183-
<< regions_->nForwardModules() << " " << regions_->nModules();
177+
LogDebug("SiPixelRawToCluster") << "region2unpack #modules (BPIX,EPIX,total): " << regions_->nBarrelModules()
178+
<< " " << regions_->nForwardModules() << " " << regions_->nModules();
184179
modulesToUnpackRegional = hgpuMap->getModToUnpRegionalAsync(*(regions_->modulesToUnpack()), ctx.stream());
185180
gpuModulesToUnpack = modulesToUnpackRegional.get();
186181
} else {
@@ -280,9 +275,7 @@ void SiPixelRawToClusterCUDA::acquire(const edm::Event& iEvent,
280275
includeErrors_,
281276
edm::MessageDrop::instance()->debugEnabled,
282277
ctx.stream());
283-
}
284-
else
285-
{
278+
} else {
286279
edm::Handle<edm::DetSetVector<PixelDigi>> digis;
287280
iEvent.getByToken(pixelDigiToken_, digis);
288281
auto const& input = *digis;
@@ -307,7 +300,6 @@ void SiPixelRawToClusterCUDA::acquire(const edm::Event& iEvent,
307300
const GeomDetUnit* genericDet = geom_->idToDetUnit(detIdObject);
308301
auto const gind = genericDet->index();
309302
for (auto const& px : *DSViter) {
310-
311303
moduleIds[nDigis] = uint16_t(gind);
312304

313305
xDigis[nDigis] = uint16_t(px.row());
@@ -322,12 +314,16 @@ void SiPixelRawToClusterCUDA::acquire(const edm::Event& iEvent,
322314
}
323315
}
324316

325-
gpuAlgo_.makeClustersAsync(
326-
clusterThresholds_, moduleIds.get(), xDigis.get(), yDigis.get(),
327-
adcDigis.get(), packedData.get(), rawIds.get(), nDigis, ctx.stream());
317+
gpuAlgo_.makeClustersAsync(clusterThresholds_,
318+
moduleIds.get(),
319+
xDigis.get(),
320+
yDigis.get(),
321+
adcDigis.get(),
322+
packedData.get(),
323+
rawIds.get(),
324+
nDigis,
325+
ctx.stream());
328326
}
329-
330-
331327
}
332328

333329
void SiPixelRawToClusterCUDA::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {

0 commit comments

Comments
 (0)