From 94fcf1c59bce63603c30900119fa241857f4a673 Mon Sep 17 00:00:00 2001 From: BrieucF Date: Thu, 29 Feb 2024 17:25:15 +0100 Subject: [PATCH 1/7] README: Correct description for CLD_o2_v06 --- FCCee/CLD/compact/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/FCCee/CLD/compact/README.md b/FCCee/CLD/compact/README.md index 7dfa17656..0db117277 100644 --- a/FCCee/CLD/compact/README.md +++ b/FCCee/CLD/compact/README.md @@ -33,6 +33,10 @@ This model is based on `FCCee_o2_v02` from k4geo. It has an updated design of th standard design (low-impedance, no HOM absorber); changed Vertex Detector Barrel layers to fit the beampipe contraints (reduced barrel length); fixed Overlaps in the Inner and Outer Tracker. +CLD_o2_v06 +---------- + +This model is based on `CLD_o2_v05` with the following changes: LumiCal outer radius from 112 mm to 115 mm, define its z extent in the beampipe reference frame. CLD_o3_v01 ---------- From af8a868a60eee4af89776a6b5f54c30aa0cab263 Mon Sep 17 00:00:00 2001 From: BrieucF Date: Thu, 29 Feb 2024 17:16:28 +0100 Subject: [PATCH 2/7] CLD_o2_v06: Start with new detector model --- .../BeamInstrumentation_o3_v02_fitShield.xml | 26 + .../compact/CLD_o2_v06/Beampipe_o4_v05.xml | 158 ++++ FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml | 437 +++++++++ .../CLD_o2_v06/ECalBarrel_o2_v01_03.xml | 66 ++ .../CLD_o2_v06/ECalEndcap_o2_v01_03.xml | 57 ++ .../CLD_o2_v06/HCalBarrel_o1_v01_01.xml | 58 ++ .../CLD_o2_v06/HCalEndcap_o1_v01_01.xml | 131 +++ .../InnerTrackerBarrelModuleDown.xml | 25 + .../CLD_o2_v06/InnerTrackerBarrelModuleUp.xml | 25 + .../CLD_o2_v06/InnerTracker_o2_v07.xml | 582 ++++++++++++ .../compact/CLD_o2_v06/LumiCal_o3_v02_04.xml | 180 ++++ .../OuterTrackerBarrelModuleDown.xml | 27 + .../CLD_o2_v06/OuterTrackerBarrelModuleUp.xml | 27 + .../CLD_o2_v06/OuterTracker_o2_v07.xml | 226 +++++ .../compact/CLD_o2_v06/Solenoid_o1_v01_02.xml | 54 ++ .../CLD_o2_v06/TrackerDiskModuleIn.xml | 27 + .../CLD_o2_v06/TrackerDiskModuleOut.xml | 27 + .../CLD_o2_v06/Vertex_o4_v07_smallBP.xml | 225 +++++ .../CLD_o2_v06/YokeBarrel_o1_v01_02.xml | 68 ++ .../CLD_o2_v06/YokeEndcap_o1_v01_02.xml | 67 ++ FCCee/CLD/compact/CLD_o2_v06/elements.xml | 884 ++++++++++++++++++ FCCee/CLD/compact/CLD_o2_v06/materials.xml | 230 +++++ FCCee/CLD/compact/README.md | 2 +- 23 files changed, 3608 insertions(+), 1 deletion(-) create mode 100644 FCCee/CLD/compact/CLD_o2_v06/BeamInstrumentation_o3_v02_fitShield.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/Beampipe_o4_v05.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/ECalBarrel_o2_v01_03.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/ECalEndcap_o2_v01_03.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/HCalBarrel_o1_v01_01.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/HCalEndcap_o1_v01_01.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleDown.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleUp.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/InnerTracker_o2_v07.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleDown.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleUp.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/OuterTracker_o2_v07.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/Solenoid_o1_v01_02.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleIn.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleOut.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/Vertex_o4_v07_smallBP.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/YokeBarrel_o1_v01_02.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/YokeEndcap_o1_v01_02.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/elements.xml create mode 100644 FCCee/CLD/compact/CLD_o2_v06/materials.xml diff --git a/FCCee/CLD/compact/CLD_o2_v06/BeamInstrumentation_o3_v02_fitShield.xml b/FCCee/CLD/compact/CLD_o2_v06/BeamInstrumentation_o3_v02_fitShield.xml new file mode 100644 index 000000000..dba09d325 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/BeamInstrumentation_o3_v02_fitShield.xml @@ -0,0 +1,26 @@ + + + + Beampipe Instrumentation + + + + + + +
+ + + + + + + + +
+ +
+ + + + diff --git a/FCCee/CLD/compact/CLD_o2_v06/Beampipe_o4_v05.xml b/FCCee/CLD/compact/CLD_o2_v06/Beampipe_o4_v05.xml new file mode 100644 index 000000000..5610b7225 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/Beampipe_o4_v05.xml @@ -0,0 +1,158 @@ + + + + A beampipe for FCCee detector based on CLD + + + + + + + + + + + + + + + + + + + + + Part of beampipe made of AlBeMet162 and Paraffin flow + + + + + + + +
+
+
+
+ + + + + + + + + + + + Golden foil in the inner part of the Be beampipe + +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+ + + + + +Synch Radiation mask inside the beam-pipe, at z = 2.1 m + + + +
+ +
+ +
+ + + +Full Cone Tungsten Shield + + + + Beampipe Shield (APS: WHAT????? +18 cm (??plus??) as solenoid is now closer to IP) +
+ + + + +Asymmetric Tungsten Shield no Rotation + + + + +
+ + was 370. Add 0.1*mm so that rmax1 is larger than rmin1 +
+ + one degree less, to fit lumical window +
+ +
+ + + + + diff --git a/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml b/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml new file mode 100644 index 000000000..33814f448 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml @@ -0,0 +1,437 @@ + + + + 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/CLD/compact/CLD_o2_v06/ECalBarrel_o2_v01_03.xml b/FCCee/CLD/compact/CLD_o2_v06/ECalBarrel_o2_v01_03.xml new file mode 100644 index 000000000..abe72e0fa --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/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/CLD/compact/CLD_o2_v06/ECalEndcap_o2_v01_03.xml b/FCCee/CLD/compact/CLD_o2_v06/ECalEndcap_o2_v01_03.xml new file mode 100644 index 000000000..dd84c505f --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/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/CLD/compact/CLD_o2_v06/HCalBarrel_o1_v01_01.xml b/FCCee/CLD/compact/CLD_o2_v06/HCalBarrel_o1_v01_01.xml new file mode 100644 index 000000000..d0ade5fc2 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/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/CLD/compact/CLD_o2_v06/HCalEndcap_o1_v01_01.xml b/FCCee/CLD/compact/CLD_o2_v06/HCalEndcap_o1_v01_01.xml new file mode 100644 index 000000000..ef70e41e8 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/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/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleDown.xml b/FCCee/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..12d5d7485 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleDown.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleUp.xml b/FCCee/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..a81418293 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/InnerTrackerBarrelModuleUp.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/CLD/compact/CLD_o2_v06/InnerTracker_o2_v07.xml b/FCCee/CLD/compact/CLD_o2_v06/InnerTracker_o2_v07.xml new file mode 100644 index 000000000..8406b1115 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/InnerTracker_o2_v07.xml @@ -0,0 +1,582 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml b/FCCee/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml new file mode 100644 index 000000000..2ba7b4051 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml @@ -0,0 +1,180 @@ + + + + + + + + + + system:8,barrel:3,layer:8,slice:8,r:32:-16,phi:-16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleDown.xml b/FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleDown.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleDown.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleUp.xml b/FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleUp.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/OuterTrackerBarrelModuleUp.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/CLD/compact/CLD_o2_v06/OuterTracker_o2_v07.xml b/FCCee/CLD/compact/CLD_o2_v06/OuterTracker_o2_v07.xml new file mode 100644 index 000000000..fb8e27d9b --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/OuterTracker_o2_v07.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Tracking detectors + + + + + Outer Tracker Assembly + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + Silicon Outer Tracker Barrel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Silicon Outer Tracker Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/CLD/compact/CLD_o2_v06/Solenoid_o1_v01_02.xml b/FCCee/CLD/compact/CLD_o2_v06/Solenoid_o1_v01_02.xml new file mode 100644 index 000000000..634f3cab3 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/Solenoid_o1_v01_02.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + Solenoid + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleIn.xml b/FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleIn.xml new file mode 100644 index 000000000..12a1efe2e --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleIn.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleOut.xml b/FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleOut.xml new file mode 100644 index 000000000..8c0303810 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/TrackerDiskModuleOut.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/CLD/compact/CLD_o2_v06/Vertex_o4_v07_smallBP.xml b/FCCee/CLD/compact/CLD_o2_v06/Vertex_o4_v07_smallBP.xml new file mode 100644 index 000000000..8082039f9 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/Vertex_o4_v07_smallBP.xml @@ -0,0 +1,225 @@ + + + + + Tracking detectors + + + + + + + + + + + Vertex Assembly + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${GlobalTrackerReadoutID} + + + ${GlobalTrackerReadoutID} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vertex Detector Endcaps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/CLD/compact/CLD_o2_v06/YokeBarrel_o1_v01_02.xml b/FCCee/CLD/compact/CLD_o2_v06/YokeBarrel_o1_v01_02.xml new file mode 100644 index 000000000..5d4e62d73 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/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/CLD/compact/CLD_o2_v06/YokeEndcap_o1_v01_02.xml b/FCCee/CLD/compact/CLD_o2_v06/YokeEndcap_o1_v01_02.xml new file mode 100644 index 000000000..e4503843b --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/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/CLD/compact/CLD_o2_v06/elements.xml b/FCCee/CLD/compact/CLD_o2_v06/elements.xml new file mode 100644 index 000000000..8358bac36 --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/elements.xml @@ -0,0 +1,884 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCCee/CLD/compact/CLD_o2_v06/materials.xml b/FCCee/CLD/compact/CLD_o2_v06/materials.xml new file mode 100644 index 000000000..acdb4a66a --- /dev/null +++ b/FCCee/CLD/compact/CLD_o2_v06/materials.xml @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + diff --git a/FCCee/CLD/compact/README.md b/FCCee/CLD/compact/README.md index 0db117277..3c118cad9 100644 --- a/FCCee/CLD/compact/README.md +++ b/FCCee/CLD/compact/README.md @@ -36,7 +36,7 @@ Overlaps in the Inner and Outer Tracker. CLD_o2_v06 ---------- -This model is based on `CLD_o2_v05` with the following changes: LumiCal outer radius from 112 mm to 115 mm, define its z extent in the beampipe reference frame. +This model is based on `CLD_o2_v05` with the following changes: LumiCal outer radius from 112 mm to 115 mm, remove its nose shield, define its z extent in the beampipe reference frame. CLD_o3_v01 ---------- From ce9c6bc81b67063d66ca2647d242ea4e26d0ea02 Mon Sep 17 00:00:00 2001 From: BrieucF Date: Thu, 29 Feb 2024 17:16:28 +0100 Subject: [PATCH 3/7] CLD_o1_v06: Modify the LumiCal parameters to place it at 1074 along the outgoing beam axis --- FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml | 24 ++++++++++--------- .../compact/CLD_o2_v06/LumiCal_o3_v02_04.xml | 8 +++++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml b/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml index 33814f448..4c811d044 100644 --- a/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml +++ b/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml @@ -195,13 +195,18 @@ - - + + + - + + + + + - - + + @@ -217,11 +222,8 @@ - - - - - + + @@ -291,7 +293,7 @@ - + diff --git a/FCCee/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml b/FCCee/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml index 2ba7b4051..cbc708e20 100644 --- a/FCCee/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml +++ b/FCCee/CLD/compact/CLD_o2_v06/LumiCal_o3_v02_04.xml @@ -25,12 +25,14 @@ + + @@ -66,12 +68,14 @@ + + @@ -106,12 +110,14 @@ + + @@ -145,12 +151,14 @@ + + From b1f4a5f853b27418f7b5cb3e55357d767f21ba88 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Fri, 1 Mar 2024 09:07:40 +0100 Subject: [PATCH 4/7] CLD_o2_v06: Actually write what was changed --- FCCee/CLD/compact/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FCCee/CLD/compact/README.md b/FCCee/CLD/compact/README.md index 3c118cad9..58ba2329a 100644 --- a/FCCee/CLD/compact/README.md +++ b/FCCee/CLD/compact/README.md @@ -36,7 +36,8 @@ Overlaps in the Inner and Outer Tracker. CLD_o2_v06 ---------- -This model is based on `CLD_o2_v05` with the following changes: LumiCal outer radius from 112 mm to 115 mm, remove its nose shield, define its z extent in the beampipe reference frame. +This model is based on `CLD_o2_v05` with the following changes: LumiCal outer radius from 112 mm to 115 mm, remove its +nose shield, place it at 1074*mm along the beam-axis, instead of at 1074*mm in Z, move LumiCal by 100*micron CLD_o3_v01 ---------- From 029411ad0f4d9471d6c2db9f1293261e44942487 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Fri, 8 Mar 2024 13:56:43 +0100 Subject: [PATCH 5/7] CLD_o2_v06: Fix XML syntax errors, variable spelling Co-authored-by: Alvaro Tolosa Delgado <114166109+atolosadelgado@users.noreply.github.com> --- FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml b/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml index 4c811d044..853cd02d4 100644 --- a/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml +++ b/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml @@ -197,12 +197,12 @@ - + - + - + From 3abc2be7111fe6cc49c1f6a489126b5afce66dd4 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Sun, 24 Mar 2024 09:33:10 +0100 Subject: [PATCH 6/7] Test: switch to latest CLD version for testing --- lcgeoTests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lcgeoTests/CMakeLists.txt b/lcgeoTests/CMakeLists.txt index 5df4cfc31..bf13a7940 100644 --- a/lcgeoTests/CMakeLists.txt +++ b/lcgeoTests/CMakeLists.txt @@ -69,7 +69,7 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/CLD/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( det_name "CLD_o2_v05" ) +SET( det_name "CLD_o2_v06" ) ADD_TEST( t_test_${det_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/CLD/compact/${det_name}/${det_name}.xml --runType=batch -G -N=1 --outputFile=test${det_name}.slcio ) SET_TESTS_PROPERTIES( t_test_${det_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) From 1837fce849dc02a0582d82122c088ed5e8d881a1 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Sun, 24 Mar 2024 09:36:02 +0100 Subject: [PATCH 7/7] CLD_o2_v06: correct and clarify description of changes --- FCCee/CLD/compact/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FCCee/CLD/compact/README.md b/FCCee/CLD/compact/README.md index 58ba2329a..bcd254a15 100644 --- a/FCCee/CLD/compact/README.md +++ b/FCCee/CLD/compact/README.md @@ -36,8 +36,8 @@ Overlaps in the Inner and Outer Tracker. CLD_o2_v06 ---------- -This model is based on `CLD_o2_v05` with the following changes: LumiCal outer radius from 112 mm to 115 mm, remove its -nose shield, place it at 1074*mm along the beam-axis, instead of at 1074*mm in Z, move LumiCal by 100*micron +This model is based on `CLD_o2_v05` with the following changes: LumiCal outer radius from 112 mm to 115 mm, remove +unused nose shield parameters, place LumiCal at 1074*mm along the beam-axis, instead of at 1074*mm in Z, moves LumiCal by 100*micron. CLD_o3_v01 ----------