|
1 | 1 | <!-- SPDX-License-Identifier: LGPL-3.0-or-later --> |
2 | | -<!-- Copyright (C) 2022 Simon Gardner, Dhevan Gangadharan --> |
| 2 | +<!-- Copyright (C) 2022 Simon Gardner, Dhevan Gangadharan, Andrii Natochii --> |
3 | 3 |
|
4 | 4 | <lccdd> |
5 | 5 |
|
|
10 | 10 |
|
11 | 11 | <detectors> |
12 | 12 |
|
13 | | - |
14 | 13 | <comment> Hadron side beam magnet volumes </comment> |
15 | 14 |
|
16 | | - <detector name="Magnet_Q2PR" type="ip6_CylindricalDipoleMagnet" vis="RedVis"> |
17 | | - <placement x="(Q2PR_StartX+Q2PR_EndX)/2" y="0" z="(Q2PR_StartZ+Q2PR_EndZ)/2" theta="Q1BPR_Theta"/> |
18 | | - <dimensions x="Q2PR_InnerRadius*4" y="Q2PR_InnerRadius*4" z="Q2PR_Length" r="2.0*Q2PR_InnerRadius"/> |
19 | | - <apperture x="Q2PR_InnerRadius*2" y="Q2PR_InnerRadius*2" r="Q2PR_InnerRadius"/> |
20 | | - <coil dx="2*cm" dy="1.5*cm" /> |
21 | | - </detector> |
22 | | - |
23 | 15 | <detector |
24 | 16 | name="Magnets_Q3PR_to_B1PR" |
25 | 17 | type="CylindricalMagnetChain" |
26 | | - vis="FFMagnetVis"> |
| 18 | + vis="MagnetVis"> |
27 | 19 | <magnet id="0" name="Magnet_Q3PR" |
28 | 20 | x="(Q3PR_StartX+Q3PR_EndX)/2" y="0" z="(Q3PR_StartZ+Q3PR_EndZ)/2" theta="Q3PR_Theta" |
29 | 21 | length="Q3PR_Length" rin="Q3PR_InnerRadius" rout="Q3PR_OuterRadius"> |
|
50 | 42 | </magnet> |
51 | 43 | </detector> |
52 | 44 |
|
53 | | - |
54 | 45 | <comment> Hadron side beam pipe volumes </comment> |
55 | 46 |
|
56 | 47 | <detector |
57 | 48 | name="Pipe_Q1APR_to_B1PR" |
58 | 49 | type="BeamPipeChain" |
59 | 50 | wall_thickness="2*mm"> |
60 | 51 | <pipe id="0" name="Pipe_to_Q1APR" |
61 | | - xcenter="(Hadron_Beampipe_End*sin(CrossingAngle) + Q1APR_StartX)/2." zcenter="(Hadron_Beampipe_End + Q1APR_StartZ)/2." |
62 | | - length="(Hadron_Beampipe_End - Q1APR_StartZ)/cos(CrossingAngle)" theta="CrossingAngle" |
| 52 | + xcenter="(Hadron_Beampipe_End*sin(CrossingAngle)+Q1APR_StartX)/2." zcenter="(Hadron_Beampipe_End+Q1APR_StartZ)/2." |
| 53 | + length="(Hadron_Beampipe_End-Q1APR_StartZ)/cos(CrossingAngle)" theta="CrossingAngle" |
63 | 54 | rout1="Hadron_Beampipe_Rad" rout2="Hadron_Beampipe_Rad"> |
64 | 55 | </pipe> |
65 | 56 | <pipe id="1" name="Pipe_in_Q1APR" |
66 | | - xcenter="(Q1APR_StartX + Q1APR_EndX)/2." zcenter="(Q1APR_StartZ + Q1APR_EndZ)/2." |
| 57 | + xcenter="(Q1APR_StartX+Q1APR_EndX)/2." zcenter="(Q1APR_StartZ+Q1APR_EndZ)/2." |
67 | 58 | length="Q1APR_Length" theta="Q1APR_Theta" |
68 | 59 | rout1="Q1APR_InnerRadius" rout2="Q1APR_InnerRadius"> |
69 | 60 | </pipe> |
70 | 61 | <pipe id="2" name="Pipe_Q1APR_to_Q1BPR"/> |
71 | 62 | <pipe id="3" name="Pipe_in_Q1BPR" |
72 | | - xcenter="(Q1BPR_StartX + Q1BPR_EndX)/2." zcenter="(Q1BPR_StartZ + Q1BPR_EndZ)/2." |
| 63 | + xcenter="(Q1BPR_StartX+Q1BPR_EndX)/2." zcenter="(Q1BPR_StartZ+Q1BPR_EndZ)/2." |
73 | 64 | length="Q1BPR_Length" theta="Q1BPR_Theta" |
74 | 65 | rout1="Q1BPR_InnerRadius" rout2="Q1BPR_InnerRadius"> |
75 | 66 | </pipe> |
76 | 67 | <pipe id="4" name="Pipe_Q1BPR_to_Q2PR"/> |
77 | 68 | <pipe id="5" name="Pipe_in_Q2PR" |
78 | | - xcenter="(Q2PR_StartX + Q2PR_EndX)/2." zcenter="(Q2PR_StartZ + Q2PR_EndZ)/2." |
| 69 | + xcenter="(Q2PR_StartX+Q2PR_EndX)/2." zcenter="(Q2PR_StartZ+Q2PR_EndZ)/2." |
79 | 70 | length="Q2PR_Length" theta="Q2PR_Theta" |
80 | 71 | rout1="Q2PR_InnerRadius" rout2="Q2PR_InnerRadius"> |
81 | 72 | </pipe> |
|
0 commit comments