Skip to content

Commit 0978c19

Browse files
committed
Adjusting for new toNative function
1 parent c5b147f commit 0978c19

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

GPU/GPUTracking/TPCClusterFinder/GPUTPCNNClusterizerKernels.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ GPUd() void GPUTPCNNClusterizerKernels::publishClustersReg1(uint glo_idx, GPUSha
233233
pc.setFull(clustererNN.centralCharges[glo_idx] * clustererNN.outputDataReg1[model_output_index + 4],
234234
static_cast<float>(clustererNN.peakPositions[glo_idx].pad()) + clustererNN.outputDataReg1[model_output_index],
235235
clustererNN.outputDataReg1[model_output_index + 2],
236-
static_cast<float>((clusterer.mPmemory->fragment).start) + static_cast<float>(clustererNN.peakPositions[glo_idx].time()) + clustererNN.outputDataReg1[model_output_index + 1],
236+
static_cast<float>(clustererNN.peakPositions[glo_idx].time()) + clustererNN.outputDataReg1[model_output_index + 1],
237237
clustererNN.outputDataReg1[model_output_index + 3],
238238
clustererNN.clusterFlags[2 * glo_idx],
239239
clustererNN.clusterFlags[2 * glo_idx + 1]);
240240

241241
tpc::ClusterNative myCluster;
242-
bool rejectCluster = !pc.toNative(clustererNN.peakPositions[glo_idx], clustererNN.centralCharges[glo_idx], myCluster, clusterer.Param());
242+
bool rejectCluster = !pc.toNative(clustererNN.peakPositions[glo_idx], clustererNN.centralCharges[glo_idx], myCluster, clusterer.Param(), (clusterer.mPmemory->fragment).start, chargeMap);
243243
if (rejectCluster) {
244244
if (clusterer.mPclusterPosInRow) {
245245
clusterer.mPclusterPosInRow[full_glo_idx] = clusterer.mNMaxClusterPerRow;
@@ -313,13 +313,13 @@ GPUd() void GPUTPCNNClusterizerKernels::publishClustersReg2(uint glo_idx, GPUSha
313313
pc.setFull(clustererNN.centralCharges[glo_idx] * clustererNN.outputDataReg2[model_output_index + 8],
314314
static_cast<float>(clustererNN.peakPositions[glo_idx].pad()) + clustererNN.outputDataReg2[model_output_index],
315315
clustererNN.outputDataReg2[model_output_index + 4],
316-
static_cast<float>((clusterer.mPmemory->fragment).start) + static_cast<float>(clustererNN.peakPositions[glo_idx].time()) + clustererNN.outputDataReg2[model_output_index + 2],
316+
static_cast<float>(clustererNN.peakPositions[glo_idx].time()) + clustererNN.outputDataReg2[model_output_index + 2],
317317
clustererNN.outputDataReg2[model_output_index + 6],
318318
clustererNN.clusterFlags[2 * glo_idx],
319319
clustererNN.clusterFlags[2 * glo_idx + 1]);
320320

321321
tpc::ClusterNative myCluster;
322-
bool rejectCluster = !pc.toNative(clustererNN.peakPositions[glo_idx], clustererNN.centralCharges[glo_idx], myCluster, clusterer.Param());
322+
bool rejectCluster = !pc.toNative(clustererNN.peakPositions[glo_idx], clustererNN.centralCharges[glo_idx], myCluster, clusterer.Param(), (clusterer.mPmemory->fragment).start, chargeMap);
323323
if (rejectCluster) {
324324
if (clusterer.mPclusterPosInRow) {
325325
clusterer.mPclusterPosInRow[full_glo_idx] = clusterer.mNMaxClusterPerRow;
@@ -348,12 +348,12 @@ GPUd() void GPUTPCNNClusterizerKernels::publishClustersReg2(uint glo_idx, GPUSha
348348
pc.setFull(clustererNN.centralCharges[glo_idx] * clustererNN.outputDataReg2[model_output_index + 9],
349349
static_cast<float>(clustererNN.peakPositions[glo_idx].pad()) + clustererNN.outputDataReg2[model_output_index + 1],
350350
clustererNN.outputDataReg2[model_output_index + 5],
351-
static_cast<float>((clusterer.mPmemory->fragment).start) + static_cast<float>(clustererNN.peakPositions[glo_idx].time()) + clustererNN.outputDataReg2[model_output_index + 3],
351+
static_cast<float>(clustererNN.peakPositions[glo_idx].time()) + clustererNN.outputDataReg2[model_output_index + 3],
352352
clustererNN.outputDataReg2[model_output_index + 7],
353353
clustererNN.clusterFlags[2 * glo_idx],
354354
clustererNN.clusterFlags[2 * glo_idx + 1]);
355355

356-
rejectCluster = !pc.toNative(clustererNN.peakPositions[glo_idx], clustererNN.centralCharges[glo_idx], myCluster, clusterer.Param());
356+
rejectCluster = !pc.toNative(clustererNN.peakPositions[glo_idx], clustererNN.centralCharges[glo_idx], myCluster, clusterer.Param(), (clusterer.mPmemory->fragment).start, chargeMap);
357357
if (rejectCluster) {
358358
if (clusterer.mPclusterPosInRow) {
359359
clusterer.mPclusterPosInRow[full_glo_idx] = clusterer.mNMaxClusterPerRow;

0 commit comments

Comments
 (0)