Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

Commit 57178e4

Browse files
gianellegianelle
authored
Merge pull request #4 from MuonColliderSoft/3-clean-up-the-mucoll_v1-geometry
Cleaning up of v1 geometry
2 parents 132cffd + 33b22ff commit 57178e4

112 files changed

Lines changed: 12080 additions & 19 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎geometries/MuColl_v1.0.1/MuColl_v1.xml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<lccdd>
2+
3+
<!-- Loading constants and geometry configuration -->
4+
<includes>
5+
<file ref="include/elements.xml"/>
6+
<file ref="include/materials.xml"/>
7+
<file ref="config.xml"/>
8+
</includes>
9+
10+
<!-- Including subdetector definitions -->
11+
<include ref="include/Beampipe_o1_v01_02.xml"/>
12+
<include ref="include/Nozzle_10deg_v0.xml"/>
13+
14+
<include ref="include/Vertex_o2_v06_01.xml"/>
15+
16+
<include ref="include/InnerTracker_o2_v06_01.xml"/>
17+
<include ref="include/OuterTracker_o2_v06_01.xml"/>
18+
19+
<include ref="include/ECalBarrel_o2_v01_02.xml"/>
20+
<include ref="include/ECalEndcap_o2_v01_02.xml"/>
21+
22+
<include ref="include/HCalBarrel_o1_v01_01.xml"/>
23+
<include ref="include/HCalEndcap_o1_v01_01.xml"/>
24+
25+
<include ref="include/Solenoid_o1_v01_01.xml"/>
26+
27+
<include ref="include/YokeBarrel_o1_v01_01.xml"/>
28+
<include ref="include/YokeEndcap_o1_v01_01.xml"/>
29+
30+
<!-- Including plugins -->
31+
<plugins>
32+
<plugin name="DD4hepVolumeManager"/>
33+
<plugin name="InstallSurfaceManager"/>
34+
<plugin name="lcgeo_LinearSortingPolicy">
35+
36+
<argument value="/InnerTrackerEndcapSupport_layer8"/>
37+
<argument value="InnerTracker_Barrel_half_length_0"/>
38+
<argument value="InnerTracker_Barrel_radius_0 + 0.5*mm"/>
39+
<argument value="0"/>
40+
41+
<argument value="/InnerTrackerEndcapSupport_layer9"/>
42+
<argument value="InnerTracker_Barrel_half_length_0"/>
43+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
44+
<argument value="0"/>
45+
46+
<argument value="/InnerTrackerEndcapSupport"/>
47+
<argument value="InnerTracker_Barrel_half_length_0"/>
48+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
49+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
50+
51+
<argument value="/InnerTrackerEndcap/"/>
52+
<argument value="InnerTracker_Barrel_half_length_0"/>
53+
<argument value="InnerTracker_Barrel_radius_1"/>
54+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
55+
56+
<argument value="/OuterTrackerEndcap/"/>
57+
<argument value="OuterTracker_Barrel_half_length"/>
58+
<argument value="OuterTracker_Barrel_radius_1"/>
59+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
60+
61+
<argument value="/OuterTrackerEndcapSupport_layer4"/>
62+
<argument value="OuterTracker_Barrel_half_length"/>
63+
<argument value="OuterTracker_Barrel_radius_0 + 0.5*cm"/>
64+
<argument value="0.0"/>
65+
66+
<argument value="/OuterTrackerEndcapSupport_layer5"/>
67+
<argument value="OuterTracker_Barrel_half_length"/>
68+
<argument value="OuterTracker_Barrel_radius_1 + 0.5*cm"/>
69+
<argument value="0.0"/>
70+
71+
<argument value="/OuterTrackerEndcapSupport"/>
72+
<argument value="OuterTracker_Barrel_half_length"/>
73+
<argument value="OuterTracker_Barrel_radius_1 + 3*cm"/>
74+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
75+
76+
<argument value="/VertexEndcap/"/>
77+
<argument value="VertexEndcap_zmin"/>
78+
<argument value="VertexBarrel_r4 + 1*cm"/>
79+
<argument value="(VertexEndcap_rmax - VertexBarrel_r4 + 1*cm) / (VertexEndcap_zmax - VertexEndcap_zmin)"/>
80+
81+
<argument value="/VertexVerticalCable"/>
82+
<argument value="0"/>
83+
<argument value="VertexBarrel_r4 + 0.5*cm"/>
84+
<argument value="0"/>
85+
</plugin>
86+
</plugins>
87+
88+
</lccdd>
89+

