Skip to content

Commit d2a5c4f

Browse files
committed
Fix naming
1 parent c49b142 commit d2a5c4f

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

ALICE3/Core/DetLayer.h

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ struct DetLayer {
3232
// Default constructor
3333
DetLayer() = default;
3434
// Parametric constructor
35-
DetLayer(const TString& name_, float r_, float z_, float x0_, float xrho_,
36-
float resRPhi_ = 0.0f, float resZ_ = 0.0f, float eff_ = 0.0f, int type_ = kLayerInert);
35+
DetLayer(const TString& name, float r, float z, float x0, float xrho,
36+
float resRPhi = 0.0f, float resZ = 0.0f, float eff = 0.0f, int type = kLayerInert);
3737
// Copy constructor
3838
DetLayer(const DetLayer& other);
3939

4040
// Setters
41-
void setName(const TString& name_) { name = name_; }
42-
void setRadius(float r_) { r = r_; }
43-
void setZ(float z_) { z = z_; }
44-
void setRadiationLength(float x0_) { x0 = x0_; }
45-
void setDensity(float xrho_) { xrho = xrho_; }
46-
void setResolutionRPhi(float resRPhi_) { resRPhi = resRPhi_; }
47-
void setResolutionZ(float resZ_) { resZ = resZ_; }
48-
void setEfficiency(float eff_) { eff = eff_; }
49-
void setType(int type_) { type = type_; }
41+
void setName(const TString& name) { mName = name; }
42+
void setRadius(float r) { mR = r; }
43+
void setZ(float z) { mZ = z; }
44+
void setRadiationLength(float x0) { mX0 = x0; }
45+
void setDensity(float xrho) { mXrho = xrho; }
46+
void setResolutionRPhi(float resRPhi) { mResRPhi = resRPhi; }
47+
void setResolutionZ(float resZ) { mResZ = resZ; }
48+
void setEfficiency(float eff) { mEff = eff; }
49+
void setType(int type) { mType = type; }
5050

5151
// Dead areas
5252

@@ -60,24 +60,24 @@ struct DetLayer {
6060
void setDeadPhiRegions(TGraph* graph);
6161

6262
// Getters
63-
float getRadius() const { return r; }
64-
float getZ() const { return z; }
65-
float getRadiationLength() const { return x0; }
66-
float getDensity() const { return xrho; }
67-
float getResolutionRPhi() const { return resRPhi; }
68-
float getResolutionZ() const { return resZ; }
69-
float getEfficiency() const { return eff; }
70-
int getType() const { return type; }
71-
const TString& getName() const { return name; }
63+
float getRadius() const { return mR; }
64+
float getZ() const { return mZ; }
65+
float getRadiationLength() const { return mX0; }
66+
float getDensity() const { return mXrho; }
67+
float getResolutionRPhi() const { return mResRPhi; }
68+
float getResolutionZ() const { return mResZ; }
69+
float getEfficiency() const { return mEff; }
70+
int getType() const { return mType; }
71+
const TString& getName() const { return mName; }
7272
const TGraph* getDeadPhiRegions() const { return mDeadPhiRegions; }
7373

74-
// Check layer type
75-
bool isInert() const { return type == kLayerInert; }
76-
bool isSilicon() const { return type == kLayerSilicon; }
77-
bool isGas() const { return type == kLayerGas; }
78-
bool isTOF() const { return type == kLayerTOF; }
79-
bool isVertex() const { return type == kLayerVertex; }
80-
bool isActive() const { return type != kLayerInert; } // active layers are not inert
74+
// Check layer mType
75+
bool isInert() const { return mType == kLayerInert; }
76+
bool isSilicon() const { return mType == kLayerSilicon; }
77+
bool isGas() const { return mType == kLayerGas; }
78+
bool isTOF() const { return mType == kLayerTOF; }
79+
bool isVertex() const { return mType == kLayerVertex; }
80+
bool isActive() const { return mType != kLayerInert; } // active layers are not inert
8181

8282
// Utilities
8383
std::string toString() const;
@@ -104,28 +104,28 @@ struct DetLayer {
104104

105105
private:
106106
// TString for holding name
107-
TString name;
107+
TString mName;
108108

109109
// position variables
110-
float r; // radius in centimeters
111-
float z; // z dimension in centimeters
110+
float mR; // radius in centimeters
111+
float mZ; // mZ dimension in centimeters
112112

113113
// material variables
114-
float x0; // radiation length
115-
float xrho; // density
114+
float mX0; // radiation length
115+
float mXrho; // density
116116

117117
// resolution variables for active layers
118-
float resRPhi; // RPhi resolution in centimeters
119-
float resZ; // Z resolution in centimeters
118+
float mResRPhi; // RPhi resolution in centimeters
119+
float mResZ; // Z resolution in centimeters
120120

121121
// efficiency
122-
float eff; // detection efficiency
122+
float mEff; // detection efficiency
123123

124124
// dead regions in phi (in radians)
125125
TGraph* mDeadPhiRegions = nullptr;
126126

127127
// layer type
128-
int type; // 0: undefined/inert, 1: silicon, 2: gas/tpc
128+
int mType; // 0: undefined/inert, 1: silicon, 2: gas/tpc
129129
};
130130

131131
} // namespace o2::fastsim

0 commit comments

Comments
 (0)