Skip to content

Commit 67553cb

Browse files
committed
change variables named module to mod
1 parent 336dcef commit 67553cb

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
9999
/// \param int halfstave The half stave number for MLOT. Can be 0 or 1
100100
/// \param int module The module number for MLOT, from 0 to 10 (or 20)
101101
/// \param int chip The chip number for MLOT, from 0 to 8
102-
int getChipIndex(int subDetID, int petalcase, int disk, int lay, int stave, int halfstave, int module, int chip) const;
102+
int getChipIndex(int subDetID, int petalcase, int disk, int lay, int stave, int halfstave, int mod, int chip) const;
103103

104104
/// This routine computes the chip index number from the subDetID, volume, layer, stave /// TODO: retrieve also from chip when chips will be available
105105
/// \param int subDetID The subdetector ID, 0 for VD, 1 for MLOT
@@ -109,7 +109,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
109109
/// \param int halfstave The half stave number for MLOT. Can be 0 or 1
110110
/// \param int module The module number for MLOT, from 0 to 10 (or 20)
111111
/// \param int chip The chip number for MLOT, from 0 to 8
112-
int getChipIndex(int subDetID, int volume, int lay, int stave, int halfstave, int module, int chip) const;
112+
int getChipIndex(int subDetID, int volume, int lay, int stave, int halfstave, int mod, int chip) const;
113113

114114
/// This routine computes subDetID, petal, disk, layer, stave given the chip index number /// TODO: copute also from chip when chips will be available
115115
/// \param int index The chip index number, starting from 0
@@ -121,7 +121,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
121121
/// \param int halfstave The half stave number for MLOT. Can be 0 or 1
122122
/// \param int module The module number for MLOT, from 0 to 10 (or 20)
123123
/// \param int chip The chip number for MLOT, from 0 to 8
124-
bool getChipID(int index, int& subDetID, int& petalcase, int& disk, int& lay, int& stave, int& halfstave, int& module, int& chip) const;
124+
bool getChipID(int index, int& subDetID, int& petalcase, int& disk, int& lay, int& stave, int& halfstave, int& mod, int& chip) const;
125125

126126
int getLastChipIndex(int lay) const { return mLastChipIndex[lay]; }
127127
int getFirstChipIndex(int lay, int petalcase, int subDetID) const

Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ int GeometryTGeo::getChip(int index) const
236236
}
237237

238238
//__________________________________________________________________________
239-
int GeometryTGeo::getChipIndex(int subDetID, int petalcase, int disk, int lay, int stave, int halfstave, int module, int chip) const
239+
int GeometryTGeo::getChipIndex(int subDetID, int petalcase, int disk, int lay, int stave, int halfstave, int mod, int chip) const
240240
{
241241
if (subDetID == 0) { // VD
242242
if (lay == -1) { // disk
@@ -255,7 +255,7 @@ int GeometryTGeo::getChipIndex(int subDetID, int petalcase, int disk, int lay, i
255255
}
256256

257257
//__________________________________________________________________________
258-
int GeometryTGeo::getChipIndex(int subDetID, int volume, int lay, int stave, int halfstave, int module, int chip) const
258+
int GeometryTGeo::getChipIndex(int subDetID, int volume, int lay, int stave, int halfstave, int mod, int chip) const
259259
{
260260
if (subDetID == 0) { // VD
261261
return volume; /// In the current configuration for VD, each volume is the sensor element = chip. // TODO: when the geometry naming scheme will be changed, change this method
@@ -271,15 +271,15 @@ int GeometryTGeo::getChipIndex(int subDetID, int volume, int lay, int stave, int
271271
}
272272

273273
//__________________________________________________________________________
274-
bool GeometryTGeo::getChipID(int index, int& subDetID, int& petalcase, int& disk, int& lay, int& stave, int& halfstave, int& module, int& chip) const
274+
bool GeometryTGeo::getChipID(int index, int& subDetID, int& petalcase, int& disk, int& lay, int& stave, int& halfstave, int& mod, int& chip) const
275275
{
276276
subDetID = getSubDetID(index);
277277
petalcase = getPetalCase(index);
278278
disk = getDisk(index);
279279
lay = getLayer(index);
280280
stave = getStave(index);
281281
halfstave = getHalfStave(index);
282-
module = getModule(index);
282+
mod = getModule(index);
283283
chip = getChip(index);
284284

285285
return kTRUE;
@@ -289,8 +289,8 @@ bool GeometryTGeo::getChipID(int index, int& subDetID, int& petalcase, int& disk
289289
TString GeometryTGeo::getMatrixPath(int index) const
290290
{
291291

292-
int subDetID, petalcase, disk, layer, stave, halfstave, module, chip; //// TODO: add chips in a second step
293-
getChipID(index, subDetID, petalcase, disk, layer, stave, halfstave, module, chip);
292+
int subDetID, petalcase, disk, layer, stave, halfstave, mod, chip; //// TODO: add chips in a second step
293+
getChipID(index, subDetID, petalcase, disk, layer, stave, halfstave, mod, chip);
294294

295295
// PrintChipID(index, subDetID, petalcase, disk, layer, stave, halfstave);
296296

0 commit comments

Comments
 (0)