From 8239d7151f4204323f014345bc57f71c267e3c13 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sylvester.joosten@gmail.com>
Date: Wed, 9 Jun 2021 03:02:01 +0000
Subject: [PATCH] Resolve "Silicon tracker layout"
---
compact/ce_mrich.xml | 2 +-
compact/central_tracker.xml | 172 ++++++++++++++----
compact/definitions.xml | 13 +-
.../allsilicon_simplified.xml | 0
compact/vertex_tracker.xml | 22 +--
5 files changed, 154 insertions(+), 55 deletions(-)
rename compact/{ => deprecated}/allsilicon_simplified.xml (100%)
diff --git a/compact/ce_mrich.xml b/compact/ce_mrich.xml
index 6f9c2b7e..7b8860aa 100644
--- a/compact/ce_mrich.xml
+++ b/compact/ce_mrich.xml
@@ -4,7 +4,7 @@
<constant name="ce_MRICHRMin" value="15*cm"/>
<constant name="ce_MRICHRMax" value="BarrelTracking_rmax"/>
<constant name="ce_MRICHLength" value="BackwardCherenkov_length"/>
- <constant name="ce_MRICHZMin" value="-EcalEndcapN_zmin+ce_MRICHLength"/>
+ <constant name="ce_MRICHZMin" value="-BarrelTracking_length/2.0 - BackwardTracking_length"/>
</define>
diff --git a/compact/central_tracker.xml b/compact/central_tracker.xml
index 791e13ab..2ac1351d 100644
--- a/compact/central_tracker.xml
+++ b/compact/central_tracker.xml
@@ -19,14 +19,14 @@
<constant name="TrackerBarrelSpaceFrame_width" value="40.0*mm"/>
<constant name="TrackerBarrelSpaceFrame_height" value="sqrt(3.0)*32.0*mm/2.0"/>
- <constant name="TrackerSensor_thickness" value="0.03*mm"/>
+ <constant name="TrackerSensor_thickness" value="0.03*mm"/>
<constant name="TrackerBarrel_thickness" value="0.55/100*9.37*cm"/>
<constant name="TrackerBarrelService_thickness" value="TrackerBarrel_thickness-TrackerSensor_thickness"/>
<comment>
Layer_rOffset is used to add inside space so the _rmin value is the nominal sensor radius.
</comment>
- <constant name="TrackerBarrelLayer_rOffset" value="0.5*cm"/>
+ <constant name="TrackerBarrelLayer_rOffset" value="0.5*cm"/>
<constant name="TrackerBarrelInner_rmin1" value="21.0*cm"/>
<constant name="TrackerBarrelInner_rmin2" value="TrackerBarrelInner_rmin1 + TrackerBarrelSpaceFrame_width"/>
<constant name="TrackerBarrelInner_length1" value="54.0*cm"/>
@@ -47,32 +47,33 @@
</comment>
<constant name="TrackerEndcap_thickness" value="0.25/100*9.37*cm"/>
<constant name="TrackerEndcapService_thickness" value="TrackerEndcap_thickness-TrackerSensor_thickness"/>
- <constant name="TrackerEndcapLayer_length" value="5.0*cm"/>
- <constant name="TrackerEndcapInner_nLayers" value="2"/>
+ <constant name="TrackerEndcapInner_nLayers" value="1"/>
<constant name="TrackerEndcapOuter_nLayers" value="3"/>
<constant name="TrackerEndcapInner_zmin" value="TrackerBarrelInner_length/2.0"/>
- <constant name="TrackerEndcapInner_zmax" value="TrackerEndcapInner_zmin + 2.0*TrackerEndcapLayer_length "/>
+ <constant name="TrackerEndcapInner_zmax" value="TrackerBarrelOuter_length/2.0"/>
<constant name="TrackerEndcapInner_length" value="TrackerEndcapInner_zmax- TrackerEndcapInner_zmin"/>
<constant name="TrackerEndcapInnerLayer_dz" value="TrackerEndcapInner_length/TrackerEndcapInner_nLayers"/>
<constant name="TrackerEndcapOuter_zmin" value="TrackerBarrelOuter_length/2.0"/>
- <constant name="TrackerEndcapOuter_zmax" value="CentralTracking_length/2.0"/>
+ <constant name="TrackerEndcapOuter_zmax" value="TrackerEndcapOuter_zmin + 72"/>
<constant name="TrackerEndcapOuter_length" value="TrackerEndcapOuter_zmax- TrackerEndcapOuter_zmin"/>
<constant name="TrackerEndcapOuterLayer_dz" value="TrackerEndcapOuter_length/TrackerEndcapOuter_nLayers"/>
<constant name="TrackerEndcapInner_rmin1" value="Beampipe_rmax+1.0*cm"/>
<constant name="TrackerEndcapInner_rmin2" value="Beampipe_rmax+1.0*cm"/>
- <constant name="TrackerEndcapOuter_rmin" value="3.18*cm"/>
- <constant name="TrackerEndcapOuter_rmin1" value="3.18*cm"/>
+ <constant name="TrackerEndcapOuter_rmin1" value="3.18*cm + 1.2*cm * 0"/>
+ <constant name="TrackerEndcapOuter_rmin2" value="3.18*cm + 1.2*cm * 1"/>
+ <constant name="TrackerEndcapOuter_rmin3" value="3.18*cm + 1.2*cm * 2"/>
- <constant name="TrackerEndcapInner_rmax1" value="18.5*cm"/>
- <constant name="TrackerEndcapInner_rmax2" value="18.5*cm + TrackerBarrelInner_thickness"/>
+ <constant name="TrackerEndcapInner_rmax1" value="TrackerBarrelOuter_rmin1-5.0*mm"/>
+ <constant name="TrackerEndcapInner_rmax2" value="TrackerBarrelOuter_rmin1-5.0*mm"/>
- <constant name="TrackerEndcapOuter_rmax" value="43.23*cm"/>
<constant name="TrackerEndcapOuter_rmax1" value="43.23*cm"/>
+ <constant name="TrackerEndcapOuter_rmax2" value="43.23*cm"/>
+ <constant name="TrackerEndcapOuter_rmax3" value="43.23*cm"/>
<comment> TODO: These should be computed </comment>
<constant name="TrackerBarrelInner_NModules" value="30"/>
@@ -87,6 +88,12 @@
<constant name="TrackerEndcapOuterMod1_x1" value="2.0*TrackerEndcapOuter_rmin1*sin(TrackerEndcapOuterModOpeningAngle/2.0)"/>
<constant name="TrackerEndcapOuterMod1_x2" value="2.0*TrackerEndcapOuter_rmax1*sin(TrackerEndcapOuterModOpeningAngle/2.0)"/>
<constant name="TrackerEndcapOuterMod1_y" value="TrackerEndcapOuter_rmax1*cos(TrackerEndcapOuterModOpeningAngle/2.0) - TrackerEndcapOuter_rmin1"/>
+ <constant name="TrackerEndcapOuterMod2_x1" value="2.0*TrackerEndcapOuter_rmin2*sin(TrackerEndcapOuterModOpeningAngle/2.0)"/>
+ <constant name="TrackerEndcapOuterMod2_x2" value="2.0*TrackerEndcapOuter_rmax2*sin(TrackerEndcapOuterModOpeningAngle/2.0)"/>
+ <constant name="TrackerEndcapOuterMod2_y" value="TrackerEndcapOuter_rmax2*cos(TrackerEndcapOuterModOpeningAngle/2.0) - TrackerEndcapOuter_rmin2"/>
+ <constant name="TrackerEndcapOuterMod3_x1" value="2.0*TrackerEndcapOuter_rmin3*sin(TrackerEndcapOuterModOpeningAngle/2.0)"/>
+ <constant name="TrackerEndcapOuterMod3_x2" value="2.0*TrackerEndcapOuter_rmax3*sin(TrackerEndcapOuterModOpeningAngle/2.0)"/>
+ <constant name="TrackerEndcapOuterMod3_y" value="TrackerEndcapOuter_rmax3*cos(TrackerEndcapOuterModOpeningAngle/2.0) - TrackerEndcapOuter_rmin3"/>
<!--
@@ -182,6 +189,22 @@
<module_component name="peek1" material="PEEK" sensitive="false"
width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length1-6*mm" thickness="2.0*mm" />
</module>
+ <module name="TrackerBarrelInner_Module2" vis="PurpleVis">
+ <frame material="CarbonFiber_25percent" vis="BlueGreenVis"
+ width="TrackerBarrelSpaceFrame_width"
+ height="TrackerBarrelSpaceFrame_height"
+ length="TrackerBarrelInner_length2"
+ thickness="0.1*mm" />
+ <module_component name="peek1" material="PEEK" sensitive="false"
+ width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length2-4*mm" thickness="2.0*mm" />
+ <module_component name="silicon"
+ width="TrackerBarrelSpaceFrame_width"
+ length="TrackerBarrelInner_length2-5*mm" thickness="0.05*mm" material="Silicon" sensitive="true">
+ <!--position z="-0.025*mm" y="0*mm"/-->
+ </module_component>
+ <module_component name="peek1" material="PEEK" sensitive="false"
+ width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length2-6*mm" thickness="2.0*mm" />
+ </module>
<comment>
Tracker Barrel Inner Layers
</comment>
@@ -193,7 +216,7 @@
<rphi_layout phi_tilt="10.0*degree" nphi="TrackerBarrelInner_NModules" phi0="0.0" rc="TrackerBarrelInner_rmin1" dr="0.0 * mm"/>
<z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/>
</layer>
- <layer module="TrackerBarrelInner_Module1" id="2" vis="VertexVis">
+ <layer module="TrackerBarrelInner_Module2" id="2" vis="VertexVis">
<barrel_envelope
inner_r="TrackerBarrelInner_rmin2-TrackerBarrelLayer_rOffset"
outer_r="TrackerBarrelInner_rmin2-TrackerBarrelLayer_rOffset + TrackerBarrelInner_thickness"
@@ -212,9 +235,8 @@
reflect="false">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
- <module_component thickness="500.0*um" material="Silicon" sensitive="true"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
</module>
<layer id="1">
<envelope vis="AnlRed"
@@ -224,8 +246,8 @@
zstart="TrackerEndcapInner_zmin" />
<ring vis="AnlRed"
r="TrackerEndcapInner_rmin1+TrackerEndcapInnerMod1_y/2.0"
- zstart="5.0*mm"
- nmodules="12" dz="5 * mm" module="Module1" />
+ zstart="(50.0*mm)"
+ nmodules="12" dz="2.5 * mm" module="Module1" />
</layer>
</detector>
@@ -238,9 +260,8 @@
reflect="true">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
- <module_component thickness="500.0*um" material="Silicon" sensitive="true"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
</module>
<layer id="1">
<envelope vis="AnlRed"
@@ -249,8 +270,9 @@
length="TrackerEndcapInnerLayer_dz"
zstart="TrackerEndcapInner_zmin" />
<ring vis="AnlRed"
- r="TrackerEndcapInner_rmin1+TrackerEndcapInnerMod1_y/2.0" zstart="5.0*mm"
- nmodules="12" dz="5 * mm" module="Module1" />
+ r="TrackerEndcapInner_rmin1+TrackerEndcapInnerMod1_y/2.0"
+ zstart="-(50.0*mm)"
+ nmodules="12" dz="2.5 * mm" module="Module1" />
</layer>
</detector>
@@ -340,6 +362,22 @@
<module_component name="peek2" material="PEEK" sensitive="false"
width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length1-0.1*mm" thickness="2.0*mm" />
</module>
+ <module name="TrackerBarrelOuter_Module2" vis="PurpleVis">
+ <frame material="CarbonFiber_25percent" vis="BlueGreenVis"
+ width="TrackerBarrelSpaceFrame_width"
+ height="TrackerBarrelSpaceFrame_height"
+ length="TrackerBarrelOuter_length2"
+ thickness="0.1*mm" />
+ <module_component name="peek1" material="PEEK" sensitive="false"
+ width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length2-0.1*mm" thickness="2.0*mm" />
+ <module_component name="silicon"
+ width="TrackerBarrelSpaceFrame_width"
+ length="TrackerBarrelOuter_length1-0.1*mm"
+ thickness="0.05*mm" material="Silicon" sensitive="true">
+ </module_component>
+ <module_component name="peek2" material="PEEK" sensitive="false"
+ width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length1-0.1*mm" thickness="2.0*mm" />
+ </module>
<comment>
Tracker Barrel Inner Layers
</comment>
@@ -351,7 +389,7 @@
<rphi_layout phi_tilt="10.0*degree" nphi="TrackerBarrelOuter_NModules" phi0="0.0" rc="TrackerBarrelOuter_rmin1" dr="0.0 * mm"/>
<z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/>
</layer>
- <layer module="TrackerBarrelOuter_Module1" id="2" vis="VertexVis">
+ <layer module="TrackerBarrelOuter_Module2" id="2" vis="VertexVis">
<barrel_envelope
inner_r="TrackerBarrelOuter_rmin2-TrackerBarrelLayer_rOffset"
outer_r="TrackerBarrelOuter_rmin2-TrackerBarrelLayer_rOffset + TrackerBarrelOuter_thickness"
@@ -370,20 +408,51 @@
reflect="false">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod1_x1/2.0" x2="TrackerEndcapOuterMod1_x2/2.0" z="TrackerEndcapOuterMod1_y/2"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
- <module_component thickness="500.0*um" material="Silicon" sensitive="true"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
+ </module>
+ <module name="Module2" vis="AnlProcess_Blue">
+ <trd x1="TrackerEndcapOuterMod2_x1/2.0" x2="TrackerEndcapOuterMod2_x2/2.0" z="TrackerEndcapOuterMod2_y/2"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
+ </module>
+ <module name="Module3" vis="AnlProcess_Blue">
+ <trd x1="TrackerEndcapOuterMod3_x1/2.0" x2="TrackerEndcapOuterMod3_x2/2.0" z="TrackerEndcapOuterMod3_y/2"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
</module>
<layer id="1">
<envelope vis="AnlRed"
rmin="TrackerEndcapOuter_rmin1"
- rmax="TrackerEndcapOuter_rmax"
+ rmax="TrackerEndcapOuter_rmax1"
length="TrackerEndcapOuterLayer_dz"
zstart="TrackerEndcapOuter_zmin" />
<ring vis="AnlRed"
r="TrackerEndcapOuter_rmin1+TrackerEndcapOuterMod1_y/2.0"
- zstart="5.0*mm"
- nmodules="12" dz="5 * mm" module="Module1" />
+ zstart="0.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module1" />
+ </layer>
+ <layer id="2">
+ <envelope vis="AnlRed"
+ rmin="TrackerEndcapOuter_rmin2"
+ rmax="TrackerEndcapOuter_rmax2"
+ length="TrackerEndcapOuterLayer_dz"
+ zstart="TrackerEndcapOuter_zmin + TrackerEndcapOuterLayer_dz" />
+ <ring vis="AnlRed"
+ r="TrackerEndcapOuter_rmin2+TrackerEndcapOuterMod2_y/2.0"
+ zstart="0.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module2" />
+ </layer>
+ <layer id="3">
+ <envelope vis="AnlRed"
+ rmin="TrackerEndcapOuter_rmin3"
+ rmax="TrackerEndcapOuter_rmax3"
+ length="TrackerEndcapOuterLayer_dz"
+ zstart="TrackerEndcapOuter_zmin + 2 * TrackerEndcapOuterLayer_dz" />
+ <ring vis="AnlRed"
+ r="TrackerEndcapOuter_rmin3+TrackerEndcapOuterMod3_y/2.0"
+ zstart="0.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module3" />
</layer>
</detector>
@@ -396,20 +465,51 @@
reflect="true">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="TrackerEndcapOuterMod1_x1/2.0" x2="TrackerEndcapOuterMod1_x2/2.0" z="TrackerEndcapOuterMod1_y/2"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
- <module_component thickness="500.0*um" material="Silicon" sensitive="true"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
+ </module>
+ <module name="Module2" vis="AnlProcess_Blue">
+ <trd x1="TrackerEndcapOuterMod2_x1/2.0" x2="TrackerEndcapOuterMod2_x2/2.0" z="TrackerEndcapOuterMod2_y/2"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
+ </module>
+ <module name="Module3" vis="AnlProcess_Blue">
+ <trd x1="TrackerEndcapOuterMod3_x1/2.0" x2="TrackerEndcapOuterMod3_x2/2.0" z="TrackerEndcapOuterMod3_y/2"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
</module>
<layer id="1">
<envelope vis="AnlRed"
- rmin="TrackerEndcapOuter_rmin1"
- rmax="TrackerEndcapOuter_rmax"
+ rmin="TrackerEndcapOuter_rmin1 + 0 * 1.2*cm"
+ rmax="TrackerEndcapOuter_rmax1"
length="TrackerEndcapOuterLayer_dz"
zstart="TrackerEndcapOuter_zmin" />
<ring vis="AnlRed"
r="TrackerEndcapOuter_rmin1+TrackerEndcapOuterMod1_y/2.0"
- zstart="5.0*mm"
- nmodules="12" dz="5 * mm" module="Module1" />
+ zstart="0.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module1" />
+ </layer>
+ <layer id="2">
+ <envelope vis="AnlRed"
+ rmin="TrackerEndcapOuter_rmin2"
+ rmax="TrackerEndcapOuter_rmax2"
+ length="TrackerEndcapOuterLayer_dz"
+ zstart="TrackerEndcapOuter_zmin + TrackerEndcapOuterLayer_dz" />
+ <ring vis="AnlRed"
+ r="TrackerEndcapOuter_rmin2+TrackerEndcapOuterMod2_y/2.0"
+ zstart="0.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module2" />
+ </layer>
+ <layer id="3">
+ <envelope vis="AnlRed"
+ rmin="TrackerEndcapOuter_rmin3"
+ rmax="TrackerEndcapOuter_rmax3"
+ length="TrackerEndcapOuterLayer_dz"
+ zstart="TrackerEndcapOuter_zmin + 2 * TrackerEndcapOuterLayer_dz" />
+ <ring vis="AnlRed"
+ r="TrackerEndcapOuter_rmin3+TrackerEndcapOuterMod3_y/2.0"
+ zstart="0.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module3" />
</layer>
</detector>
<!--
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 01b81b0a..e24d7e2f 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -359,7 +359,8 @@
</comment>
<constant name="ForwardTracking_length" value="0.0*cm"/>
- <constant name="BackwardTracking_length" value="0.0*cm"/>
+ <comment>This compensates for the asymmetry of the setup</comment>
+ <constant name="BackwardTracking_length" value="7.5*cm"/>
<comment>
-------------------------
@@ -375,7 +376,7 @@
-------------------------
</comment>
<constant name="VertexTrackerBarrel_rmin" value="Beampipe_rmax+5.0*mm"/>
- <constant name="VertexTrackerBarrel_rmax" value="150.0*mm"/>
+ <constant name="VertexTrackerBarrel_rmax" value="200.0*mm"/>
<constant name="VertexTrackerBarrel_length" value="300.0*mm"/>
<constant name="VertexTrackerBarrel_zmax" value="VertexTrackerBarrel_length/2.0"/>
@@ -385,8 +386,8 @@
<constant name="VertexTrackerEndcapP_rmin" value="Beampipe_rmax+5.0*mm"/>
<constant name="VertexTrackerEndcapN_rmin" value="Beampipe_rmax+5.0*mm"/>
- <constant name="VertexTrackerEndcapP_zmax" value="500.0*mm/2.0"/>
- <constant name="VertexTrackerEndcapN_zmax" value="500.0*mm/2.0"/>
+ <constant name="VertexTrackerEndcapP_zmax" value="600.0*mm/2.0"/>
+ <constant name="VertexTrackerEndcapN_zmax" value="600.0*mm/2.0"/>
<comment>
Vertex Tracking Region
@@ -482,8 +483,8 @@
<constant name="EcalBarrel_TotalThickness" value="40.0*cm"/>
- <constant name="EcalEndcapP_zmin" value="CentralTracking_length/2.0 + ForwardPIDLength"/>
- <constant name="EcalEndcapN_zmin" value="CentralTracking_length/2.0 + BackwardPIDLength"/>
+ <constant name="EcalEndcapP_zmin" value="BarrelTracking_length/2.0 + ForwardTracking_length + ForwardPIDLength"/>
+ <constant name="EcalEndcapN_zmin" value="BarrelTracking_length/2.0 + BackwardTracking_length + BackwardPIDLength"/>
<constant name="BarrelLength" value="TrackerBarrelOuter_length + ForwardPIDLength + BackwardPIDLength" />
<constant name="Barrel_offset" value="(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0" />
diff --git a/compact/allsilicon_simplified.xml b/compact/deprecated/allsilicon_simplified.xml
similarity index 100%
rename from compact/allsilicon_simplified.xml
rename to compact/deprecated/allsilicon_simplified.xml
diff --git a/compact/vertex_tracker.xml b/compact/vertex_tracker.xml
index b32f9166..e83a0535 100644
--- a/compact/vertex_tracker.xml
+++ b/compact/vertex_tracker.xml
@@ -2,7 +2,7 @@
<lccdd>
<define>
- <constant name="ITS3Thickness" value="0.03*mm"/>
+ <constant name="ITS3Thickness" value="30*um"/>
<constant name="VertexBarrel_rmin1" value="3.3*cm"/>
<constant name="VertexBarrel_rmin2" value="5.7*cm"/>
<constant name="VertexBarrelModule_maxThickness" value="VertexBarrel_rmin2 - VertexBarrel_rmin1"/>
@@ -29,7 +29,7 @@
<constant name="VertexTrackerEndcapN_zmin" value="VertexTrackerBarrel_zmax"/>
<constant name="VertexTrackerEndcapP_zmin" value="VertexTrackerBarrel_zmax"/>
- <constant name="VertexEndcap_NLayers" value="2"/>
+ <constant name="VertexEndcap_NLayers" value="1"/>
<constant name="VertexTrackerEndcap_delta" value="(VertexTrackerEndcapP_zmax - VertexTrackerEndcapP_zmin)/VertexEndcap_NLayers"/>
<constant name="VertexEndcapLayer_dz" value="(VertexTrackerEndcapP_zmax - VertexTrackerEndcapP_zmin)/VertexEndcap_NLayers"/>
@@ -132,9 +132,8 @@
reflect="false">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="VertexEndcapMod1_x1/2.0" x2="VertexEndcapMod1_x2/2.0" z="VertexEndcapMod1_y/2"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
- <module_component thickness="500.0*um" material="Silicon" sensitive="true"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
</module>
<layer id="1">
<envelope vis="AnlRed"
@@ -144,8 +143,8 @@
zstart="VertexTrackerEndcapP_zmin" />
<ring vis="AnlRed"
r="VertexTrackerEndcapP_rmin+VertexEndcapMod1_y/2.0"
- zstart="5.0*mm"
- nmodules="12" dz="5 * mm" module="Module1" />
+ zstart="25.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module1" />
</layer>
</detector>
@@ -159,9 +158,8 @@
reflect="true">
<module name="Module1" vis="AnlProcess_Blue">
<trd x1="VertexEndcapMod1_x1/2.0" x2="VertexEndcapMod1_x2/2.0" z="VertexEndcapMod1_y/2"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
- <module_component thickness="500.0*um" material="Silicon" sensitive="true"/>
- <module_component thickness="1.0*mm" material="PEEK"/>
+ <module_component thickness="ITS3Thickness" material="Silicon" sensitive="true"/>
+ <module_component thickness="0.25/100*9.37*cm-ITS3Thickness" material="Silicon"/>
</module>
<layer id="1">
<envelope vis="AnlRed"
@@ -171,8 +169,8 @@
zstart="VertexTrackerEndcapN_zmin" />
<ring vis="AnlRed"
r="VertexTrackerEndcapN_rmin+VertexEndcapMod1_y/2.0"
- zstart="5.0*mm"
- nmodules="12" dz="5 * mm" module="Module1" />
+ zstart="-25.0*mm"
+ nmodules="12" dz="2.5 * mm" module="Module1" />
</layer>
</detector>
--
GitLab