hps-detectors/gdml
diff -u -r1.1 -r1.2
--- ecal_vacuum_flange_simple_v2.gdml 12 Jul 2013 18:30:15 -0000 1.1
+++ ecal_vacuum_flange_simple_v2.gdml 12 Jul 2013 20:56:35 -0000 1.2
@@ -2,7 +2,7 @@
<!--
ECal vacuum flange based on manufacturing drawings from Stepan.
@author Sho Uemura <[log in to unmask]>
- @version $Id: ecal_vacuum_flange_simple_v2.gdml,v 1.1 2013/07/12 18:30:15 meeg Exp $
+ @version $Id: ecal_vacuum_flange_simple_v2.gdml,v 1.2 2013/07/12 20:56:35 meeg Exp $
-->
<gdml xmlns:gdml="http://cern.ch/2001/Schemas/GDML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/gdml/1.0/gdml.xsd" >
@@ -25,25 +25,26 @@
<solids>
<box lunit="mm" name="front_flange_box" x="768.35" y="457.2" z="20"/>
<box lunit="mm" name="back_flange_box" x="505" y="160" z="20"/>
- <trap name="chamber_base_trap" aunit="deg" lunit="mm" z="450" theta="1.864" phi="0" y1="28" x1="377" x2="377" alpha1="0"
+ <trap name="chamber_trap" aunit="deg" lunit="mm" z="450" theta="1.864" phi="0"
+ y1="28" x1="377" x2="377" alpha1="0"
y2="28" x3="406.29" x4="406.29" alpha2="0"/>
<box lunit="mm" name="chamber_cutaway_box" x="500" y="10" z="265"/>
- <subtraction name="chamber_base_1">
- <first ref="chamber_base_trap"/>
+ <subtraction name="chamber_trim1">
+ <first ref="chamber_trap"/>
<second ref="chamber_cutaway_box"/>
- <position name="chamber_base_pos" unit="mm" x="0" y="16" z="-72.5"/>
+ <position name="chamber_trim1_pos" unit="mm" x="0" y="16" z="-72.5"/>
</subtraction>
- <subtraction name="chamber_base">
- <first ref="chamber_base_1"/>
+ <subtraction name="chamber_trim2">
+ <first ref="chamber_trim1"/>
<second ref="chamber_cutaway_box"/>
- <position name="chamber_base_pos" unit="mm" x="0" y="-16" z="-72.5"/>
+ <position name="chamber_trim2_pos" unit="mm" x="0" y="-16" z="-72.5"/>
</subtraction>
<union name="ecal_flange_1">
<first ref="front_flange_box"/>
- <second ref="chamber_base"/>
+ <second ref="chamber_trim2"/>
<position name="chamber_base_pos" unit="mm" x="140.828" y="0" z="215"/>
</union>
<union name="ecal_flange_2">
@@ -53,7 +54,7 @@
</union>
- <eltube name="photontube_outside" lunit="mm" dx="17" dy="17" dz="235"/>
+ <eltube name="photontube_outside" lunit="mm" dx="13" dy="13" dz="235"/>
<union name="flange_with_photontube">
<first ref="ecal_flange_2"/>
@@ -61,22 +62,13 @@
<position name="photontube_outside_pos" unit="mm" x="-26.569" y="0" z="215"/>
<rotation name="photontube_outside_rot" unit="deg" x="0" y="-1.748" z="0"/>
</union>
- <box lunit="mm" name="photontube_cutaway_box" x="75" y="10" z="145"/>
- <subtraction name="flange_with_photontube_trim1">
- <first ref="flange_with_photontube"/>
- <second ref="photontube_cutaway_box"/>
- <position name="photontube_trim1_pos" unit="mm" x="-26.569" y="19" z="347.5"/>
- </subtraction>
- <subtraction name="flange_with_photontube_trim2">
- <first ref="flange_with_photontube_trim1"/>
- <second ref="photontube_cutaway_box"/>
- <position name="photontube_trim1_pos" unit="mm" x="-26.569" y="-19" z="347.5"/>
- </subtraction>
- <trap name="egap_outside_trap_upper" aunit="deg" lunit="mm" z="450" theta="4.796" phi="0" y1="32.33" x1="106.962" x2="52.344" alpha1="-0.269"
+ <trap name="egap_outside_trap_upper" aunit="deg" lunit="mm" z="450" theta="4.796" phi="0"
+ y1="32.33" x1="106.962" x2="52.344" alpha1="-0.269"
y2="32.33" x3="167.411" x4="112.843" alpha2="-0.269"/>
- <trap name="egap_outside_trap_lower" aunit="deg" lunit="mm" z="450" theta="4.796" phi="0" y1="32.33" x2="106.962" x1="52.344" alpha1="0.269"
+ <trap name="egap_outside_trap_lower" aunit="deg" lunit="mm" z="450" theta="4.796" phi="0"
+ y1="32.33" x2="106.962" x1="52.344" alpha1="0.269"
y2="32.33" x4="167.411" x3="112.843" alpha2="0.269"/>
<union name="egap_outside">
<first ref="egap_outside_trap_upper"/>
@@ -95,7 +87,7 @@
</subtraction>
<union name="flange_outside">
- <first ref="flange_with_photontube_trim2"/>
+ <first ref="flange_with_photontube"/>
<second ref="egap_outside_trim2"/>
<position name="egap_outside_pos" unit="mm" x="63.810" y="16.165" z="215"/>
</union>
@@ -123,7 +115,8 @@
</subtraction>
- <trap name="chamber_inside_trap" aunit="deg" lunit="mm" z="450" theta="0.988" phi="0" y1="16" x1="331.676" x2="331.676" alpha1="0"
+ <trap name="chamber_inside_trap" aunit="deg" lunit="mm" z="450" theta="0.988" phi="0"
+ y1="16" x1="331.676" x2="331.676" alpha1="0"
y2="16" x3="374.667" x4="374.667" alpha2="0"/>
<subtraction name="flange_minus_inside">
@@ -133,7 +126,8 @@
</subtraction>
- <trap name="egap_inside_trap" aunit="deg" lunit="mm" z="450" theta="4.796" phi="0" y1="52.66" x1="26.355" x2="26.355" alpha1="0"
+ <trap name="egap_inside_trap" aunit="deg" lunit="mm" z="450" theta="4.796" phi="0"
+ y1="52.66" x1="26.355" x2="26.355" alpha1="0"
y2="52.66" x3="86.854" x4="86.854" alpha2="0"/>
<subtraction name="flange_minus_egapinside">