GPU: Use unsigned short to store dEdx charges on NVIDIA

davidrohr · davidrohr · commit 9afcdc5d69ee · 2020-11-09T09:16:50.000+01:00
diff --git a/GPU/Common/GPUDefGPUParameters.h b/GPU/Common/GPUDefGPUParameters.h
@@ -135,6 +135,7 @@
   #define GPUCA_TRACKLET_SELECTOR_SLICE_COUNT 1
   #define GPUCA_NO_ATOMIC_PRECHECK 1
   #define GPUCA_COMP_GATHER_KERNEL 0
+  #define GPUCA_DEDX_STORAGE_TYPE unsigned short
   // #define GPUCA_USE_TEXTURES
 #elif defined(GPUCA_GPUTYPE_OPENCL)
 #elif defined(GPUCA_GPUCODE)
diff --git a/GPU/GPUTracking/dEdx/GPUdEdx.cxx b/GPU/GPUTracking/dEdx/GPUdEdx.cxx
@@ -62,7 +62,7 @@ GPUd() float GPUdEdx::GetSortTruncMean(GPUCA_DEDX_STORAGE_TYPE* GPUrestrict() ar
   CAAlgo::sort(array, array + count);
   float mean = 0;
   for (int i = trunclow; i < trunchigh; i++) {
-    mean += array[i] * (1.f / scalingFactor<GPUCA_DEDX_STORAGE_TYPE>::factor);
+    mean += (float)array[i] * (1.f / scalingFactor<GPUCA_DEDX_STORAGE_TYPE>::factor);
   }
   return (mean / (trunchigh - trunclow));
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ GPUd() float GPUdEdx::GetSortTruncMean(GPUCA_DEDX_STORAGE_TYPE* GPUrestrict() ar`
`62`	`62`	`CAAlgo::sort(array, array + count);`
`63`	`63`	`float mean = 0;`
`64`	`64`	`for (int i = trunclow; i < trunchigh; i++) {`
`65`		`- mean += array[i] * (1.f / scalingFactor<GPUCA_DEDX_STORAGE_TYPE>::factor);`
	`65`	`+ mean += (float)array[i] * (1.f / scalingFactor<GPUCA_DEDX_STORAGE_TYPE>::factor);`
`66`	`66`	`}`
`67`	`67`	`return (mean / (trunchigh - trunclow));`
`68`	`68`	`}`