Skip to content
This repository has been archived by the owner on Dec 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #367 from SegmentLinking/werrors_cmssw
Browse files Browse the repository at this point in the history 
Fix warnings that will be treated as errors in CMSSW
  • Loading branch information
@slava77
slava77 authored Feb 5, 2024
2 parents d79218c + b4029c5 commit 58a290c
Show file tree
Hide file tree
Showing 13 changed files with 218 additions and 311 deletions.
62 changes: 31 additions & 31 deletions SDL/Event.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void SDL::Event::addPixelSegmentToEvent(std::vector<unsigned int> hitIndices0,
std::vector<int> superbin,
std::vector<int8_t> pixelType,
std::vector<char> isQuad) {
int size = ptIn.size();
unsigned int size = ptIn.size();

if (size > N_MAX_PIXEL_SEGMENTS_PER_MODULE) {
printf(
Expand All @@ -281,7 +281,7 @@ void SDL::Event::addPixelSegmentToEvent(std::vector<unsigned int> hitIndices0,
size = N_MAX_PIXEL_SEGMENTS_PER_MODULE;
}

int mdSize = 2 * size;
unsigned int mdSize = 2 * size;
uint16_t pixelModuleIndex = (*detIdToIndex)[1];

if (mdsInGPU == nullptr) {
Expand Down Expand Up @@ -584,11 +584,11 @@ void SDL::Event::createTriplets() {
auto index_gpu_buf = allocBufWrapper<uint16_t>(devAcc, nLowerModules, queue);

// Allocate and copy nSegments from device to host
auto nSegments_buf = allocBufWrapper<int>(devHost, nLowerModules, queue);
auto nSegments_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules, queue);
alpaka::memcpy(queue, nSegments_buf, segmentsBuffers->nSegments_buf, nLowerModules);
alpaka::wait(queue);

int* nSegments = alpaka::getPtrNative(nSegments_buf);
unsigned int* nSegments = alpaka::getPtrNative(nSegments_buf);

// Allocate and copy module_nConnectedModules from device to host
auto module_nConnectedModules_buf = allocBufWrapper<uint16_t>(devHost, nLowerModules, queue);
Expand Down Expand Up @@ -788,10 +788,10 @@ void SDL::Event::createTrackCandidates() {
alpaka::enqueue(queue, addpLSasTrackCandidateInGPUTask);

// Check if either N_MAX_PIXEL_TRACK_CANDIDATES or N_MAX_NONPIXEL_TRACK_CANDIDATES was reached
auto nTrackCanpT5Host_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCanpT3Host_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCanpLSHost_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCanT5Host_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCanpT5Host_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
auto nTrackCanpT3Host_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
auto nTrackCanpLSHost_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
auto nTrackCanT5Host_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
alpaka::memcpy(queue, nTrackCanpT5Host_buf, trackCandidatesBuffers->nTrackCandidatespT5_buf, 1);
alpaka::memcpy(queue, nTrackCanpT3Host_buf, trackCandidatesBuffers->nTrackCandidatespT3_buf, 1);
alpaka::memcpy(queue, nTrackCanpLSHost_buf, trackCandidatesBuffers->nTrackCandidatespLS_buf, 1);
Expand Down Expand Up @@ -820,7 +820,7 @@ void SDL::Event::createPixelTriplets() {
pixelTripletsInGPU->setData(*pixelTripletsBuffers);
}

int nInnerSegments;
unsigned int nInnerSegments;
auto nInnerSegments_src_view = alpaka::createView(devHost, &nInnerSegments, (size_t)1u);

auto dev_view_nSegments = alpaka::createSubView(segmentsBuffers->nSegments_buf, (Idx)1u, (Idx)nLowerModules);
Expand Down Expand Up @@ -1053,7 +1053,7 @@ void SDL::Event::createPixelQuintuplets() {
trackCandidatesInGPU->setData(*trackCandidatesBuffers);
}

int nInnerSegments;
unsigned int nInnerSegments;
auto nInnerSegments_src_view = alpaka::createView(devHost, &nInnerSegments, (size_t)1u);

// Create a sub-view for the device buffer
Expand Down Expand Up @@ -1178,7 +1178,7 @@ void SDL::Event::createPixelQuintuplets() {
}

void SDL::Event::addMiniDoubletsToEventExplicit() {
auto nMDsCPU_buf = allocBufWrapper<int>(devHost, nLowerModules, queue);
auto nMDsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules, queue);
alpaka::memcpy(queue, nMDsCPU_buf, miniDoubletsBuffers->nMDs_buf, nLowerModules);

auto module_subdets_buf = allocBufWrapper<short>(devHost, nLowerModules, queue);
Expand All @@ -1192,7 +1192,7 @@ void SDL::Event::addMiniDoubletsToEventExplicit() {

alpaka::wait(queue);

int* nMDsCPU = alpaka::getPtrNative(nMDsCPU_buf);
unsigned int* nMDsCPU = alpaka::getPtrNative(nMDsCPU_buf);
short* module_subdets = alpaka::getPtrNative(module_subdets_buf);
short* module_layers = alpaka::getPtrNative(module_layers_buf);
int* module_hitRanges = alpaka::getPtrNative(module_hitRanges_buf);
Expand All @@ -1209,7 +1209,7 @@ void SDL::Event::addMiniDoubletsToEventExplicit() {
}

void SDL::Event::addSegmentsToEventExplicit() {
auto nSegmentsCPU_buf = allocBufWrapper<int>(devHost, nLowerModules, queue);
auto nSegmentsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules, queue);
alpaka::memcpy(queue, nSegmentsCPU_buf, segmentsBuffers->nSegments_buf, nLowerModules);

auto module_subdets_buf = allocBufWrapper<short>(devHost, nLowerModules, queue);
Expand All @@ -1220,7 +1220,7 @@ void SDL::Event::addSegmentsToEventExplicit() {

alpaka::wait(queue);

int* nSegmentsCPU = alpaka::getPtrNative(nSegmentsCPU_buf);
unsigned int* nSegmentsCPU = alpaka::getPtrNative(nSegmentsCPU_buf);
short* module_subdets = alpaka::getPtrNative(module_subdets_buf);
short* module_layers = alpaka::getPtrNative(module_layers_buf);

Expand All @@ -1236,7 +1236,7 @@ void SDL::Event::addSegmentsToEventExplicit() {
}

void SDL::Event::addQuintupletsToEventExplicit() {
auto nQuintupletsCPU_buf = allocBufWrapper<int>(devHost, nLowerModules, queue);
auto nQuintupletsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules, queue);
alpaka::memcpy(queue, nQuintupletsCPU_buf, quintupletsBuffers->nQuintuplets_buf, nLowerModules);

auto module_subdets_buf = allocBufWrapper<short>(devHost, nModules, queue);
Expand All @@ -1250,7 +1250,7 @@ void SDL::Event::addQuintupletsToEventExplicit() {

alpaka::wait(queue);

int* nQuintupletsCPU = alpaka::getPtrNative(nQuintupletsCPU_buf);
unsigned int* nQuintupletsCPU = alpaka::getPtrNative(nQuintupletsCPU_buf);
short* module_subdets = alpaka::getPtrNative(module_subdets_buf);
short* module_layers = alpaka::getPtrNative(module_layers_buf);
int* module_quintupletModuleIndices = alpaka::getPtrNative(module_quintupletModuleIndices_buf);
Expand All @@ -1267,7 +1267,7 @@ void SDL::Event::addQuintupletsToEventExplicit() {
}

void SDL::Event::addTripletsToEventExplicit() {
auto nTripletsCPU_buf = allocBufWrapper<int>(devHost, nLowerModules, queue);
auto nTripletsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules, queue);
alpaka::memcpy(queue, nTripletsCPU_buf, tripletsBuffers->nTriplets_buf, nLowerModules);

auto module_subdets_buf = allocBufWrapper<short>(devHost, nLowerModules, queue);
Expand All @@ -1277,7 +1277,7 @@ void SDL::Event::addTripletsToEventExplicit() {
alpaka::memcpy(queue, module_layers_buf, modulesBuffersES->layers_buf, nLowerModules);

alpaka::wait(queue);
int* nTripletsCPU = alpaka::getPtrNative(nTripletsCPU_buf);
unsigned int* nTripletsCPU = alpaka::getPtrNative(nTripletsCPU_buf);
short* module_subdets = alpaka::getPtrNative(module_subdets_buf);
short* module_layers = alpaka::getPtrNative(module_layers_buf);

Expand Down Expand Up @@ -1397,7 +1397,7 @@ unsigned int SDL::Event::getNumberOfTripletsByLayerEndcap(unsigned int layer) {
}

int SDL::Event::getNumberOfPixelTriplets() {
auto nPixelTriplets_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nPixelTriplets_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nPixelTriplets_buf, pixelTripletsBuffers->nPixelTriplets_buf, 1);
alpaka::wait(queue);
Expand All @@ -1408,7 +1408,7 @@ int SDL::Event::getNumberOfPixelTriplets() {
}

int SDL::Event::getNumberOfPixelQuintuplets() {
auto nPixelQuintuplets_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nPixelQuintuplets_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nPixelQuintuplets_buf, pixelQuintupletsBuffers->nPixelQuintuplets_buf, 1);
alpaka::wait(queue);
Expand Down Expand Up @@ -1446,7 +1446,7 @@ unsigned int SDL::Event::getNumberOfQuintupletsByLayerEndcap(unsigned int layer)
}

int SDL::Event::getNumberOfTrackCandidates() {
auto nTrackCandidates_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCandidates_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nTrackCandidates_buf, trackCandidatesBuffers->nTrackCandidates_buf, 1);
alpaka::wait(queue);
Expand All @@ -1457,7 +1457,7 @@ int SDL::Event::getNumberOfTrackCandidates() {
}

int SDL::Event::getNumberOfPT5TrackCandidates() {
auto nTrackCandidatesPT5_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCandidatesPT5_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nTrackCandidatesPT5_buf, trackCandidatesBuffers->nTrackCandidatespT5_buf, 1);
alpaka::wait(queue);
Expand All @@ -1468,7 +1468,7 @@ int SDL::Event::getNumberOfPT5TrackCandidates() {
}

int SDL::Event::getNumberOfPT3TrackCandidates() {
auto nTrackCandidatesPT3_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCandidatesPT3_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nTrackCandidatesPT3_buf, trackCandidatesBuffers->nTrackCandidatespT3_buf, 1);
alpaka::wait(queue);
Expand All @@ -1479,7 +1479,7 @@ int SDL::Event::getNumberOfPT3TrackCandidates() {
}

int SDL::Event::getNumberOfPLSTrackCandidates() {
auto nTrackCandidatesPLS_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCandidatesPLS_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nTrackCandidatesPLS_buf, trackCandidatesBuffers->nTrackCandidatespLS_buf, 1);
alpaka::wait(queue);
Expand All @@ -1490,8 +1490,8 @@ int SDL::Event::getNumberOfPLSTrackCandidates() {
}

int SDL::Event::getNumberOfPixelTrackCandidates() {
auto nTrackCandidates_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCandidatesT5_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCandidates_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
auto nTrackCandidatesT5_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nTrackCandidates_buf, trackCandidatesBuffers->nTrackCandidates_buf, 1);
alpaka::memcpy(queue, nTrackCandidatesT5_buf, trackCandidatesBuffers->nTrackCandidatesT5_buf, 1);
Expand All @@ -1504,7 +1504,7 @@ int SDL::Event::getNumberOfPixelTrackCandidates() {
}

int SDL::Event::getNumberOfT5TrackCandidates() {
auto nTrackCandidatesT5_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCandidatesT5_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);

alpaka::memcpy(queue, nTrackCandidatesT5_buf, trackCandidatesBuffers->nTrackCandidatesT5_buf, 1);
alpaka::wait(queue);
Expand Down Expand Up @@ -1713,7 +1713,7 @@ SDL::quintupletsBuffer<alpaka::DevCpu>* SDL::Event::getQuintuplets() {
SDL::pixelTripletsBuffer<alpaka::DevCpu>* SDL::Event::getPixelTriplets() {
if (pixelTripletsInCPU == nullptr) {
// Get nPixelTriplets parameter to initialize host based quintupletsInCPU
auto nPixelTriplets_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nPixelTriplets_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
alpaka::memcpy(queue, nPixelTriplets_buf, pixelTripletsBuffers->nPixelTriplets_buf, 1);
alpaka::wait(queue);

Expand Down Expand Up @@ -1754,7 +1754,7 @@ SDL::pixelTripletsBuffer<alpaka::DevCpu>* SDL::Event::getPixelTriplets() {
SDL::pixelQuintupletsBuffer<alpaka::DevCpu>* SDL::Event::getPixelQuintuplets() {
if (pixelQuintupletsInCPU == nullptr) {
// Get nPixelQuintuplets parameter to initialize host based quintupletsInCPU
auto nPixelQuintuplets_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nPixelQuintuplets_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
alpaka::memcpy(queue, nPixelQuintuplets_buf, pixelQuintupletsBuffers->nPixelQuintuplets_buf, 1);
alpaka::wait(queue);

Expand Down Expand Up @@ -1791,7 +1791,7 @@ SDL::pixelQuintupletsBuffer<alpaka::DevCpu>* SDL::Event::getPixelQuintuplets() {
SDL::trackCandidatesBuffer<alpaka::DevCpu>* SDL::Event::getTrackCandidates() {
if (trackCandidatesInCPU == nullptr) {
// Get nTrackCanHost parameter to initialize host based trackCandidatesInCPU
auto nTrackCanHost_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCanHost_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
alpaka::memcpy(queue, nTrackCanHost_buf, trackCandidatesBuffers->nTrackCandidates_buf, 1);
alpaka::wait(queue);

Expand Down Expand Up @@ -1825,7 +1825,7 @@ SDL::trackCandidatesBuffer<alpaka::DevCpu>* SDL::Event::getTrackCandidates() {
SDL::trackCandidatesBuffer<alpaka::DevCpu>* SDL::Event::getTrackCandidatesInCMSSW() {
if (trackCandidatesInCPU == nullptr) {
// Get nTrackCanHost parameter to initialize host based trackCandidatesInCPU
auto nTrackCanHost_buf = allocBufWrapper<int>(devHost, 1, queue);
auto nTrackCanHost_buf = allocBufWrapper<unsigned int>(devHost, 1, queue);
alpaka::memcpy(queue, nTrackCanHost_buf, trackCandidatesBuffers->nTrackCandidates_buf, 1);
alpaka::wait(queue);

Expand Down
19 changes: 10 additions & 9 deletions SDL/Hit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ namespace SDL {
hitRangesUpper_buf(allocBufWrapper<int>(devAccIn, nModules, queue)),
hitRangesnLower_buf(allocBufWrapper<int8_t>(devAccIn, nModules, queue)),
hitRangesnUpper_buf(allocBufWrapper<int8_t>(devAccIn, nModules, queue)) {
alpaka::memset(queue, hitRanges_buf, -1, nModules * 2);
alpaka::memset(queue, hitRangesLower_buf, -1, nModules);
alpaka::memset(queue, hitRangesUpper_buf, -1, nModules);
alpaka::memset(queue, hitRangesnLower_buf, -1, nModules);
alpaka::memset(queue, hitRangesnUpper_buf, -1, nModules);
alpaka::memset(queue, hitRanges_buf, -1);
alpaka::memset(queue, hitRangesLower_buf, -1);
alpaka::memset(queue, hitRangesUpper_buf, -1);
alpaka::memset(queue, hitRangesnLower_buf, -1);
alpaka::memset(queue, hitRangesnUpper_buf, -1);
alpaka::wait(queue);
}
};
Expand Down Expand Up @@ -232,7 +232,7 @@ namespace SDL {

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
for (int ihit = globalThreadIdx[2]; ihit < nHits; ihit += gridThreadExtent[2]) {
for (unsigned int ihit = globalThreadIdx[2]; ihit < nHits; ihit += gridThreadExtent[2]) {
float ihit_x = hitsInGPU.xs[ihit];
float ihit_y = hitsInGPU.ys[ihit];
float ihit_z = hitsInGPU.zs[ihit];
Expand Down Expand Up @@ -264,12 +264,13 @@ namespace SDL {
hitsInGPU.lowEdgeYs[ihit] = ihit_y - 2.5f * sin_phi;
}
// Need to set initial value if index hasn't been seen before.
int old = alpaka::atomicOp<alpaka::AtomicCas>(acc, &(hitsInGPU.hitRanges[lastModuleIndex * 2]), -1, ihit);
int old = alpaka::atomicOp<alpaka::AtomicCas>(
acc, &(hitsInGPU.hitRanges[lastModuleIndex * 2]), -1, static_cast<int>(ihit));
// For subsequent visits, stores the min value.
if (old != -1)
alpaka::atomicOp<alpaka::AtomicMin>(acc, &hitsInGPU.hitRanges[lastModuleIndex * 2], ihit);
alpaka::atomicOp<alpaka::AtomicMin>(acc, &hitsInGPU.hitRanges[lastModuleIndex * 2], static_cast<int>(ihit));

alpaka::atomicOp<alpaka::AtomicMax>(acc, &hitsInGPU.hitRanges[lastModuleIndex * 2 + 1], ihit);
alpaka::atomicOp<alpaka::AtomicMax>(acc, &hitsInGPU.hitRanges[lastModuleIndex * 2 + 1], static_cast<int>(ihit));
}
}
};
Expand Down
16 changes: 8 additions & 8 deletions SDL/Kernels.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ namespace SDL {

for (unsigned int lowmod = globalThreadIdx[0]; lowmod < *modulesInGPU.nLowerModules;
lowmod += gridThreadExtent[0]) {
int nQuintuplets_lowmod = quintupletsInGPU.nQuintuplets[lowmod];
unsigned int nQuintuplets_lowmod = quintupletsInGPU.nQuintuplets[lowmod];
int quintupletModuleIndices_lowmod = rangesInGPU.quintupletModuleIndices[lowmod];

for (unsigned int ix1 = globalThreadIdx[1]; ix1 < nQuintuplets_lowmod; ix1 += gridThreadExtent[1]) {
Expand Down Expand Up @@ -267,20 +267,20 @@ namespace SDL {
for (unsigned int lowmodIdx1 = globalThreadIdx[1]; lowmodIdx1 < *(rangesInGPU.nEligibleT5Modules);
lowmodIdx1 += gridThreadExtent[1]) {
uint16_t lowmod1 = rangesInGPU.indicesOfEligibleT5Modules[lowmodIdx1];
int nQuintuplets_lowmod1 = quintupletsInGPU.nQuintuplets[lowmod1];
unsigned int nQuintuplets_lowmod1 = quintupletsInGPU.nQuintuplets[lowmod1];
if (nQuintuplets_lowmod1 == 0)
continue;

int quintupletModuleIndices_lowmod1 = rangesInGPU.quintupletModuleIndices[lowmod1];
unsigned int quintupletModuleIndices_lowmod1 = rangesInGPU.quintupletModuleIndices[lowmod1];

for (unsigned int lowmodIdx2 = globalThreadIdx[2]; lowmodIdx2 < *(rangesInGPU.nEligibleT5Modules);
lowmodIdx2 += gridThreadExtent[2]) {
uint16_t lowmod2 = rangesInGPU.indicesOfEligibleT5Modules[lowmodIdx2];
int nQuintuplets_lowmod2 = quintupletsInGPU.nQuintuplets[lowmod2];
unsigned int nQuintuplets_lowmod2 = quintupletsInGPU.nQuintuplets[lowmod2];
if (nQuintuplets_lowmod2 == 0)
continue;

int quintupletModuleIndices_lowmod2 = rangesInGPU.quintupletModuleIndices[lowmod2];
unsigned int quintupletModuleIndices_lowmod2 = rangesInGPU.quintupletModuleIndices[lowmod2];

for (unsigned int ix1 = 0; ix1 < nQuintuplets_lowmod1; ix1 += 1) {
unsigned int ix = quintupletModuleIndices_lowmod1 + ix1;
Expand Down Expand Up @@ -382,7 +382,7 @@ namespace SDL {
Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

int nPixelQuintuplets = *pixelQuintupletsInGPU.nPixelQuintuplets;
unsigned int nPixelQuintuplets = *pixelQuintupletsInGPU.nPixelQuintuplets;
for (unsigned int ix = globalThreadIdx[1]; ix < nPixelQuintuplets; ix += gridThreadExtent[1]) {
if (secondPass && pixelQuintupletsInGPU.isDup[ix])
continue;
Expand Down Expand Up @@ -427,7 +427,7 @@ namespace SDL {
if (nPixelSegments > N_MAX_PIXEL_SEGMENTS_PER_MODULE)
nPixelSegments = N_MAX_PIXEL_SEGMENTS_PER_MODULE;

for (int ix = globalThreadIdx[1]; ix < nPixelSegments; ix += gridThreadExtent[1]) {
for (unsigned int ix = globalThreadIdx[1]; ix < nPixelSegments; ix += gridThreadExtent[1]) {
if (secondpass && (!segmentsInGPU.isQuad[ix] || (segmentsInGPU.isDup[ix] & 1)))
continue;

Expand All @@ -439,7 +439,7 @@ namespace SDL {
float eta_pix1 = segmentsInGPU.eta[ix];
float phi_pix1 = segmentsInGPU.phi[ix];

for (int jx = ix + 1 + globalThreadIdx[2]; jx < nPixelSegments; jx += gridThreadExtent[2]) {
for (unsigned int jx = ix + 1 + globalThreadIdx[2]; jx < nPixelSegments; jx += gridThreadExtent[2]) {
float eta_pix2 = segmentsInGPU.eta[jx];
float phi_pix2 = segmentsInGPU.phi[jx];

Expand Down
2 changes: 1 addition & 1 deletion SDL/LST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void SDL::LST::prepareInput(const std::vector<float> see_px,
std::iota(hitIdxs.begin(), hitIdxs.end(), 0);
const int hit_size = trkX.size();

for (auto&& [iSeed, _] : iter::enumerate(see_stateTrajGlbPx)) {
for (size_t iSeed = 0; iSeed < n_see; iSeed++) {
ROOT::Math::PxPyPzMVector p3LH(see_stateTrajGlbPx[iSeed], see_stateTrajGlbPy[iSeed], see_stateTrajGlbPz[iSeed], 0);
ROOT::Math::XYZVector p3LH_helper(see_stateTrajGlbPx[iSeed], see_stateTrajGlbPy[iSeed], see_stateTrajGlbPz[iSeed]);
float ptIn = p3LH.Pt();
Expand Down
2 changes: 0 additions & 2 deletions SDL/LST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#include <numeric>
#include <mutex>

#include "code/cppitertools/enumerate.hpp"

#include "TString.h"
#include "Math/Vector3D.h"
#include <Math/Vector4D.h>
Expand Down
Loading

0 comments on commit 58a290c

Please sign in to comment.