Commit 9e0fda6
[ALICE3] MI3: Add superconducting magnet/cryostat geometry to ALICE3 MID simulation (#15585)
* [MID] Add superconducting magnet/cryostat geometry to simulation
* Apply clang-format
* [MI3] Add superconducting magnet/cryostat geometry to ALICE3 MID simulation
* [ALICE3] Magnet: add WindingPack (NbTi+Cu+Al) coil material option
* [ALICE3] Magnet: improve WindingPack material documentation
* ICN-UNAM: IanMagnet, IanAbsorber, ICNStepped MID layout — 0 overlaps verified
* ICN-UNAM: IanAbsorber — Geometria 6 (Antonio): cara externa plana Rmax=290, escalon hacia adentro
* ICN-UNAM: cleanup diagnostic instrumentation and translate comments to English
* ICN-UNAM: fix hit production — simple sensor names for VMC resolution and reset mHitStarted on Reset()
* ICN-UNAM: fix physLay in ProcessHits — extract layer index from sensor name; remove ITS TrackReference boilerplate; guard against invalid physLay
* ICN-UNAM: document CurrentVolOffID limitation; full sensor location available via sensor name pattern
* ICN-UNAM: IanAbsorber — correct external Rmin to 245 cm (45 cm thickness per Ian reference code)
* ICN-UNAM: rename enum values — IanMagnet->SuperconductingMagnet, IanAbsorber->SteppedAbsorber, ICNStepped->SteppedLayout
* ICN-UNAM: fix layer 1 half-length to 525 cm (Ian/SD Table 16); revert absorber to Geometry 6 (Rext=290 const, step in Rmin)
* ICN-UNAM: fix ALICE3Field.C — B1 in numerator, Rc=170 cm (R_out_coil per Ian; confirmed by A. Ortiz Aug 2026)
* Refactor field function and improve readability
Refactored field function to use static constexpr for constants and improved readability. Updated condition checks to use std::abs.
* Refactor magnetic field calculation and conditions
Refactor magnetic field calculation by defining variables for Rc, R1, R2, B1, and B2. Update conditions for magnetic field assignment based on radius and beam start position.
* Fix formatting of B1 assignment in ALICE3Field.C
* Refactor member initializer list formatting
* Refactor magnet and detector layout enums
* Refactor absorber geometry initialization logic
* Refactor magnet layout handling in Magnet.cxx
* Refactor constants and improve code structure
Refactor constants and improve readability in Detector.cxx.
---------
Co-authored-by: Nicolò Jacazio <njacazio@users.noreply.github.com>1 parent e0fefa5 commit 9e0fda6
8 files changed
Lines changed: 194 additions & 77 deletions
File tree
- Detectors/Upgrades/ALICE3
- MID
- base/include/MI3Base
- simulation
- include/MI3Simulation
- src
- Passive
- include/Alice3DetectorsPassive
- src
- macros
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
Lines changed: 7 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
| 96 | + | |
96 | 97 | | |
97 | 98 | | |
98 | 99 | | |
| |||
110 | 111 | | |
111 | 112 | | |
112 | 113 | | |
113 | | - | |
| 114 | + | |
114 | 115 | | |
115 | 116 | | |
116 | 117 | | |
117 | 118 | | |
118 | 119 | | |
119 | 120 | | |
120 | 121 | | |
| 122 | + | |
| 123 | + | |
121 | 124 | | |
122 | 125 | | |
| 126 | + | |
| 127 | + | |
123 | 128 | | |
124 | 129 | | |
125 | 130 | | |
| |||
Lines changed: 60 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| |||
92 | 93 | | |
93 | 94 | | |
94 | 95 | | |
95 | | - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
96 | 109 | | |
97 | 110 | | |
98 | 111 | | |
| |||
125 | 138 | | |
126 | 139 | | |
127 | 140 | | |
128 | | - | |
129 | 141 | | |
130 | 142 | | |
131 | 143 | | |
132 | 144 | | |
| 145 | + | |
133 | 146 | | |
134 | | - | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
135 | 169 | | |
| 170 | + | |
136 | 171 | | |
137 | 172 | | |
138 | 173 | | |
| |||
147 | 182 | | |
148 | 183 | | |
149 | 184 | | |
| 185 | + | |
150 | 186 | | |
151 | 187 | | |
152 | 188 | | |
| |||
159 | 195 | | |
160 | 196 | | |
161 | 197 | | |
162 | | - | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
163 | 201 | | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
169 | 208 | | |
170 | 209 | | |
171 | 210 | | |
| |||
213 | 252 | | |
214 | 253 | | |
215 | 254 | | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
224 | 266 | | |
225 | 267 | | |
226 | 268 | | |
| |||
241 | 283 | | |
242 | 284 | | |
243 | 285 | | |
244 | | - | |
| 286 | + | |
Lines changed: 49 additions & 29 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
34 | 42 | | |
35 | 43 | | |
36 | | - | |
| 44 | + | |
37 | 45 | | |
38 | 46 | | |
39 | 47 | | |
40 | 48 | | |
41 | 49 | | |
42 | 50 | | |
43 | 51 | | |
44 | | - | |
45 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
46 | 56 | | |
47 | 57 | | |
48 | 58 | | |
| |||
54 | 64 | | |
55 | 65 | | |
56 | 66 | | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
66 | 77 | | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
67 | 81 | | |
68 | | - | |
| 82 | + | |
69 | 83 | | |
70 | 84 | | |
71 | 85 | | |
72 | 86 | | |
73 | 87 | | |
74 | 88 | | |
75 | | - | |
| 89 | + | |
76 | 90 | | |
77 | | - | |
| 91 | + | |
78 | 92 | | |
79 | 93 | | |
80 | 94 | | |
| |||
106 | 120 | | |
107 | 121 | | |
108 | 122 | | |
109 | | - | |
110 | | - | |
| 123 | + | |
| 124 | + | |
111 | 125 | | |
112 | 126 | | |
113 | 127 | | |
| |||
136 | 150 | | |
137 | 151 | | |
138 | 152 | | |
139 | | - | |
| 153 | + | |
140 | 154 | | |
141 | | - | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
142 | 160 | | |
143 | 161 | | |
144 | 162 | | |
| |||
172 | 190 | | |
173 | 191 | | |
174 | 192 | | |
175 | | - | |
| 193 | + | |
176 | 194 | | |
177 | 195 | | |
178 | 196 | | |
| |||
184 | 202 | | |
185 | 203 | | |
186 | 204 | | |
187 | | - | |
| 205 | + | |
188 | 206 | | |
189 | 207 | | |
190 | 208 | | |
191 | 209 | | |
192 | 210 | | |
193 | | - | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
194 | 214 | | |
195 | 215 | | |
196 | 216 | | |
197 | | - | |
| 217 | + | |
198 | 218 | | |
199 | 219 | | |
200 | 220 | | |
| |||
205 | 225 | | |
206 | 226 | | |
207 | 227 | | |
208 | | - | |
| 228 | + | |
Lines changed: 11 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
29 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
30 | 32 | | |
31 | 33 | | |
32 | | - | |
33 | | - | |
34 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
35 | 38 | | |
36 | 39 | | |
37 | 40 | | |
38 | 41 | | |
39 | 42 | | |
40 | | - | |
41 | | - | |
| 43 | + | |
| 44 | + | |
42 | 45 | | |
43 | 46 | | |
44 | 47 | | |
| |||
0 commit comments