From 1cb6ec319c96a76b1a2acbe62ff372ed0d8b12b9 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 18 Aug 2022 13:16:04 +0200 Subject: [PATCH 1/5] Start with CLIC_o3_v15 --- .../compact/CLIC_o3_v15/BeamCal_o1_v01_01.xml | 97 ++++ .../BeamInstrumentation_o1_v01_01.xml | 27 ++ .../CLIC_o3_v15/Beampipe_o1_v01_02.xml | 40 ++ CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml | 319 +++++++++++++ .../CLIC_o3_v15/ECalBarrel_o2_v01_02.xml | 61 +++ .../CLIC_o3_v15/ECalEndcap_o2_v01_02.xml | 57 +++ .../CLIC_o3_v15/ECalPlug_o1_v01_02.xml | 46 ++ .../CLIC_o3_v15/HCalBarrel_o1_v01_01.xml | 57 +++ .../CLIC_o3_v15/HCalEndcap_o1_v01_01.xml | 130 ++++++ .../InnerTrackerBarrelModuleDown.xml | 25 + .../InnerTrackerBarrelModuleUp.xml | 25 + .../CLIC_o3_v15/InnerTracker_o2_v06_01.xml | 433 ++++++++++++++++++ .../compact/CLIC_o3_v15/LumiCal_o1_v01_01.xml | 61 +++ .../OuterTrackerBarrelModuleDown.xml | 27 ++ .../OuterTrackerBarrelModuleUp.xml | 27 ++ .../CLIC_o3_v15/OuterTracker_o2_v06_01.xml | 210 +++++++++ .../CLIC_o3_v15/Solenoid_o1_v01_01.xml | 54 +++ .../CLIC_o3_v15/TrackerDiskModuleIn.xml | 27 ++ .../CLIC_o3_v15/TrackerDiskModuleOut.xml | 27 ++ CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml | 182 ++++++++ .../CLIC_o3_v15/YokeBarrel_o1_v01_01.xml | 66 +++ .../CLIC_o3_v15/YokeEndcap_o1_v01_01.xml | 67 +++ CLIC/compact/CLIC_o3_v15/elements.xml | 354 ++++++++++++++ CLIC/compact/CLIC_o3_v15/materials.xml | 211 +++++++++ 24 files changed, 2630 insertions(+) create mode 100644 CLIC/compact/CLIC_o3_v15/BeamCal_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/BeamInstrumentation_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/Beampipe_o1_v01_02.xml create mode 100644 CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml create mode 100644 CLIC/compact/CLIC_o3_v15/ECalBarrel_o2_v01_02.xml create mode 100644 CLIC/compact/CLIC_o3_v15/ECalEndcap_o2_v01_02.xml create mode 100644 CLIC/compact/CLIC_o3_v15/ECalPlug_o1_v01_02.xml create mode 100644 CLIC/compact/CLIC_o3_v15/HCalBarrel_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/HCalEndcap_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleDown.xml create mode 100644 CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleUp.xml create mode 100644 CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/LumiCal_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleDown.xml create mode 100644 CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleUp.xml create mode 100644 CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/Solenoid_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/TrackerDiskModuleIn.xml create mode 100644 CLIC/compact/CLIC_o3_v15/TrackerDiskModuleOut.xml create mode 100644 CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/YokeBarrel_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/YokeEndcap_o1_v01_01.xml create mode 100644 CLIC/compact/CLIC_o3_v15/elements.xml create mode 100644 CLIC/compact/CLIC_o3_v15/materials.xml diff --git a/CLIC/compact/CLIC_o3_v15/BeamCal_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/BeamCal_o1_v01_01.xml new file mode 100644 index 000000000..d58a3f657 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/BeamCal_o1_v01_01.xml @@ -0,0 +1,97 @@ + + + + + + + + + + system:8,barrel:3,layer:8,slice:5,r:32:16,phi:16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/BeamInstrumentation_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/BeamInstrumentation_o1_v01_01.xml new file mode 100644 index 000000000..27b3fbf0e --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/BeamInstrumentation_o1_v01_01.xml @@ -0,0 +1,27 @@ + + + + Beampipe Instrumentation + + + + + + + +
+ + + + + + + + + +
+ + + + + diff --git a/CLIC/compact/CLIC_o3_v15/Beampipe_o1_v01_02.xml b/CLIC/compact/CLIC_o3_v15/Beampipe_o1_v01_02.xml new file mode 100644 index 000000000..d25be44d5 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/Beampipe_o1_v01_02.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + Beampipe + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + diff --git a/CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml b/CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml new file mode 100644 index 000000000..2b4f25ee0 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml @@ -0,0 +1,319 @@ + + + The compact format for the CLIC Detector design + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + suggested naming convention: + + main parameters: + + DET_inner_radius : inner radius of tube like envelope ( inscribed cylinder ) + DET_outer_radius : outer radius of tube like envelope ( circumscribed cylinder ) + DET_half_length : half length along z axis + DET_min_z : smallest absolute value on z-axis + DET_max_z : largest absolute value on z-axis + DET_inner_symmetry : number of sides on the inside ( 0 for tube ) + DET_outer_symmetry : number of sides on the inside ( 0 for tube ) + DET_inner_phi0 : optional rotation of the inner polygon ( in r-phi plane ) + DET_outer_phi0 : optional rotation of the outer polygon ( in r-phi plane ) + + additional parameters for cutting away volumes/shapes use one of the above with a number + appended and/or an extra specifiaction such as cone ( for a cut away cone ) + + DET_inner_radius_1 + DET_outer_radius_2 + DET_cone_min_z + DET_cone_max_z + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/ECalBarrel_o2_v01_02.xml b/CLIC/compact/CLIC_o3_v15/ECalBarrel_o2_v01_02.xml new file mode 100644 index 000000000..dbab06230 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/ECalBarrel_o2_v01_02.xml @@ -0,0 +1,61 @@ + + + + + + ${GlobalCalorimeterReadoutID} + + + + + + + + + + + + + + + + + + EM Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/ECalEndcap_o2_v01_02.xml b/CLIC/compact/CLIC_o3_v15/ECalEndcap_o2_v01_02.xml new file mode 100644 index 000000000..a6fae0228 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/ECalEndcap_o2_v01_02.xml @@ -0,0 +1,57 @@ + + + + + + + + + ${GlobalCalorimeterReadoutID} + + + + + + + + + Electromagnetic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/ECalPlug_o1_v01_02.xml b/CLIC/compact/CLIC_o3_v15/ECalPlug_o1_v01_02.xml new file mode 100644 index 000000000..f4bf18a95 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/ECalPlug_o1_v01_02.xml @@ -0,0 +1,46 @@ + + + + + + + + + ${GlobalCalorimeterReadoutID} + + + + + + + + + Hadronic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/HCalBarrel_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/HCalBarrel_o1_v01_01.xml new file mode 100644 index 000000000..453de0045 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/HCalBarrel_o1_v01_01.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalCalorimeterReadoutID} + + + + + + + Hadron Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/HCalEndcap_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/HCalEndcap_o1_v01_01.xml new file mode 100644 index 000000000..384cd444f --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/HCalEndcap_o1_v01_01.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HCalEndcap Assembly + + + + + + + + + + + + + ${GlobalCalorimeterReadoutID} + + + + ${GlobalCalorimeterReadoutID} + + + + + + + + + Hadronic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hadronic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleDown.xml b/CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..12d5d7485 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleDown.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleUp.xml b/CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..a81418293 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/InnerTrackerBarrelModuleUp.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_01.xml b/CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_01.xml new file mode 100644 index 000000000..3ac1eb0b4 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_01.xml @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tracking detectors + + + + + + + + + + + + + + + + + + + + + + + + + Inner Tracker Assembly + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + Silicon Inner Tracker Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + Silicon Inner Tracker Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.5959*cm = X0 for Carbon fibre + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + +
+
+ + + + + + + + + + + The next section is the cable for the vertex + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/LumiCal_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/LumiCal_o1_v01_01.xml new file mode 100644 index 000000000..45ea8a6fe --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/LumiCal_o1_v01_01.xml @@ -0,0 +1,61 @@ + + + + + + system:8,barrel:3,layer:8,slice:8,r:32:-16,phi:-16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleDown.xml b/CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleDown.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleUp.xml b/CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/OuterTrackerBarrelModuleUp.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_01.xml b/CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_01.xml new file mode 100644 index 000000000..859ba3422 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_01.xml @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + Tracking detectors + + + + + Outer Tracker Assembly + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + Silicon Outer Tracker Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Silicon Outer Tracker Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/Solenoid_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/Solenoid_o1_v01_01.xml new file mode 100644 index 000000000..73fa5c158 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/Solenoid_o1_v01_01.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + Solenoid + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/TrackerDiskModuleIn.xml b/CLIC/compact/CLIC_o3_v15/TrackerDiskModuleIn.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/TrackerDiskModuleIn.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CLIC/compact/CLIC_o3_v15/TrackerDiskModuleOut.xml b/CLIC/compact/CLIC_o3_v15/TrackerDiskModuleOut.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/TrackerDiskModuleOut.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml b/CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml new file mode 100644 index 000000000..79156ac12 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml @@ -0,0 +1,182 @@ + + + Tracking detectors + + + + Outer Tracker Assembly + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vertex Detector Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/YokeBarrel_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/YokeBarrel_o1_v01_01.xml new file mode 100644 index 000000000..cce25bc5d --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/YokeBarrel_o1_v01_01.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + ${GlobalCalorimeterReadoutID} + + + + + + + + Yoke Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/YokeEndcap_o1_v01_01.xml b/CLIC/compact/CLIC_o3_v15/YokeEndcap_o1_v01_01.xml new file mode 100644 index 000000000..cb398097c --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/YokeEndcap_o1_v01_01.xml @@ -0,0 +1,67 @@ + + + + + + + ${GlobalCalorimeterReadoutID} + + + + + + + + + + + + + + Encap Yoke + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/elements.xml b/CLIC/compact/CLIC_o3_v15/elements.xml new file mode 100644 index 000000000..a5f2a20df --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/elements.xml @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CLIC/compact/CLIC_o3_v15/materials.xml b/CLIC/compact/CLIC_o3_v15/materials.xml new file mode 100644 index 000000000..29a0fb668 --- /dev/null +++ b/CLIC/compact/CLIC_o3_v15/materials.xml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 816be47cf44a6b16df1f3325ef03aed5ec12c607 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 18 Aug 2022 13:23:08 +0200 Subject: [PATCH 2/5] CLIC_o3_v15: move to new TrackerEndcapSupport with fixed material --- .../CLIC_o3_v15/{CLIC_o3_v14.xml => CLIC_o3_v15.xml} | 12 ++++++------ ...cker_o2_v06_01.xml => InnerTracker_o2_v06_02.xml} | 4 ++-- ...cker_o2_v06_01.xml => OuterTracker_o2_v06_02.xml} | 2 +- .../{Vertex_o2_v06_01.xml => Vertex_o2_v06_02.xml} | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename CLIC/compact/CLIC_o3_v15/{CLIC_o3_v14.xml => CLIC_o3_v15.xml} (98%) rename CLIC/compact/CLIC_o3_v15/{InnerTracker_o2_v06_01.xml => InnerTracker_o2_v06_02.xml} (99%) rename CLIC/compact/CLIC_o3_v15/{OuterTracker_o2_v06_01.xml => OuterTracker_o2_v06_02.xml} (99%) rename CLIC/compact/CLIC_o3_v15/{Vertex_o2_v06_01.xml => Vertex_o2_v06_02.xml} (99%) diff --git a/CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml b/CLIC/compact/CLIC_o3_v15/CLIC_o3_v15.xml similarity index 98% rename from CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml rename to CLIC/compact/CLIC_o3_v15/CLIC_o3_v15.xml index 2b4f25ee0..adf10ac5c 100644 --- a/CLIC/compact/CLIC_o3_v15/CLIC_o3_v14.xml +++ b/CLIC/compact/CLIC_o3_v15/CLIC_o3_v15.xml @@ -1,7 +1,7 @@ - @@ -225,10 +225,10 @@ - + - - + + diff --git a/CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_01.xml b/CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_02.xml similarity index 99% rename from CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_01.xml rename to CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_02.xml index 3ac1eb0b4..105f43720 100644 --- a/CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_01.xml +++ b/CLIC/compact/CLIC_o3_v15/InnerTracker_o2_v06_02.xml @@ -325,7 +325,7 @@ - + @@ -388,7 +388,7 @@ - + diff --git a/CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_01.xml b/CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_02.xml similarity index 99% rename from CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_01.xml rename to CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_02.xml index 859ba3422..662524367 100644 --- a/CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_01.xml +++ b/CLIC/compact/CLIC_o3_v15/OuterTracker_o2_v06_02.xml @@ -164,7 +164,7 @@ - + diff --git a/CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml b/CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_02.xml similarity index 99% rename from CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml rename to CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_02.xml index 79156ac12..9b6a3b591 100644 --- a/CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_01.xml +++ b/CLIC/compact/CLIC_o3_v15/Vertex_o2_v06_02.xml @@ -155,7 +155,7 @@ - + From aaa078e78a4ff61e327d00e20ddfa25249761dd5 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 13 Oct 2022 14:20:01 +0200 Subject: [PATCH 3/5] FCCee: start with new versions for fixed TrackerEndcapSupport --- .../BeamInstrumentation_o3_v01_overlap.xml | 26 + .../BeamInstrumentation_o3_v02_fitShield.xml | 26 + .../Beampipe_o4_v04_noNotch_W_n02.xml | 140 +++ .../FCCee_o1_v05/ECalBarrel_o2_v01_03.xml | 66 ++ .../FCCee_o1_v05/ECalEndcap_o2_v01_03.xml | 57 ++ FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml | 424 +++++++++ .../FCCee_o1_v05/HCalBarrel_o1_v01_01.xml | 58 ++ .../FCCee_o1_v05/HCalEndcap_o1_v01_01.xml | 131 +++ .../compact/FCCee_o1_v05/HOMAbsorber_v00.xml | 53 ++ .../InnerTrackerBarrelModuleDown.xml | 25 + .../InnerTrackerBarrelModuleUp.xml | 25 + .../FCCee_o1_v05/InnerTracker_o2_v06_02.xml | 596 ++++++++++++ .../FCCee_o1_v05/LumiCal_o3_v02_03.xml | 180 ++++ .../OuterTrackerBarrelModuleDown.xml | 27 + .../OuterTrackerBarrelModuleUp.xml | 27 + .../FCCee_o1_v05/OuterTracker_o2_v06_02.xml | 226 +++++ .../FCCee_o1_v05/Solenoid_o1_v01_02.xml | 54 ++ .../FCCee_o1_v05/TrackerDiskModuleIn.xml | 27 + .../FCCee_o1_v05/TrackerDiskModuleOut.xml | 27 + FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml | 223 +++++ .../FCCee_o1_v05/YokeBarrel_o1_v01_02.xml | 68 ++ .../FCCee_o1_v05/YokeEndcap_o1_v01_02.xml | 67 ++ FCCee/compact/FCCee_o1_v05/elements.xml | 884 ++++++++++++++++++ FCCee/compact/FCCee_o1_v05/materials.xml | 218 +++++ .../BeamInstrumentation_o3_v02_fitShield.xml | 26 + .../Beampipe_o4_v04_noNotch_W_n02_smallBP.xml | 140 +++ .../FCCee_o2_v02/ECalBarrel_o2_v01_03.xml | 66 ++ .../FCCee_o2_v02/ECalEndcap_o2_v01_03.xml | 57 ++ FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml | 425 +++++++++ .../FCCee_o2_v02/HCalBarrel_o1_v01_01.xml | 58 ++ .../FCCee_o2_v02/HCalEndcap_o1_v01_01.xml | 131 +++ .../compact/FCCee_o2_v02/HOMAbsorber_v00.xml | 53 ++ .../InnerTrackerBarrelModuleDown.xml | 25 + .../InnerTrackerBarrelModuleUp.xml | 25 + .../FCCee_o2_v02/InnerTracker_o2_v06_02.xml | 596 ++++++++++++ .../FCCee_o2_v02/LumiCal_o3_v02_03.xml | 180 ++++ .../OuterTrackerBarrelModuleDown.xml | 27 + .../OuterTrackerBarrelModuleUp.xml | 27 + .../FCCee_o2_v02/OuterTracker_o2_v06_02.xml | 226 +++++ .../FCCee_o2_v02/Solenoid_o1_v01_02.xml | 54 ++ .../FCCee_o2_v02/TrackerDiskModuleIn.xml | 27 + .../FCCee_o2_v02/TrackerDiskModuleOut.xml | 27 + .../FCCee_o2_v02/Vertex_o4_v05_smallBP.xml | 228 +++++ .../FCCee_o2_v02/YokeBarrel_o1_v01_02.xml | 68 ++ .../FCCee_o2_v02/YokeEndcap_o1_v01_02.xml | 67 ++ FCCee/compact/FCCee_o2_v02/elements.xml | 884 ++++++++++++++++++ FCCee/compact/FCCee_o2_v02/materials.xml | 218 +++++ 47 files changed, 7290 insertions(+) create mode 100644 FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v01_overlap.xml create mode 100644 FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v02_fitShield.xml create mode 100644 FCCee/compact/FCCee_o1_v05/Beampipe_o4_v04_noNotch_W_n02.xml create mode 100644 FCCee/compact/FCCee_o1_v05/ECalBarrel_o2_v01_03.xml create mode 100644 FCCee/compact/FCCee_o1_v05/ECalEndcap_o2_v01_03.xml create mode 100644 FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml create mode 100644 FCCee/compact/FCCee_o1_v05/HCalBarrel_o1_v01_01.xml create mode 100644 FCCee/compact/FCCee_o1_v05/HCalEndcap_o1_v01_01.xml create mode 100644 FCCee/compact/FCCee_o1_v05/HOMAbsorber_v00.xml create mode 100644 FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleDown.xml create mode 100644 FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleUp.xml create mode 100644 FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml create mode 100644 FCCee/compact/FCCee_o1_v05/LumiCal_o3_v02_03.xml create mode 100644 FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleDown.xml create mode 100644 FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleUp.xml create mode 100644 FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml create mode 100644 FCCee/compact/FCCee_o1_v05/Solenoid_o1_v01_02.xml create mode 100644 FCCee/compact/FCCee_o1_v05/TrackerDiskModuleIn.xml create mode 100644 FCCee/compact/FCCee_o1_v05/TrackerDiskModuleOut.xml create mode 100644 FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml create mode 100644 FCCee/compact/FCCee_o1_v05/YokeBarrel_o1_v01_02.xml create mode 100644 FCCee/compact/FCCee_o1_v05/YokeEndcap_o1_v01_02.xml create mode 100644 FCCee/compact/FCCee_o1_v05/elements.xml create mode 100644 FCCee/compact/FCCee_o1_v05/materials.xml create mode 100644 FCCee/compact/FCCee_o2_v02/BeamInstrumentation_o3_v02_fitShield.xml create mode 100644 FCCee/compact/FCCee_o2_v02/Beampipe_o4_v04_noNotch_W_n02_smallBP.xml create mode 100644 FCCee/compact/FCCee_o2_v02/ECalBarrel_o2_v01_03.xml create mode 100644 FCCee/compact/FCCee_o2_v02/ECalEndcap_o2_v01_03.xml create mode 100644 FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml create mode 100644 FCCee/compact/FCCee_o2_v02/HCalBarrel_o1_v01_01.xml create mode 100644 FCCee/compact/FCCee_o2_v02/HCalEndcap_o1_v01_01.xml create mode 100644 FCCee/compact/FCCee_o2_v02/HOMAbsorber_v00.xml create mode 100644 FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleDown.xml create mode 100644 FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleUp.xml create mode 100644 FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml create mode 100644 FCCee/compact/FCCee_o2_v02/LumiCal_o3_v02_03.xml create mode 100644 FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleDown.xml create mode 100644 FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleUp.xml create mode 100644 FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml create mode 100644 FCCee/compact/FCCee_o2_v02/Solenoid_o1_v01_02.xml create mode 100644 FCCee/compact/FCCee_o2_v02/TrackerDiskModuleIn.xml create mode 100644 FCCee/compact/FCCee_o2_v02/TrackerDiskModuleOut.xml create mode 100644 FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml create mode 100644 FCCee/compact/FCCee_o2_v02/YokeBarrel_o1_v01_02.xml create mode 100644 FCCee/compact/FCCee_o2_v02/YokeEndcap_o1_v01_02.xml create mode 100644 FCCee/compact/FCCee_o2_v02/elements.xml create mode 100644 FCCee/compact/FCCee_o2_v02/materials.xml diff --git a/FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v01_overlap.xml b/FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v01_overlap.xml new file mode 100644 index 000000000..634585fef --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v01_overlap.xml @@ -0,0 +1,26 @@ + + + + Beampipe Instrumentation + + + + + + +
+ + + + + + + + +
+ +
+ + + + diff --git a/FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v02_fitShield.xml b/FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v02_fitShield.xml new file mode 100644 index 000000000..dba09d325 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/BeamInstrumentation_o3_v02_fitShield.xml @@ -0,0 +1,26 @@ + + + + Beampipe Instrumentation + + + + + + +
+ + + + + + + + +
+ +
+ + + + diff --git a/FCCee/compact/FCCee_o1_v05/Beampipe_o4_v04_noNotch_W_n02.xml b/FCCee/compact/FCCee_o1_v05/Beampipe_o4_v04_noNotch_W_n02.xml new file mode 100644 index 000000000..781ed741f --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/Beampipe_o4_v04_noNotch_W_n02.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + Part of beampipe made of Beryllium + + + + + + + +
+ +
+ + + + + + + + + + + + + Golden foil in the inner part of the Be beampipe + +
+ +
+ + Part of beampipe made of Copper + +
+ + + + + +
+ + + +
+ + +
+ + +Full Cone Tungsten Shield + + + + Before HOM space +
+ + After HOM space (1197.5*m - 1298.7*mm) +18 cm as solenoid is now closer to IP +
+ + +Asymmetric Tungsten Shield no Rotation + + + + +
+ + was 370 +
+ + one degree less, to fit lumical window +
+ +
+ + + + + diff --git a/FCCee/compact/FCCee_o1_v05/ECalBarrel_o2_v01_03.xml b/FCCee/compact/FCCee_o1_v05/ECalBarrel_o2_v01_03.xml new file mode 100644 index 000000000..abe72e0fa --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/ECalBarrel_o2_v01_03.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + + + + + + + + + + EM Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/ECalEndcap_o2_v01_03.xml b/FCCee/compact/FCCee_o1_v05/ECalEndcap_o2_v01_03.xml new file mode 100644 index 000000000..dd84c505f --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/ECalEndcap_o2_v01_03.xml @@ -0,0 +1,57 @@ + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + Electromagnetic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml b/FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml new file mode 100644 index 000000000..2ae07bb9b --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml @@ -0,0 +1,424 @@ + + + + The compact format for the FCCee Detector design + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + suggested naming convention: + + main parameters: + + DET_inner_radius : inner radius of tube like envelope ( inscribed cylinder ) + DET_outer_radius : outer radius of tube like envelope ( circumscribed cylinder ) + DET_half_length : half length along z axis + DET_min_z : smallest absolute value on z-axis + DET_max_z : largest absolute value on z-axis + DET_inner_symmetry : number of sides on the inside ( 0 for tube ) + DET_outer_symmetry : number of sides on the inside ( 0 for tube ) + DET_inner_phi0 : optional rotation of the inner polygon ( in r-phi plane ) + DET_outer_phi0 : optional rotation of the outer polygon ( in r-phi plane ) + + additional parameters for cutting away volumes/shapes use one of the above with a number + appended and/or an extra specifiaction such as cone ( for a cut away cone ) + + DET_inner_radius_1 + DET_outer_radius_2 + DET_cone_min_z + DET_cone_max_z + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/HCalBarrel_o1_v01_01.xml b/FCCee/compact/FCCee_o1_v05/HCalBarrel_o1_v01_01.xml new file mode 100644 index 000000000..d0ade5fc2 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/HCalBarrel_o1_v01_01.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + Hadron Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/HCalEndcap_o1_v01_01.xml b/FCCee/compact/FCCee_o1_v05/HCalEndcap_o1_v01_01.xml new file mode 100644 index 000000000..ef70e41e8 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/HCalEndcap_o1_v01_01.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HCalEndcap Assembly + + + + + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + Hadronic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hadronic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/HOMAbsorber_v00.xml b/FCCee/compact/FCCee_o1_v05/HOMAbsorber_v00.xml new file mode 100644 index 000000000..f197ea21c --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/HOMAbsorber_v00.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleDown.xml b/FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..12d5d7485 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleDown.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleUp.xml b/FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..a81418293 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/InnerTrackerBarrelModuleUp.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml new file mode 100644 index 000000000..8b02935da --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml @@ -0,0 +1,596 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tracking detectors + + + + + + + + + + + + + + + + + + + + + + + + + + + Inner Tracker Assembly + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + Silicon Inner Tracker Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Silicon Inner Tracker Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.5959*cm = X0 for Carbon fibre + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + The next section is the cable for the vertex + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/LumiCal_o3_v02_03.xml b/FCCee/compact/FCCee_o1_v05/LumiCal_o3_v02_03.xml new file mode 100644 index 000000000..2ba7b4051 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/LumiCal_o3_v02_03.xml @@ -0,0 +1,180 @@ + + + + + + + + + + system:8,barrel:3,layer:8,slice:8,r:32:-16,phi:-16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleDown.xml b/FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleDown.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleUp.xml b/FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/OuterTrackerBarrelModuleUp.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml new file mode 100644 index 000000000..998e9026b --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Tracking detectors + + + + + Outer Tracker Assembly + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + Silicon Outer Tracker Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Silicon Outer Tracker Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/Solenoid_o1_v01_02.xml b/FCCee/compact/FCCee_o1_v05/Solenoid_o1_v01_02.xml new file mode 100644 index 000000000..634f3cab3 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/Solenoid_o1_v01_02.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + Solenoid + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/TrackerDiskModuleIn.xml b/FCCee/compact/FCCee_o1_v05/TrackerDiskModuleIn.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/TrackerDiskModuleIn.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o1_v05/TrackerDiskModuleOut.xml b/FCCee/compact/FCCee_o1_v05/TrackerDiskModuleOut.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/TrackerDiskModuleOut.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml b/FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml new file mode 100644 index 000000000..a52c3ac47 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml @@ -0,0 +1,223 @@ + + + + + Tracking detectors + + + + + + + + + + + + Vertex Assembly + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vertex Detector Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/YokeBarrel_o1_v01_02.xml b/FCCee/compact/FCCee_o1_v05/YokeBarrel_o1_v01_02.xml new file mode 100644 index 000000000..5d4e62d73 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/YokeBarrel_o1_v01_02.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + system:5,side:2,layer:9,module:8,stave:4,submodule:4,x:32:-16,y:-16 + + + + + + + + Yoke Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/YokeEndcap_o1_v01_02.xml b/FCCee/compact/FCCee_o1_v05/YokeEndcap_o1_v01_02.xml new file mode 100644 index 000000000..e4503843b --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/YokeEndcap_o1_v01_02.xml @@ -0,0 +1,67 @@ + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + + + + + + Encap Yoke + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o1_v05/elements.xml b/FCCee/compact/FCCee_o1_v05/elements.xml new file mode 100644 index 000000000..8358bac36 --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/elements.xml @@ -0,0 +1,884 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o1_v05/materials.xml b/FCCee/compact/FCCee_o1_v05/materials.xml new file mode 100644 index 000000000..c0a99dc3a --- /dev/null +++ b/FCCee/compact/FCCee_o1_v05/materials.xml @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/BeamInstrumentation_o3_v02_fitShield.xml b/FCCee/compact/FCCee_o2_v02/BeamInstrumentation_o3_v02_fitShield.xml new file mode 100644 index 000000000..dba09d325 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/BeamInstrumentation_o3_v02_fitShield.xml @@ -0,0 +1,26 @@ + + + + Beampipe Instrumentation + + + + + + +