‎geometries/MuColl_v1.0.1/MuColl_v1_CAL.xml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<lccdd>
2+
3+
<!-- Loading constants and geometry configuration -->
4+
<includes>
5+
<file ref="include/elements.xml"/>
6+
<file ref="include/materials.xml"/>
7+
<file ref="config.xml"/>
8+
</includes>
9+
10+
<!-- Including subdetector definitions -->
11+
<include ref="include/Beampipe_o1_v01_02.xml"/>
12+
<include ref="include/Nozzle_10deg_v0.xml"/>
13+
14+
<include ref="include/Vertex_o2_v06_01.xml"/>
15+
16+
<include ref="include/InnerTracker_o2_v06_01.xml"/>
17+
<include ref="include/OuterTracker_o2_v06_01.xml"/>
18+
19+
<include ref="include/ECalBarrel_o2_v01_02.xml"/>
20+
<include ref="include/ECalEndcap_o2_v01_02.xml"/>
21+
22+
<include ref="include/HCalBarrel_o1_v01_01.xml"/>
23+
<include ref="include/HCalEndcap_o1_v01_01.xml"/>
24+
25+
<!-- Including plugins -->
26+
<plugins>
27+
<plugin name="DD4hepVolumeManager"/>
28+
<plugin name="InstallSurfaceManager"/>
29+
<plugin name="lcgeo_LinearSortingPolicy">
30+
31+
<argument value="/InnerTrackerEndcapSupport_layer8"/>
32+
<argument value="InnerTracker_Barrel_half_length_0"/>
33+
<argument value="InnerTracker_Barrel_radius_0 + 0.5*mm"/>
34+
<argument value="0"/>
35+
36+
<argument value="/InnerTrackerEndcapSupport_layer9"/>
37+
<argument value="InnerTracker_Barrel_half_length_0"/>
38+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
39+
<argument value="0"/>
40+
41+
<argument value="/InnerTrackerEndcapSupport"/>
42+
<argument value="InnerTracker_Barrel_half_length_0"/>
43+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
44+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
45+
46+
<argument value="/InnerTrackerEndcap/"/>
47+
<argument value="InnerTracker_Barrel_half_length_0"/>
48+
<argument value="InnerTracker_Barrel_radius_1"/>
49+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
50+
51+
<argument value="/OuterTrackerEndcap/"/>
52+
<argument value="OuterTracker_Barrel_half_length"/>
53+
<argument value="OuterTracker_Barrel_radius_1"/>
54+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
55+
56+
<argument value="/OuterTrackerEndcapSupport_layer4"/>
57+
<argument value="OuterTracker_Barrel_half_length"/>
58+
<argument value="OuterTracker_Barrel_radius_0 + 0.5*cm"/>
59+
<argument value="0.0"/>
60+
61+
<argument value="/OuterTrackerEndcapSupport_layer5"/>
62+
<argument value="OuterTracker_Barrel_half_length"/>
63+
<argument value="OuterTracker_Barrel_radius_1 + 0.5*cm"/>
64+
<argument value="0.0"/>
65+
66+
<argument value="/OuterTrackerEndcapSupport"/>
67+
<argument value="OuterTracker_Barrel_half_length"/>
68+
<argument value="OuterTracker_Barrel_radius_1 + 3*cm"/>
69+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
70+
71+
<argument value="/VertexEndcap/"/>
72+
<argument value="VertexEndcap_zmin"/>
73+
<argument value="VertexBarrel_r4 + 1*cm"/>
74+
<argument value="(VertexEndcap_rmax - VertexBarrel_r4 + 1*cm) / (VertexEndcap_zmax - VertexEndcap_zmin)"/>
75+
76+
<argument value="/VertexVerticalCable"/>
77+
<argument value="0"/>
78+
<argument value="VertexBarrel_r4 + 0.5*cm"/>
79+
<argument value="0"/>
80+
</plugin>
81+
</plugins>
82+
83+
</lccdd>
84+

