Skip to content

Commit 309a5c9

Browse files
committed
ALICE3-TRK: considering the OT half-stave as the smallest elemenent for the digitization in the OT
1 parent 8d2d373 commit 309a5c9

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ class SegmentationChip
124124
} else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
125125
pitchRow = PitchRowMLOT;
126126
pitchCol = PitchColMLOT;
127-
maxWidth = constants::OT::width;
127+
maxWidth = constants::OT::halfstave::width;
128128
maxLength = constants::ML::length;
129129
} else if (subDetID == 1 && layer > 4) { // OT
130130
pitchRow = PitchRowMLOT;
131131
pitchCol = PitchColMLOT;
132-
maxWidth = constants::OT::width;
133-
maxLength = constants::OT::length;
132+
maxWidth = constants::OT::halfstave::width;
133+
maxLength = constants::OT::halfstave::length;
134134
}
135135
// convert to row/col
136136
iRow = static_cast<int>(((maxWidth / 2 - xRow) / pitchRow));
@@ -149,11 +149,11 @@ class SegmentationChip
149149
maxWidth = constants::ML::width;
150150
maxLength = constants::ML::length;
151151
} else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
152-
maxWidth = constants::OT::width;
152+
maxWidth = constants::OT::halfstave::width;
153153
maxLength = constants::ML::length;
154154
} else if (subDetID == 1 && layer > 4) { // OT
155-
maxWidth = constants::OT::width;
156-
maxLength = constants::OT::length;
155+
maxWidth = constants::OT::halfstave::width;
156+
maxLength = constants::OT::halfstave::length;
157157
}
158158
return (-maxWidth / 2 < x && x < maxWidth / 2 && -maxLength / 2 < z && z < maxLength / 2);
159159
}
@@ -171,11 +171,11 @@ class SegmentationChip
171171
nRows = constants::ML::nRows;
172172
nCols = constants::ML::nCols;
173173
} else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
174-
nRows = constants::OT::nRows;
174+
nRows = constants::OT::halfstave::nRows;
175175
nCols = constants::ML::nCols;
176176
} else if (subDetID == 1 && layer > 4) { // OT
177-
nRows = constants::OT::nRows;
178-
nCols = constants::OT::nCols;
177+
nRows = constants::OT::halfstave::nRows;
178+
nCols = constants::OT::halfstave::nCols;
179179
}
180180
return (row >= 0 && row < static_cast<float>(nRows) && col >= 0 && col < static_cast<float>(nCols));
181181
}
@@ -222,11 +222,11 @@ class SegmentationChip
222222
xRow = 0.5 * (constants::ML::width - PitchRowMLOT) - (row * PitchRowMLOT);
223223
zCol = col * PitchRowMLOT + 0.5 * (PitchRowMLOT - constants::ML::length);
224224
} else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
225-
xRow = 0.5 * (constants::OT::width - PitchRowMLOT) - (row * PitchRowMLOT);
225+
xRow = 0.5 * (constants::OT::halfstave::width - PitchRowMLOT) - (row * PitchRowMLOT);
226226
zCol = col * PitchRowMLOT + 0.5 * (PitchRowMLOT - constants::ML::length);
227227
} else if (subDetID == 1 && layer > 4) { // OT
228-
xRow = 0.5 * (constants::OT::width - PitchRowMLOT) - (row * PitchRowMLOT);
229-
zCol = col * PitchColMLOT + 0.5 * (PitchColMLOT - constants::OT::length);
228+
xRow = 0.5 * (constants::OT::halfstave::width - PitchRowMLOT) - (row * PitchRowMLOT);
229+
zCol = col * PitchColMLOT + 0.5 * (PitchColMLOT - constants::OT::halfstave::length);
230230
}
231231
}
232232

@@ -283,11 +283,11 @@ class SegmentationChip
283283
<< "\nVD L1: " << constants::VD::petal::layer::nRows[1]
284284
<< "\nVD L2: " << constants::VD::petal::layer::nRows[2]
285285
<< "\nML stave: " << constants::ML::nRows
286-
<< "\nOT stave: " << constants::OT::nRows;
286+
<< "\nOT half stave: " << constants::OT::halfstave::nRows;
287287

288288
LOG(info) << "Number of cols:\nVD: " << constants::VD::petal::layer::nCols
289289
<< "\nML stave: " << constants::ML::nCols
290-
<< "\nOT stave: " << constants::OT::nCols;
290+
<< "\nOT half stave: " << constants::OT::halfstave::nCols;
291291

292292
LOG(info) << "Pitch rows [cm]:\nVD: " << PitchRowVD
293293
<< "\nML stave: " << PitchRowMLOT

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,16 @@ constexpr int nCols{static_cast<int>(length / constants::moduleMLOT::chip::pitch
111111

112112
namespace OT
113113
{
114-
constexpr double width{moduleMLOT::width * 2}; // width of the stave
115-
// constexpr double length{moduleMLOT::length * 20}; // length of the stave
116-
constexpr double length{258 * cm}; // length of the stave, hardcoded to fit the implemented geometry
114+
namespace halfstave
115+
{
116+
constexpr double width{moduleMLOT::width * 1}; // width of the half stave
117+
// constexpr double length{moduleMLOT::length * 20}; // length of the halfstave
118+
constexpr double length{258 * cm}; // length of the halfstave, hardcoded to fit the implemented geometry
119+
constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)}; // number of rows in the halfstave
120+
constexpr int nCols{static_cast<int>(length / moduleMLOT::chip::pitchZ)}; // number of columns in the halfstave
121+
} // namespace halfstave
122+
constexpr double width{halfstave::width * 2}; // width of the stave
123+
constexpr double length{halfstave::length}; // length of the stave
117124
constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)}; // number of rows in the stave
118125
constexpr int nCols{static_cast<int>(length / moduleMLOT::chip::pitchZ)}; // number of columns in the stave
119126
} // namespace OT

0 commit comments

Comments
 (0)