Skip to content

Please consider the following formatting changes to #14378 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChSonnabend merged 1 commit into from
Jun 9, 2025
Merged

Please consider the following formatting changes to #14378 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GPU/GPUTracking/TPCClusterFinder/GPUTPCCFDeconvolution.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ GPUdii() void GPUTPCCFDeconvolution::deconvolutionImpl(int32_t nBlocks, int32_t

PackedCharge charge = chargeMap[pos];

if(overwriteCharge) {
if (overwriteCharge) {
PackedCharge p(charge.unpack() / peakCount, has3x3, split);
chargeMap[pos] = p;
} else {
Expand Down
8 changes: 4 additions & 4 deletions GPU/GPUTracking/TPCClusterFinder/GPUTPCNNClusterizerKernels.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ GPUdii() void GPUTPCNNClusterizerKernels::Thread<GPUTPCNNClusterizerKernels::fil

if (clustererNN.mNnClusterizerAddIndexData && (int32_t)transient_index == (clustererNN.mNnClusterizerElementSize - 1)) {
uint32_t top_idx = (base_idx + 1) * clustererNN.mNnClusterizerElementSize;
if (!clustererNN.mNnClusterizerSetDeconvolutionFlags){ // Only if deconvolution flags are not set
for (uint16_t i = 0; i < 8; i++) { // This solution needs testing. It is not the same as the deconvolution flags
if (!clustererNN.mNnClusterizerSetDeconvolutionFlags) { // Only if deconvolution flags are not set
for (uint16_t i = 0; i < 8; i++) { // This solution needs testing. It is not the same as the deconvolution flags
Delta2 d = cfconsts::InnerNeighbors[i];
CfChargePos tmp_pos = peak.delta(d);
clustererNN.mClusterFlags[2 * base_idx] += CfUtils::isPeak(isPeakMap[tmp_pos]);
Expand Down Expand Up @@ -470,14 +470,14 @@ GPUdii() void GPUTPCNNClusterizerKernels::Thread<GPUTPCNNClusterizerKernels::pub
CfArray2D<PackedCharge> chargeMap(reinterpret_cast<PackedCharge*>(clusterer.mPchargeMap));
CfChargePos peak = clusterer.mPfilteredPeakPositions[idx + batchStart];

for(int i = 0; i < 8; i++) {
for (int i = 0; i < 8; i++) {
Delta2 d = cfconsts::InnerNeighbors[i];
CfChargePos tmp_pos = peak.delta(d);
PackedCharge charge = chargeMap[tmp_pos];
clustererNN.mClusterFlags[2 * idx] += (d.y != 0 && charge.isSplit());
clustererNN.mClusterFlags[2 * idx + 1] += (d.x != 0 && charge.isSplit());
}
for(int i = 0; i < 16; i++) {
for (int i = 0; i < 16; i++) {
Delta2 d = cfconsts::OuterNeighbors[i];
CfChargePos tmp_pos = peak.delta(d);
PackedCharge charge = chargeMap[tmp_pos];
Expand Down