Skip to content

Commit 0532df2

Browse files
committed
EXPERIMENTAL! GPU: Process dEdx with full qTot range
1 parent 7873859 commit 0532df2

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

DataFormats/Detectors/TPC/include/DataFormatsTPC/ClusterNative.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@ struct ClusterNative {
8787
}
8888

8989
GPUd() uint16_t getQmax() const { return qMax; }
90+
GPUd() float getFullQtot() const
91+
{
92+
if (isSaturated()) [[unlikely]] {
93+
return getSaturatedQtot();
94+
}
95+
return qTot;
96+
}
9097
GPUd() uint16_t getQtot() const
9198
{
9299
if (isSaturated()) [[unlikely]] {

GPU/GPUTracking/Definitions/GPUDefParametersWrapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace o2::gpu
3737
#endif
3838

3939
#define GPUCA_PAR_MERGER_INTERPOLATION_ERROR_TYPE_A GPUCA_DETERMINISTIC_CODE(float, GPUCA_PAR_MERGER_INTERPOLATION_ERROR_TYPE)
40-
#define GPUCA_PAR_DEDX_STORAGE_TYPE_A GPUCA_DETERMINISTIC_CODE(float, GPUCA_PAR_DEDX_STORAGE_TYPE)
40+
#define GPUCA_PAR_DEDX_STORAGE_TYPE_A float
4141

4242
// #define GPUCA_TRACKLET_CONSTRUCTOR_DO_PROFILE // Output Profiling Data for Tracklet Constructor Tracklet Scheduling
4343

GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger* GPUrestrict() merger, int32_
294294
const int32_t clusterCount = (ihit - ihitMergeFirst) * wayDirection + 1;
295295
for (int32_t iTmp = ihitMergeFirst; iTmp != ihit + wayDirection; iTmp += wayDirection) {
296296
const ClusterNative& cl = merger->GetConstantMem()->ioPtrs.clustersNative->clustersLinear[cluster.num];
297-
qtot += cl.qTot;
297+
qtot += cl.getFullQtot();
298298
qmax = CAMath::Max<float>(qmax, cl.qMax);
299299
pad += cl.getPad();
300300
relTime += cl.getTime();

0 commit comments

Comments
 (0)