Skip to content

Commit 33cf955

Browse files
davidrohrdavidrohr
committed
GPU TPCFastTransfomration: Add missing inline keywords
1 parent a8ab4b0 commit 33cf955

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,21 @@ class TPCFastSpaceChargeCorrection : public FlatObject
7373
float getZ0() const { return z0; }
7474
float getZscale() const { return zScale; }
7575

76-
GPUd() float getSpineScaleForZ(float z) const
76+
GPUdi() float getSpineScaleForZ(float z) const
7777
{
7878
return 1.f - GPUCommonMath::Clamp((z - zOut) * splineScalingWithZ, 0.f, 1.f);
7979
}
8080

8181
/// convert local y, z to internal grid coordinates u,v, and spline scale
82-
GPUd() void convLocalToGridUntruncated(float y, float z, float& u, float& v, float& s) const
82+
GPUdi() void convLocalToGridUntruncated(float y, float z, float& u, float& v, float& s) const
8383
{
8484
u = (y - y0) * yScale;
8585
v = (z - z0) * zScale;
8686
s = getSpineScaleForZ(z);
8787
}
8888

8989
/// convert internal grid coordinates u,v to local y, z
90-
GPUd() void convGridToLocal(float gridU, float gridV, float& y, float& z) const
90+
GPUdi() void convGridToLocal(float gridU, float gridV, float& y, float& z) const
9191
{
9292
y = y0 + gridU / yScale;
9393
z = z0 + gridV / zScale;
@@ -215,7 +215,7 @@ class TPCFastSpaceChargeCorrection : public FlatObject
215215
GPUd() void setNoCorrection();
216216

217217
/// Sets the time stamp of the current calibaration
218-
GPUd() void setTimeStamp(int64_t v) { mTimeStamp = v; }
218+
GPUdi() void setTimeStamp(int64_t v) { mTimeStamp = v; }
219219

220220
/// Gives const pointer to a spline
221221
GPUd() const SplineType& getSpline(int32_t sector, int32_t row) const;
@@ -287,7 +287,7 @@ class TPCFastSpaceChargeCorrection : public FlatObject
287287
GPUd() bool isRealLocalInsideGrid(int32_t sector, int32_t row, float y, float z) const;
288288

289289
/// TPC geometry information
290-
GPUd() const TPCFastTransformGeo& getGeometry() const
290+
GPUdi() const TPCFastTransformGeo& getGeometry() const
291291
{
292292
return mGeo;
293293
}
@@ -296,13 +296,13 @@ class TPCFastSpaceChargeCorrection : public FlatObject
296296
int64_t getTimeStamp() const { return mTimeStamp; }
297297

298298
/// Gives TPC sector & row info
299-
GPUd() const SectorRowInfo& getSectorRowInfo(int32_t sector, int32_t row) const
299+
GPUdi() const SectorRowInfo& getSectorRowInfo(int32_t sector, int32_t row) const
300300
{
301301
return mSectorRowInfos[mGeo.getMaxNumberOfRows() * sector + row];
302302
}
303303

304304
/// Gives TPC sector & row info
305-
GPUd() SectorRowInfo& getSectorRowInfo(int32_t sector, int32_t row)
305+
GPUdi() SectorRowInfo& getSectorRowInfo(int32_t sector, int32_t row)
306306
{
307307
return mSectorRowInfos[mGeo.getMaxNumberOfRows() * sector + row];
308308
}

‎GPU/TPCFastTransformation/TPCFastTransform.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct TPCSlowSpaceChargeCorrection {
5353
~TPCSlowSpaceChargeCorrection() = default;
5454

5555
/// setting dummy corrections for GPU
56-
GPUd() void getCorrections(const float gx, const float gy, const float gz, const int32_t sector, float& gdxC, float& gdyC, float& gdzC) const
56+
GPUdi() void getCorrections(const float gx, const float gy, const float gz, const int32_t sector, float& gdxC, float& gdyC, float& gdzC) const
5757
{
5858
gdxC = 0;
5959
gdyC = 0;
@@ -172,7 +172,7 @@ class TPCFastTransform : public FlatObject
172172
void setTimeStamp(int64_t v) { mTimeStamp = v; }
173173

174174
/// Gives a reference for external initialization of TPC corrections
175-
GPUd() const TPCFastSpaceChargeCorrection& getCorrection() const { return mCorrection; }
175+
GPUdi() const TPCFastSpaceChargeCorrection& getCorrection() const { return mCorrection; }
176176

177177
/// Gives a reference for external initialization of TPC corrections
178178
TPCFastSpaceChargeCorrection& getCorrection() { return mCorrection; }
@@ -230,37 +230,37 @@ class TPCFastTransform : public FlatObject
230230
/// _______________ Utilities _______________________________________________
231231

232232
/// TPC geometry information
233-
GPUd() const TPCFastTransformGeo& getGeometry() const { return mCorrection.getGeometry(); }
233+
GPUdi() const TPCFastTransformGeo& getGeometry() const { return mCorrection.getGeometry(); }
234234

235235
/// Gives the time stamp of the current calibaration parameters
236-
GPUd() int64_t getTimeStamp() const { return mTimeStamp; }
236+
GPUdi() int64_t getTimeStamp() const { return mTimeStamp; }
237237

238238
/// Return mVDrift in cm / time bin
239-
GPUd() float getVDrift() const { return mVdrift; }
239+
GPUdi() float getVDrift() const { return mVdrift; }
240240

241241
/// Return T0 in time bin units
242-
GPUd() float getT0() const { return mT0; }
242+
GPUdi() float getT0() const { return mT0; }
243243

244244
/// Return map lumi
245-
GPUd() float getLumi() const { return mLumi; }
245+
GPUdi() float getLumi() const { return mLumi; }
246246

247-
GPUd() float isLumiSet() const { return mLumi != DEFLUMI; }
247+
GPUdi() float isLumiSet() const { return mLumi != DEFLUMI; }
248248

249249
/// Return map lumi error
250-
GPUd() float getLumiError() const { return mLumiError; }
250+
GPUdi() float getLumiError() const { return mLumiError; }
251251

252252
/// Return map lumi
253253
GPUd() float getIDC() const;
254254

255-
GPUd() bool isIDCSet() const { return mIDC != DEFIDC; }
255+
GPUdi() bool isIDCSet() const { return mIDC != DEFIDC; }
256256

257257
/// Return map lumi error
258-
GPUd() float getIDCError() const { return mIDCError; }
258+
GPUdi() float getIDCError() const { return mIDCError; }
259259

260-
GPUd() float getCTP2IDCFallBackThreshold() const { return mCTP2IDCFallBackThreshold; }
260+
GPUdi() float getCTP2IDCFallBackThreshold() const { return mCTP2IDCFallBackThreshold; }
261261

262262
/// Return map user defined lumi scale factor
263-
GPUd() float getLumiScaleFactor() const { return mLumiScaleFactor; }
263+
GPUdi() float getLumiScaleFactor() const { return mLumiScaleFactor; }
264264

265265
/// maximal possible drift time of the active area
266266
GPUd() float getMaxDriftTime(int32_t sector, int32_t row, float pad) const;

‎GPU/TPCFastTransformation/TPCFastTransformGeo.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ class TPCFastTransformGeo
5353
float yMin{0.f}; ///< min. y coordinate
5454

5555
/// get Y min
56-
GPUd() float getYmin() const { return yMin; }
56+
GPUdi() float getYmin() const { return yMin; }
5757

5858
/// get Y max
59-
GPUd() float getYmax() const { return -yMin; }
59+
GPUdi() float getYmax() const { return -yMin; }
6060

6161
/// get Y range
6262
#ifndef GPUCA_GPUCODE_DEVICE
6363
GPUd() std::array<float, 2> getYrange() const { return {getYmin(), getYmax()}; }
6464
#endif
6565

6666
/// get width in Y
67-
GPUd() float getYwidth() const { return -2.f * yMin; }
67+
GPUdi() float getYwidth() const { return -2.f * yMin; }
6868

6969
ClassDefNV(RowInfo, 2);
7070
};
@@ -110,16 +110,16 @@ class TPCFastTransformGeo
110110
/// _______________ Getters _________________________________
111111

112112
/// Gives number of TPC sectors
113-
GPUd() static constexpr int32_t getNumberOfSectors() { return NumberOfSectors; }
113+
GPUdi() static constexpr int32_t getNumberOfSectors() { return NumberOfSectors; }
114114

115115
/// Gives number of TPC sectors on the A side
116-
GPUd() static constexpr int32_t getNumberOfSectorsA() { return NumberOfSectorsA; }
116+
GPUdi() static constexpr int32_t getNumberOfSectorsA() { return NumberOfSectorsA; }
117117

118118
/// Gives number of TPC rows
119-
GPUd() int32_t getNumberOfRows() const { return mNumberOfRows; }
119+
GPUdi() int32_t getNumberOfRows() const { return mNumberOfRows; }
120120

121121
/// Gives number of TPC rows
122-
GPUd() static constexpr int getMaxNumberOfRows() { return MaxNumberOfRows; }
122+
GPUdi() static constexpr int getMaxNumberOfRows() { return MaxNumberOfRows; }
123123

124124
/// Gives sector info
125125
GPUd() const SectorInfo& getSectorInfo(int32_t sector) const;
@@ -128,7 +128,7 @@ class TPCFastTransformGeo
128128
GPUd() const RowInfo& getRowInfo(int32_t row) const;
129129

130130
/// Gives Z length of the TPC, one Z side
131-
GPUd() float getTPCzLength() const { return mTPCzLength; }
131+
GPUdi() float getTPCzLength() const { return mTPCzLength; }
132132

133133
/// Gives Z range for the corresponding TPC side
134134
#ifndef GPUCA_GPUCODE_DEVICE

0 commit comments

Comments
 (0)