‎geometries/MuColl_v1.0.1/MuColl_v1_TRK.xml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<lccdd>
2+
3+
<!-- Loading constants and geometry configuration -->
4+
<includes>
5+
<file ref="include/elements.xml"/>
6+
<file ref="include/materials.xml"/>
7+
<file ref="config.xml"/>
8+
</includes>
9+
10+
<!-- Including subdetector definitions -->
11+
<include ref="include/Beampipe_o1_v01_02.xml"/>
12+
<include ref="include/Nozzle_10deg_v0.xml"/>
13+
14+
<include ref="include/Vertex_o2_v06_01.xml"/>
15+
16+
<include ref="include/InnerTracker_o2_v06_01.xml"/>
17+
<include ref="include/OuterTracker_o2_v06_01.xml"/>
18+
19+
<!-- Including plugins -->
20+
<plugins>
21+
<plugin name="DD4hepVolumeManager"/>
22+
<plugin name="InstallSurfaceManager"/>
23+
<plugin name="lcgeo_LinearSortingPolicy">
24+
25+
<argument value="/InnerTrackerEndcapSupport_layer8"/>
26+
<argument value="InnerTracker_Barrel_half_length_0"/>
27+
<argument value="InnerTracker_Barrel_radius_0 + 0.5*mm"/>
28+
<argument value="0"/>
29+
30+
<argument value="/InnerTrackerEndcapSupport_layer9"/>
31+
<argument value="InnerTracker_Barrel_half_length_0"/>
32+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
33+
<argument value="0"/>
34+
35+
<argument value="/InnerTrackerEndcapSupport"/>
36+
<argument value="InnerTracker_Barrel_half_length_0"/>
37+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
38+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
39+
40+
<argument value="/InnerTrackerEndcap/"/>
41+
<argument value="InnerTracker_Barrel_half_length_0"/>
42+
<argument value="InnerTracker_Barrel_radius_1"/>
43+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
44+
45+
<argument value="/OuterTrackerEndcap/"/>
46+
<argument value="OuterTracker_Barrel_half_length"/>
47+
<argument value="OuterTracker_Barrel_radius_1"/>
48+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
49+
50+
<argument value="/OuterTrackerEndcapSupport_layer4"/>
51+
<argument value="OuterTracker_Barrel_half_length"/>
52+
<argument value="OuterTracker_Barrel_radius_0 + 0.5*cm"/>
53+
<argument value="0.0"/>
54+
55+
<argument value="/OuterTrackerEndcapSupport_layer5"/>
56+
<argument value="OuterTracker_Barrel_half_length"/>
57+
<argument value="OuterTracker_Barrel_radius_1 + 0.5*cm"/>
58+
<argument value="0.0"/>
59+
60+
<argument value="/OuterTrackerEndcapSupport"/>
61+
<argument value="OuterTracker_Barrel_half_length"/>
62+
<argument value="OuterTracker_Barrel_radius_1 + 3*cm"/>
63+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
64+
65+
<argument value="/VertexEndcap/"/>
66+
<argument value="VertexEndcap_zmin"/>
67+
<argument value="VertexBarrel_r4 + 1*cm"/>
68+
<argument value="(VertexEndcap_rmax - VertexBarrel_r4 + 1*cm) / (VertexEndcap_zmax - VertexEndcap_zmin)"/>
69+
70+
<argument value="/VertexVerticalCable"/>
71+
<argument value="0"/>
72+
<argument value="VertexBarrel_r4 + 0.5*cm"/>
73+
<argument value="0"/>
74+
</plugin>
75+
</plugins>
76+
77+
</lccdd>
78+

