Commit 07b679a
committed
Wrap the QED event IDs at the number of QED events available
This fixes a problem in the QED round robin of the collision context and adds a
guard in the MCKinematicsReader.
- o2-steer-colcontexttool passed the number of MC events asked to fillQED, so the
round robin never wrapped and the QED event parts named events which are not in
the QED kinematics.
- The number of events available is used now, with a warning when it is missing
or larger than an MCEventLabel can encode.
- MCKinematicsReader read past the end of its header, track and track-reference
vectors for such an event ID. It throws std::out_of_range now, and the getters
returning a pointer or a span report the miss instead.
- The range test shares the branch of the lazy load and the message is built out
of line, so the accessors keep their fast path.
https://its.cern.ch/jira/browse/O2-71321 parent 9cda446 commit 07b679a
3 files changed
Lines changed: 82 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
124 | 129 | | |
125 | 130 | | |
126 | 131 | | |
| |||
151 | 156 | | |
152 | 157 | | |
153 | 158 | | |
154 | | - | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
155 | 162 | | |
156 | 163 | | |
157 | 164 | | |
| |||
161 | 168 | | |
162 | 169 | | |
163 | 170 | | |
164 | | - | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
165 | 176 | | |
166 | 177 | | |
167 | | - | |
168 | | - | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
169 | 181 | | |
170 | | - | |
| 182 | + | |
171 | 183 | | |
172 | 184 | | |
173 | 185 | | |
| |||
177 | 189 | | |
178 | 190 | | |
179 | 191 | | |
180 | | - | |
| 192 | + | |
| 193 | + | |
181 | 194 | | |
182 | 195 | | |
183 | | - | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
184 | 200 | | |
185 | 201 | | |
186 | 202 | | |
187 | 203 | | |
188 | | - | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
189 | 209 | | |
190 | 210 | | |
191 | | - | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
192 | 215 | | |
193 | 216 | | |
194 | 217 | | |
195 | 218 | | |
196 | | - | |
| 219 | + | |
| 220 | + | |
197 | 221 | | |
198 | 222 | | |
199 | | - | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
200 | 227 | | |
201 | 228 | | |
202 | 229 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
215 | 216 | | |
216 | 217 | | |
217 | 218 | | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
218 | 238 | | |
219 | 239 | | |
220 | 240 | | |
| |||
721 | 741 | | |
722 | 742 | | |
723 | 743 | | |
724 | | - | |
| 744 | + | |
725 | 745 | | |
726 | 746 | | |
727 | 747 | | |
| |||
786 | 806 | | |
787 | 807 | | |
788 | 808 | | |
789 | | - | |
| 809 | + | |
790 | 810 | | |
791 | 811 | | |
792 | 812 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
22 | 44 | | |
23 | 45 | | |
24 | 46 | | |
| |||
0 commit comments