Skip to content
Snippets Groups Projects
Commit 954aea9d authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Merge remote-tracking branch 'origin/master' into barrel-tracker-simplified

parents 456321b3 855ad73f
Branches
No related tags found
1 merge request!85Draft: Barrel tracker: simplified geometry option
...@@ -38,8 +38,10 @@ ...@@ -38,8 +38,10 @@
<constant name="TrackerBarrelInner_thickness" value="TrackerBarrelInner_rmin2 - TrackerBarrelInner_rmin1"/> <constant name="TrackerBarrelInner_thickness" value="TrackerBarrelInner_rmin2 - TrackerBarrelInner_rmin1"/>
<constant name="TrackerBarrelOuter_thickness" value="TrackerBarrelOuter_rmin2 - TrackerBarrelOuter_rmin1"/> <constant name="TrackerBarrelOuter_thickness" value="TrackerBarrelOuter_rmin2 - TrackerBarrelOuter_rmin1"/>
<constant name="TrackerBarrelInner_length" value="TrackerBarrelInner_length2"/> <constant name="TrackerBarrelInner_length" value="TrackerBarrelInner_length2+1.0*cm"/>
<constant name="TrackerBarrelOuter_length" value="TrackerBarrelOuter_length2"/> <constant name="TrackerBarrelOuter_length" value="TrackerBarrelOuter_length2+1.0*cm"/>
<comment> <comment>
Here we are assuming the two endcaps (P and N) are symmetric. Here we are assuming the two endcaps (P and N) are symmetric.
...@@ -283,12 +285,11 @@ ...@@ -283,12 +285,11 @@
<comment> <comment>
Tracker Barrel Inner Layers Tracker Barrel Inner Layers
</comment> </comment>
<!--
<layer module="TrackerBarrelOuter_Module1" id="1" vis="VertexVis"> <layer module="TrackerBarrelOuter_Module1" id="1" vis="VertexVis">
<barrel_envelope <barrel_envelope
inner_r="TrackerBarrelOuter_rmin1-TrackerBarrelLayer_rOffset" inner_r="TrackerBarrelOuter_rmin1-TrackerBarrelLayer_rOffset"
outer_r="TrackerBarrelOuter_rmin1-TrackerBarrelLayer_rOffset + TrackerBarrelOuter_thickness-1.0*mm" outer_r="TrackerBarrelOuter_rmin1-TrackerBarrelLayer_rOffset + TrackerBarrelOuter_thickness-1.0*mm"
z_length="TrackerBarrelOuter_length"/> z_length="TrackerBarrelOuter_length1"/>
<rphi_layout phi_tilt="10.0*degree" nphi="TrackerBarrelOuter_NModules" phi0="0.0" rc="TrackerBarrelOuter_rmin1" dr="0.0 * mm"/> <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"/> <z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/>
</layer> </layer>
...@@ -296,11 +297,10 @@ ...@@ -296,11 +297,10 @@
<barrel_envelope <barrel_envelope
inner_r="TrackerBarrelOuter_rmin2-TrackerBarrelLayer_rOffset" inner_r="TrackerBarrelOuter_rmin2-TrackerBarrelLayer_rOffset"
outer_r="TrackerBarrelOuter_rmin2-TrackerBarrelLayer_rOffset + TrackerBarrelOuter_thickness" outer_r="TrackerBarrelOuter_rmin2-TrackerBarrelLayer_rOffset + TrackerBarrelOuter_thickness"
z_length="TrackerBarrelOuter_length"/> z_length="TrackerBarrelOuter_length2"/>
<rphi_layout phi_tilt="10.0*degree" nphi="TrackerBarrelOuter_NModules" phi0="0.0" rc="TrackerBarrelOuter_rmin2" dr="0.0 * mm"/> <rphi_layout phi_tilt="10.0*degree" nphi="TrackerBarrelOuter_NModules" phi0="0.0" rc="TrackerBarrelOuter_rmin2" dr="0.0 * mm"/>
<z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/> <z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/>
</layer> </layer>
-->
</detector> </detector>
<detector <detector
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment