add cones and service material along the cone/barrel
Compare changes
+ 97
− 26
@@ -44,15 +44,13 @@ total X0 0.24% per disk layer (4 sectors per disk):
@@ -44,15 +44,13 @@ total X0 0.24% per disk layer (4 sectors per disk):
<constant name="TrackerBarrelInner_thickness" value="TrackerBarrelInner_rmin2 - TrackerBarrelInner_rmin1"/>
<constant name="TrackerBarrelOuter_thickness" value="TrackerBarrelOuter_rmin2 - TrackerBarrelOuter_rmin1"/>
@@ -85,18 +83,41 @@ total X0 0.24% per disk layer (4 sectors per disk):
@@ -85,18 +83,41 @@ total X0 0.24% per disk layer (4 sectors per disk):
<constant name="TrackerEndcapOuterShell_zmin" value="TrackerEndcapOuter_rmax1 * TrackerEndcapInner_zmin/TrackerEndcapInner_rmax1+1*cm"/>
<constant name="TrackerEndcapOuterShell_length" value="TrackerEndcapOuter_zmax- TrackerEndcapOuterShell_zmin"/>
@@ -110,7 +131,7 @@ total X0 0.24% per disk layer (4 sectors per disk):
@@ -110,7 +131,7 @@ total X0 0.24% per disk layer (4 sectors per disk):
<constant name="TrackerEndcapInnerMod1_x2" value="2.0*TrackerEndcapInner_rmax1*sin(TrackerEndcapInnerModOpeningAngle/2.0)"/>
<constant name="TrackerEndcapInnerMod1_y" value="TrackerEndcapInner_rmax1*cos(TrackerEndcapInnerModOpeningAngle/2.0) - TrackerEndcapInner_rmin1"/>
<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"/>
@@ -202,12 +223,20 @@ total X0 0.24% per disk layer (4 sectors per disk):
@@ -202,12 +223,20 @@ total X0 0.24% per disk layer (4 sectors per disk):
<trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/>
@@ -234,12 +263,20 @@ total X0 0.24% per disk layer (4 sectors per disk):
@@ -234,12 +263,20 @@ total X0 0.24% per disk layer (4 sectors per disk):
<trd x1="TrackerEndcapInnerMod1_x1/2.0" x2="TrackerEndcapInnerMod1_x2/2.0" z="TrackerEndcapInnerMod1_y/2"/>
@@ -333,9 +370,27 @@ total X0 0.24% per disk layer (4 sectors per disk):
@@ -333,9 +370,27 @@ total X0 0.24% per disk layer (4 sectors per disk):
<trd x1="TrackerEndcapOuterMod1_x1/2.0" x2="TrackerEndcapOuterMod1_x2/2.0" z="TrackerEndcapOuterMod1_y/2"/>
@@ -396,11 +451,27 @@ total X0 0.24% per disk layer (4 sectors per disk):
@@ -396,11 +451,27 @@ total X0 0.24% per disk layer (4 sectors per disk):