Rename gpuClusterThresholds to GPUClusterThresholds

cms-sw · Mar 24, 2021 · f8e485c · f8e485c
1 parent 17443cf
commit f8e485c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/RecoLocalTracker/SiPixelClusterizer/interface/GPUClusterThresholds.h b/RecoLocalTracker/SiPixelClusterizer/interface/GPUClusterThresholds.h
@@ -0,0 +1,11 @@
+#ifndef RecoLocalTracker_SiPixelClusterizer_interface_GPUClusterThresholds_h
+#define RecoLocalTracker_SiPixelClusterizer_interface_GPUClusterThresholds_h
+
+struct GPUClusterThresholds {
+  constexpr GPUClusterThresholds(int32_t clusterThreshold_L1, int32_t clusterThreshold)
+   : layer1(clusterThreshold_L1), otherLayers(clusterThreshold){};
+  const int32_t layer1;       // Cluster threshold in electrons for Layer 1
+  const int32_t otherLayers;  // Cluster threshold in electrons
+};
+
+#endif  // RecoLocalTracker_SiPixelClusterizer_interface_GPUClusterThresholds_h
diff --git a/RecoLocalTracker/SiPixelClusterizer/interface/gpuClusterThresholds.h b/RecoLocalTracker/SiPixelClusterizer/interface/gpuClusterThresholds.h
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterCUDA.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterCUDA.cc
@@ -35,7 +35,7 @@
 #include "HeterogeneousCore/CUDACore/interface/ScopedContext.h"
 #include "HeterogeneousCore/CUDAServices/interface/CUDAService.h"
 #include "RecoTracker/Record/interface/CkfComponentsRecord.h"
-#include "RecoLocalTracker/SiPixelClusterizer/interface/gpuClusterThresholds.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/GPUClusterThresholds.h"
 
 // local includes
 #include "SiPixelRawToClusterGPUKernel.h"
@@ -78,7 +78,7 @@ class SiPixelRawToClusterCUDA : public edm::stream::EDProducer<edm::ExternalWork
   const bool isRun2_;
   const bool includeErrors_;
   const bool useQuality_;
-  const gpuClusterThresholds clusterThresholds_;
+  const GPUClusterThresholds clusterThresholds_;
 };
 
 SiPixelRawToClusterCUDA::SiPixelRawToClusterCUDA(const edm::ParameterSet& iConfig)

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu
@@ -510,7 +510,7 @@ namespace pixelgpudetails {
 
   // Interface to outside
   void SiPixelRawToClusterGPUKernel::makeClustersAsync(bool isRun2,
-                                                       const gpuClusterThresholds clusterThresholds,
+                                                       const GPUClusterThresholds clusterThresholds,
                                                        const SiPixelROCsStatusAndMapping *cablingMap,
                                                        const unsigned char *modToUnp,
                                                        const SiPixelGainForHLTonGPU *gains,

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.h b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.h
@@ -13,7 +13,7 @@
 #include "HeterogeneousCore/CUDAUtilities/interface/host_noncached_unique_ptr.h"
 #include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
 #include "DataFormats/SiPixelRawData/interface/SiPixelFormatterErrors.h"
-#include "RecoLocalTracker/SiPixelClusterizer/interface/gpuClusterThresholds.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/GPUClusterThresholds.h"
 
 struct SiPixelROCsStatusAndMapping;
 class SiPixelGainForHLTonGPU;
@@ -171,7 +171,7 @@ namespace pixelgpudetails {
     SiPixelRawToClusterGPUKernel& operator=(SiPixelRawToClusterGPUKernel&&) = delete;
 
     void makeClustersAsync(bool isRun2,
-                           const gpuClusterThresholds clusterThresholds,
+                           const GPUClusterThresholds clusterThresholds,
                            const SiPixelROCsStatusAndMapping* cablingMap,
                            const unsigned char* modToUnp,
                            const SiPixelGainForHLTonGPU* gains,

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/gpuClusterChargeCut.h b/RecoLocalTracker/SiPixelClusterizer/plugins/gpuClusterChargeCut.h
@@ -7,12 +7,12 @@
 #include "CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/cuda_assert.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/prefixScan.h"
-#include "RecoLocalTracker/SiPixelClusterizer/interface/gpuClusterThresholds.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/GPUClusterThresholds.h"
 
 namespace gpuClustering {
 
   __global__ void clusterChargeCut(
-      gpuClusterThresholds clusterThresholds,  // charge cut on cluster in electrons (for layer 1 and for other layers)
+      GPUClusterThresholds clusterThresholds,  // charge cut on cluster in electrons (for layer 1 and for other layers)
       uint16_t* __restrict__ id,               // module id of each pixel (modified if bad cluster)
       uint16_t const* __restrict__ adc,        //  charge of each pixel
       uint32_t const* __restrict__ moduleStart,  // index of the first pixel of each module

diff --git a/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h b/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h
@@ -18,7 +18,7 @@
 
 #include "RecoLocalTracker/SiPixelClusterizer/plugins/gpuClustering.h"
 #include "RecoLocalTracker/SiPixelClusterizer/plugins/gpuClusterChargeCut.h"
-#include "RecoLocalTracker/SiPixelClusterizer/interface/gpuClusterThresholds.h"
+#include "RecoLocalTracker/SiPixelClusterizer/interface/GPUClusterThresholds.h"
 
 int main(void) {
 #ifdef __CUDACC__
@@ -28,7 +28,7 @@ int main(void) {
   using namespace gpuClustering;
 
   constexpr int numElements = 256 * maxNumModules;
-  constexpr gpuClusterThresholds clusterThresholds(2000, 4000);
+  constexpr GPUClusterThresholds clusterThresholds(2000, 4000);
 
   // these in reality are already on GPU
   auto h_id = std::make_unique<uint16_t[]>(numElements);