+ + + + + + + + +
+ +
+ + + + diff --git a/FCCee/compact/FCCee_o2_v02/Beampipe_o4_v04_noNotch_W_n02_smallBP.xml b/FCCee/compact/FCCee_o2_v02/Beampipe_o4_v04_noNotch_W_n02_smallBP.xml new file mode 100644 index 000000000..3fc40cfcd --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/Beampipe_o4_v04_noNotch_W_n02_smallBP.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + Part of beampipe made of Beryllium + + + + + + + +
+ +
+ + + + + + + + + + + + + Golden foil in the inner part of the Be beampipe + +
+ +
+ + Part of beampipe made of Copper + +
+ + + + + +
+ + + +
+ + +
+ + +Full Cone Tungsten Shield + + + + Before HOM space +
+ + After HOM space (1197.5*m - 1298.7*mm) +18 cm as solenoid is now closer to IP +
+ + +Asymmetric Tungsten Shield no Rotation + + + + +
+ + was 370 +
+ + one degree less, to fit lumical window +
+ +
+ + + + + diff --git a/FCCee/compact/FCCee_o2_v02/ECalBarrel_o2_v01_03.xml b/FCCee/compact/FCCee_o2_v02/ECalBarrel_o2_v01_03.xml new file mode 100644 index 000000000..abe72e0fa --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/ECalBarrel_o2_v01_03.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + + + + + + + + + + EM Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/ECalEndcap_o2_v01_03.xml b/FCCee/compact/FCCee_o2_v02/ECalEndcap_o2_v01_03.xml new file mode 100644 index 000000000..dd84c505f --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/ECalEndcap_o2_v01_03.xml @@ -0,0 +1,57 @@ + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + Electromagnetic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml b/FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml new file mode 100644 index 000000000..ab746dbae --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml @@ -0,0 +1,425 @@ + + + + The compact format for the FCCee Detector design + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + suggested naming convention: + + main parameters: + + DET_inner_radius : inner radius of tube like envelope ( inscribed cylinder ) + DET_outer_radius : outer radius of tube like envelope ( circumscribed cylinder ) + DET_half_length : half length along z axis + DET_min_z : smallest absolute value on z-axis + DET_max_z : largest absolute value on z-axis + DET_inner_symmetry : number of sides on the inside ( 0 for tube ) + DET_outer_symmetry : number of sides on the inside ( 0 for tube ) + DET_inner_phi0 : optional rotation of the inner polygon ( in r-phi plane ) + DET_outer_phi0 : optional rotation of the outer polygon ( in r-phi plane ) + + additional parameters for cutting away volumes/shapes use one of the above with a number + appended and/or an extra specifiaction such as cone ( for a cut away cone ) + + DET_inner_radius_1 + DET_outer_radius_2 + DET_cone_min_z + DET_cone_max_z + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/HCalBarrel_o1_v01_01.xml b/FCCee/compact/FCCee_o2_v02/HCalBarrel_o1_v01_01.xml new file mode 100644 index 000000000..d0ade5fc2 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/HCalBarrel_o1_v01_01.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + Hadron Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/HCalEndcap_o1_v01_01.xml b/FCCee/compact/FCCee_o2_v02/HCalEndcap_o1_v01_01.xml new file mode 100644 index 000000000..ef70e41e8 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/HCalEndcap_o1_v01_01.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HCalEndcap Assembly + + + + + + + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + Hadronic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hadronic Calorimeter Endcap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/HOMAbsorber_v00.xml b/FCCee/compact/FCCee_o2_v02/HOMAbsorber_v00.xml new file mode 100644 index 000000000..f197ea21c --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/HOMAbsorber_v00.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleDown.xml b/FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..12d5d7485 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleDown.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleUp.xml b/FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..a81418293 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/InnerTrackerBarrelModuleUp.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml new file mode 100644 index 000000000..8b02935da --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml @@ -0,0 +1,596 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tracking detectors + + + + + + + + + + + + + + + + + + + + + + + + + + + Inner Tracker Assembly + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + Silicon Inner Tracker Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Silicon Inner Tracker Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.5959*cm = X0 for Carbon fibre + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + The next section is the cable for the vertex + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/LumiCal_o3_v02_03.xml b/FCCee/compact/FCCee_o2_v02/LumiCal_o3_v02_03.xml new file mode 100644 index 000000000..2ba7b4051 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/LumiCal_o3_v02_03.xml @@ -0,0 +1,180 @@ + + + + + + + + + + system:8,barrel:3,layer:8,slice:8,r:32:-16,phi:-16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleDown.xml b/FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleDown.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleUp.xml b/FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/OuterTrackerBarrelModuleUp.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml new file mode 100644 index 000000000..998e9026b --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Tracking detectors + + + + + Outer Tracker Assembly + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + Silicon Outer Tracker Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Silicon Outer Tracker Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/Solenoid_o1_v01_02.xml b/FCCee/compact/FCCee_o2_v02/Solenoid_o1_v01_02.xml new file mode 100644 index 000000000..634f3cab3 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/Solenoid_o1_v01_02.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + Solenoid + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/TrackerDiskModuleIn.xml b/FCCee/compact/FCCee_o2_v02/TrackerDiskModuleIn.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/TrackerDiskModuleIn.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o2_v02/TrackerDiskModuleOut.xml b/FCCee/compact/FCCee_o2_v02/TrackerDiskModuleOut.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/TrackerDiskModuleOut.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml b/FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml new file mode 100644 index 000000000..a8fcafbb8 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml @@ -0,0 +1,228 @@ + + + + + Tracking detectors + + + + + + + + + + + + Vertex Assembly + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vertex Detector Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/YokeBarrel_o1_v01_02.xml b/FCCee/compact/FCCee_o2_v02/YokeBarrel_o1_v01_02.xml new file mode 100644 index 000000000..5d4e62d73 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/YokeBarrel_o1_v01_02.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + system:5,side:2,layer:9,module:8,stave:4,submodule:4,x:32:-16,y:-16 + + + + + + + + Yoke Calorimeter Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/YokeEndcap_o1_v01_02.xml b/FCCee/compact/FCCee_o2_v02/YokeEndcap_o1_v01_02.xml new file mode 100644 index 000000000..e4503843b --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/YokeEndcap_o1_v01_02.xml @@ -0,0 +1,67 @@ + + + + + + + system:5,side:2,module:8,stave:4,layer:9,submodule:4,x:32:-16,y:-16 + + + + + + + + + + + + + + Encap Yoke + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/compact/FCCee_o2_v02/elements.xml b/FCCee/compact/FCCee_o2_v02/elements.xml new file mode 100644 index 000000000..8358bac36 --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/elements.xml @@ -0,0 +1,884 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/compact/FCCee_o2_v02/materials.xml b/FCCee/compact/FCCee_o2_v02/materials.xml new file mode 100644 index 000000000..c0a99dc3a --- /dev/null +++ b/FCCee/compact/FCCee_o2_v02/materials.xml @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + From 15e3e0d449eacdcc85f9eda45d7b82753ff70568 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 13 Oct 2022 14:30:44 +0200 Subject: [PATCH 4/5] FCCee: use fixed TrackerEndcapSupport --- FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml | 8 ++++---- FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml | 4 ++-- FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml | 2 +- FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml | 2 +- FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml | 8 ++++---- FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml | 4 ++-- FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml | 2 +- FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml b/FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml index 2ae07bb9b..4c8ae9c8d 100644 --- a/FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml +++ b/FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml @@ -2,12 +2,12 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> - + version="5"> The compact format for the FCCee Detector design diff --git a/FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml index 8b02935da..fd108c3a1 100644 --- a/FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml +++ b/FCCee/compact/FCCee_o1_v05/InnerTracker_o2_v06_02.xml @@ -489,7 +489,7 @@ - + @@ -550,7 +550,7 @@ - + diff --git a/FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml index 998e9026b..272511dff 100644 --- a/FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml +++ b/FCCee/compact/FCCee_o1_v05/OuterTracker_o2_v06_02.xml @@ -179,7 +179,7 @@ - + diff --git a/FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml b/FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml index a52c3ac47..7a675335e 100644 --- a/FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml +++ b/FCCee/compact/FCCee_o1_v05/Vertex_o4_v05.xml @@ -194,7 +194,7 @@ - + diff --git a/FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml b/FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml index ab746dbae..149e50f3c 100644 --- a/FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml +++ b/FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml @@ -2,12 +2,12 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> - + version="2"> The compact format for the FCCee Detector design diff --git a/FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml index 8b02935da..fd108c3a1 100644 --- a/FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml +++ b/FCCee/compact/FCCee_o2_v02/InnerTracker_o2_v06_02.xml @@ -489,7 +489,7 @@ - + @@ -550,7 +550,7 @@ - + diff --git a/FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml b/FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml index 998e9026b..272511dff 100644 --- a/FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml +++ b/FCCee/compact/FCCee_o2_v02/OuterTracker_o2_v06_02.xml @@ -179,7 +179,7 @@ - + diff --git a/FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml b/FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml index a8fcafbb8..e343e40d0 100644 --- a/FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml +++ b/FCCee/compact/FCCee_o2_v02/Vertex_o4_v05_smallBP.xml @@ -199,7 +199,7 @@ - + From b87f771b3efbd31ec970c924e7a1399f6fda1586 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 13 Oct 2022 14:32:00 +0200 Subject: [PATCH 5/5] Tests: use new models for FCCee and CLIC --- lcgeoTests/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lcgeoTests/CMakeLists.txt b/lcgeoTests/CMakeLists.txt index 07d5e34b0..405f18f77 100644 --- a/lcgeoTests/CMakeLists.txt +++ b/lcgeoTests/CMakeLists.txt @@ -44,14 +44,14 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml --runType=batch -G -N=1 --outputFile=testCLIC_o2_v04.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) -SET( test_name "test_CLIC_o3_v14" ) +SET( test_name "test_CLIC_o3_v15" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml --runType=batch -G -N=1 --outputFile=testCLIC_o3_v14.slcio ) + ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v15/CLIC_o3_v15.xml --runType=batch -G -N=1 --outputFile=testCLIC_o3_v15.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) -SET( test_name "test_FCCee_o1_v04" ) +SET( test_name "test_FCCee_o1_v05" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o1_v04/FCCee_o1_v04.xml --runType=batch -G -N=1 --outputFile=testFCCee_o1_v04.slcio ) + ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml --runType=batch -G -N=1 --outputFile=testFCCee_o1_v05.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) SET( test_name "test_FCCee_dev" ) @@ -59,9 +59,9 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_dev/FCCee_dev.xml --runType=batch -G -N=1 --outputFile=testFCCee_dev.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) -SET( test_name "test_FCCee_o2_v01" ) +SET( test_name "test_FCCee_o2_v02" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o2_v01/FCCee_o2_v01.xml --runType=batch -G -N=1 --outputFile=testFCCee_o2_v01.slcio ) + ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml --runType=batch -G -N=1 --outputFile=testFCCee_o2_v02.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) SET( test_name "test_steeringFile" ) @@ -81,5 +81,5 @@ INSTALL( TARGETS BeamCalZtest DESTINATION bin ) ADD_TEST( t_SensThickness_Clic_o2_v4 "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" ${CMAKE_INSTALL_PREFIX}/bin/TestSensThickness ${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml 300 50 ) -ADD_TEST( t_SensThickness_CLIC_o3_v14 "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ${CMAKE_INSTALL_PREFIX}/bin/TestSensThickness ${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml 100 50 ) +ADD_TEST( t_SensThickness_CLIC_o3_v15 "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" + ${CMAKE_INSTALL_PREFIX}/bin/TestSensThickness ${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v15/CLIC_o3_v15.xml 100 50 )