‎geometries/MuColl_v1.0.1/MuColl_v1_VTX.xml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<lccdd>
2+
3+
<!-- Loading constants and geometry configuration -->
4+
<includes>
5+
<file ref="include/elements.xml"/>
6+
<file ref="include/materials.xml"/>
7+
<file ref="config.xml"/>
8+
</includes>
9+
10+
<!-- Including subdetector definitions -->
11+
<include ref="include/Beampipe_o1_v01_02.xml"/>
12+
<include ref="include/Nozzle_10deg_v0.xml"/>
13+
14+
<include ref="include/Vertex_o2_v06_01.xml"/>
15+
16+
<!-- Including plugins -->
17+
<plugins>
18+
<plugin name="DD4hepVolumeManager"/>
19+
<plugin name="InstallSurfaceManager"/>
20+
<plugin name="lcgeo_LinearSortingPolicy">
21+
22+
<argument value="/InnerTrackerEndcapSupport_layer8"/>
23+
<argument value="InnerTracker_Barrel_half_length_0"/>
24+
<argument value="InnerTracker_Barrel_radius_0 + 0.5*mm"/>
25+
<argument value="0"/>
26+
27+
<argument value="/InnerTrackerEndcapSupport_layer9"/>
28+
<argument value="InnerTracker_Barrel_half_length_0"/>
29+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
30+
<argument value="0"/>
31+
32+
<argument value="/InnerTrackerEndcapSupport"/>
33+
<argument value="InnerTracker_Barrel_half_length_0"/>
34+
<argument value="InnerTracker_Barrel_radius_1 + 0.5*mm"/>
35+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
36+
37+
<argument value="/InnerTrackerEndcap/"/>
38+
<argument value="InnerTracker_Barrel_half_length_0"/>
39+
<argument value="InnerTracker_Barrel_radius_1"/>
40+
<argument value="(InnerTracker_outer_radius - InnerTracker_Barrel_radius_1) / (InnerTracker_half_length - InnerTracker_Barrel_half_length_0)"/>
41+
42+
<argument value="/OuterTrackerEndcap/"/>
43+
<argument value="OuterTracker_Barrel_half_length"/>
44+
<argument value="OuterTracker_Barrel_radius_1"/>
45+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
46+
47+
<argument value="/OuterTrackerEndcapSupport_layer4"/>
48+
<argument value="OuterTracker_Barrel_half_length"/>
49+
<argument value="OuterTracker_Barrel_radius_0 + 0.5*cm"/>
50+
<argument value="0.0"/>
51+
52+
<argument value="/OuterTrackerEndcapSupport_layer5"/>
53+
<argument value="OuterTracker_Barrel_half_length"/>
54+
<argument value="OuterTracker_Barrel_radius_1 + 0.5*cm"/>
55+
<argument value="0.0"/>
56+
57+
<argument value="/OuterTrackerEndcapSupport"/>
58+
<argument value="OuterTracker_Barrel_half_length"/>
59+
<argument value="OuterTracker_Barrel_radius_1 + 3*cm"/>
60+
<argument value="(OuterTracker_Endcap_radius_2 - OuterTracker_Barrel_radius_1) / (OuterTracker_half_length - OuterTracker_Barrel_half_length)"/>
61+
62+
<argument value="/VertexEndcap/"/>
63+
<argument value="VertexEndcap_zmin"/>
64+
<argument value="VertexBarrel_r4 + 1*cm"/>
65+
<argument value="(VertexEndcap_rmax - VertexBarrel_r4 + 1*cm) / (VertexEndcap_zmax - VertexEndcap_zmin)"/>
66+
67+
<argument value="/VertexVerticalCable"/>
68+
<argument value="0"/>
69+
<argument value="VertexBarrel_r4 + 0.5*cm"/>
70+
<argument value="0"/>
71+
</plugin>
72+
</plugins>
73+
74+
</lccdd>
75+

‎geometries/MuColl_v1.0.1/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Cleaned-up version of `MuColl_v1`:
2+
- removed unused subdetectors and constants
3+
- added reduced geometries for faster subdetector studies
4+
5+
Resolved 82 overlaps in the geometry:
6+
- removed overlap margin in VTX Endcap Si sensors (was introduced by CLIC for tilted sensors)
7+
- reduced radius of the 1st section of `BeampipeShell` support, away from IT Si sensors
8+
9+
Layout of sensitive surfaces should remain exactly as in `MuColl_v1`

0 commit comments

Comments
 (0)