Skip to content

Commit 5c052d9

Browse files
davidrohrdavidrohr
committed
Fix compiler warnings
1 parent f06402b commit 5c052d9

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

‎GPU/TPCFastTransformation/TPCDistortionIRS.h‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ namespace tpc_fast_transformation {
2929
/// using irregular splines
3030
///
3131
/// Row, U, V -> dX,dU,dV
32-
///
32+
///
3333
/// The class is flat C structure. No virtual methods, no ROOT types are used.
34-
///
34+
///
3535
class TPCDistortionIRS :public FlatObject
3636
{
37-
public:
37+
public:
3838

3939
///
4040
/// \brief The struct contains necessary info for TPC padrow
41-
///
41+
///
4242
struct RowInfo{
4343
float x; ///< x coordinate of the row [cm]
4444
float U0; ///< min. u coordinate
@@ -65,7 +65,7 @@ class TPCDistortionIRS :public FlatObject
6565

6666
/// _____________ FlatObject functionality, see FlatObject class for description ____________
6767

68-
/// Memory alignment
68+
/// Memory alignment
6969

7070
using FlatObject::getClassAlignmentBytes;
7171
using FlatObject::getBufferAlignmentBytes;
@@ -80,7 +80,7 @@ class TPCDistortionIRS :public FlatObject
8080
using FlatObject::releaseInternalBuffer;
8181
void moveBufferTo( char *newBufferPtr );
8282

83-
/// Moving the class with its external buffer to another location
83+
/// Moving the class with its external buffer to another location
8484

8585
void setActualBufferAddress( char* actualFlatBufferPtr );
8686
void setFutureBufferAddress( char* futureFlatBufferPtr );
@@ -94,12 +94,12 @@ class TPCDistortionIRS :public FlatObject
9494
void startConstruction( int numberOfRows, int numberOfScenarios );
9595

9696
/// Initializes a TPC row
97-
void setTPCrow( int iRow, float x, int nPads, float padWidth, int iScenario );
97+
void setTPCrow( int iRow, float x, int nPads, float padWidth, int iScenario );
9898

9999
/// Sets TPC geometry
100100
void setTPCgeometry( float tpcLengthSideA, float tpcLengthSideC );
101101

102-
/// Sets approximation scenario
102+
/// Sets approximation scenario
103103
void setApproximationScenario( int scenarioIndex, const IrregularSpline2D3D &spline );
104104

105105
/// Finishes construction: puts everything to the flat buffer, releases temporary memory
@@ -109,16 +109,16 @@ class TPCDistortionIRS :public FlatObject
109109

110110
/// _______________ Initialization interface ________________________
111111

112-
/// Sets the time stamp of the current calibaration
112+
/// Sets the time stamp of the current calibaration
113113
void setTimeStamp( long int v) { mTimeStamp = v; }
114114

115-
/// Gives pointer to a spline
115+
/// Gives pointer to a spline
116116
const IrregularSpline2D3D& getSpline( int slice, int row ) const;
117117

118-
/// Gives pointer to spline data
118+
/// Gives pointer to spline data
119119
float *getSplineDataNonConst( int slice, int row );
120120

121-
/// Gives pointer to spline data
121+
/// Gives pointer to spline data
122122
const float *getSplineData( int slice, int row ) const;
123123

124124

@@ -129,7 +129,7 @@ class TPCDistortionIRS :public FlatObject
129129
static constexpr size_t getBufferAlignmentBytes() {return 8;}
130130

131131

132-
/// _______________ The main method: cluster distortion _______________________
132+
/// _______________ The main method: cluster distortion _______________________
133133
///
134134
int getDistortion(int slice, int row, float u, float v, float &dx, float &du,
135135
float &dv) const;
@@ -151,12 +151,12 @@ class TPCDistortionIRS :public FlatObject
151151
int convUVtoSUV( int slice, int row, float u, float v, float &su, float &sv ) const;
152152
int convSUVtoUV( int slice, int row, float su, float sv, float &u, float &v ) const;
153153

154-
private:
154+
private:
155155

156156
void relocateBufferPointers( const char* oldBuffer, char *newBuffer );
157157

158158
/// Enumeration of construction states
159-
enum ConstructionExtraState : unsigned int {
159+
enum ConstructionExtraState : unsigned int {
160160
GeometryIsSet = 0x4 ///< geometry is set
161161
};
162162

@@ -168,8 +168,8 @@ class TPCDistortionIRS :public FlatObject
168168

169169
/// _______________ Construction control _______________________________________________
170170

171-
unsigned int mConstructionCounterRows; ///< counter for constructed members
172-
unsigned int mConstructionCounterScenarios; ///< counter for constructed members
171+
int mConstructionCounterRows; ///< counter for constructed members
172+
int mConstructionCounterScenarios; ///< counter for constructed members
173173
std::unique_ptr<RowInfo[]> mConstructionRowInfos; ///< Temporary container of the row infos during construction
174174
std::unique_ptr<IrregularSpline2D3D[]> mConstructionScenarios; ///< Temporary container for spline scenarios
175175

@@ -183,9 +183,9 @@ class TPCDistortionIRS :public FlatObject
183183
IrregularSpline2D3D *mScenarioPtr; ///< Pointer to spline scenarios
184184

185185
float mScaleVtoSVsideA; ///< scale for v->sv for TPC side A
186-
float mScaleVtoSVsideC; ///< scale for v->sv for TPC side C
186+
float mScaleVtoSVsideC; ///< scale for v->sv for TPC side C
187187
float mScaleSVtoVsideA; ///< scale for sv->v for TPC side A
188-
float mScaleSVtoVsideC; ///< scale for sv->v for TPC side C
188+
float mScaleSVtoVsideC; ///< scale for sv->v for TPC side C
189189

190190
/// _______________ Calibration data _______________________________________________
191191

@@ -202,17 +202,17 @@ class TPCDistortionIRS :public FlatObject
202202
/// ====================================================
203203

204204
inline int TPCDistortionIRS::convUVtoSUV( int slice, int row, float u, float v, float &su, float &sv ) const
205-
{
206-
const RowInfo& rowInfo = getRowInfo( row );
205+
{
206+
const RowInfo& rowInfo = getRowInfo( row );
207207
su = (u-rowInfo.U0)*rowInfo.scaleUtoSU;
208208
if( slice<18 ) sv = v*mScaleVtoSVsideA;
209209
else sv = v*mScaleVtoSVsideC;
210210
return 0;
211211
}
212212

213213
inline int TPCDistortionIRS::convSUVtoUV( int slice, int row, float su, float sv, float &u, float &v ) const
214-
{
215-
const RowInfo& rowInfo = getRowInfo( row );
214+
{
215+
const RowInfo& rowInfo = getRowInfo( row );
216216
u = rowInfo.U0 + su*rowInfo.scaleSUtoU;
217217
if( slice<18 ) v = sv*mScaleSVtoVsideA;
218218
else v = sv*mScaleSVtoVsideC;
@@ -225,7 +225,7 @@ inline int TPCDistortionIRS::getDistortion(int slice, int row, float u, float v,
225225
const IrregularSpline2D3D& spline = getSpline( slice, row );
226226
const float *splineData = getSplineData( slice, row );
227227
float su=0, sv=0;
228-
convUVtoSUV( slice, row, u, v, su, sv );
228+
convUVtoSUV( slice, row, u, v, su, sv );
229229
spline.getSplineVec( splineData, su, sv, dx, du, dv );
230230
return 0;
231231
}

0 commit comments

Comments
 (0)