@@ -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 << " \n VD L1: " << constants::VD::petal::layer::nRows[1 ]
284284 << " \n VD L2: " << constants::VD::petal::layer::nRows[2 ]
285285 << " \n ML stave: " << constants::ML::nRows
286- << " \n OT stave: " << constants::OT::nRows;
286+ << " \n OT half stave: " << constants::OT::halfstave ::nRows;
287287
288288 LOG (info) << " Number of cols:\n VD: " << constants::VD::petal::layer::nCols
289289 << " \n ML stave: " << constants::ML::nCols
290- << " \n OT stave: " << constants::OT::nCols;
290+ << " \n OT half stave: " << constants::OT::halfstave ::nCols;
291291
292292 LOG (info) << " Pitch rows [cm]:\n VD: " << PitchRowVD
293293 << " \n ML stave: " << PitchRowMLOT
0 commit comments