1 added + 8 modified, total 9 files
hps-detectors/detectors/HPS-Proposal2014-v5-1pt1
diff -u -r1.1 -r1.2
--- HPS-Proposal2014-v5-1pt1.lcdd 3 Oct 2013 04:53:45 -0000 1.1
+++ HPS-Proposal2014-v5-1pt1.lcdd 9 Oct 2013 19:07:17 -0000 1.2
@@ -2,7 +2,7 @@
<lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
<header>
<detector name="HPS-Proposal2014-v5-1pt1" />
- <generator name="GeomConverter" version="1.0" file="detectors/HPS-Proposal2014-v5-1pt1/compact.xml" checksum="2886888660" />
+ <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v5-1pt1/compact.xml" checksum="4118041791" />
<author name="NONE" />
<comment>HPS detector for 2014 proposal @ 1.1GeV</comment>
</header>
@@ -1177,6 +1177,8 @@
<constant name="back_z" value="440.0" />
<constant name="chamber_x" value="-140.828" />
<constant name="chamber_z" value="225.0" />
+ <constant name="honeycomb_x" value="-210.0" />
+ <constant name="honeycomb_z" value="190.0" />
<constant name="ecal_flange_x" value="21.17" />
<constant name="ecal_flange_z" value="1318" />
</define>
@@ -1240,6 +1242,10 @@
<D value="2.7" />
<atom value="26.9815" />
</material>
+ <material Z="13" formula=" " name="Al_Honeycomb">
+ <D value="0.13" />
+ <atom value="26.9815" />
+ </material>
<element Z="26" formula="Fe" name="Iron">
<atom value="55.845" />
</element>
@@ -1415,6 +1421,7 @@
<position name="egap_inside_right_pos" unit="mm" x="-91.025-chamber_x" y="0" z="0" />
<rotation name="egap_inside_right_rot" unit="deg" x="0" y="-8.594" z="0" />
</subtraction>
+ <box lunit="mm" name="honeycomb_box" x="60" y="15.999" z="60" />
<box lunit="mm" name="WorldBox" x="80000" y="80000" z="80000" />
<box lunit="mm" name="svt_chamber_outer_box" x="454.152" y="203.2" z="1219.2" />
<trd lunit="mm" name="svt_chamber_outer_flare1" x1="454.152" x2="454.152" y1="203.2" y2="412.8008" z="384.622" />
@@ -1531,6 +1538,10 @@
<materialref ref="Aluminum" />
<solidref ref="chamber_minus_egap_right" />
</volume>
+ <volume name="honeycomb_vol">
+ <materialref ref="Al_Honeycomb" />
+ <solidref ref="honeycomb_box" />
+ </volume>
<volume name="svt_chamber_vol">
<materialref ref="Stainless_304" />
<solidref ref="svt_chamber" />
@@ -5443,6 +5454,10 @@
<volumeref ref="ecal_chamber_vol" />
<position name="ecal_chamber_pos" unit="mm" x="ecal_flange_x+chamber_x" y="0" z="ecal_flange_z+chamber_z" />
</physvol>
+ <physvol>
+ <volumeref ref="honeycomb_vol" />
+ <position name="honeycomb_pos" unit="mm" x="ecal_flange_x+honeycomb_x" y="0" z="ecal_flange_z+honeycomb_z" />
+ </physvol>
<visref ref="WorldVis" />
</volume>
</structure>
hps-detectors/detectors/HPS-Proposal2014-v5-1pt1
diff -u -r1.1 -r1.2
--- compact.xml 3 Oct 2013 04:53:46 -0000 1.1
+++ compact.xml 9 Oct 2013 19:07:17 -0000 1.2
@@ -350,7 +350,7 @@
</fields>
<includes>
- <gdmlFile file="gdml/ecal_vacuum_flange_simple_v2.gdml" />
+ <gdmlFile file="gdml/ecal_vacuum_flange_simple_v3.gdml" />
<gdmlFile file="gdml/svt_chamber.gdml" />
</includes>
</lccdd>
hps-detectors/detectors/HPS-Proposal2014-v5-2pt2
diff -u -r1.1 -r1.2
--- compact.xml 3 Oct 2013 04:33:09 -0000 1.1
+++ compact.xml 9 Oct 2013 19:07:18 -0000 1.2
@@ -350,7 +350,7 @@
</fields>
<includes>
- <gdmlFile file="gdml/ecal_vacuum_flange_simple_v2.gdml" />
+ <gdmlFile file="gdml/ecal_vacuum_flange_simple_v3.gdml" />
<gdmlFile file="gdml/svt_chamber.gdml" />
</includes>
</lccdd>
hps-detectors/detectors/HPS-Proposal2014-v5-2pt2
diff -u -r1.1 -r1.2
--- HPS-Proposal2014-v5-2pt2.lcdd 3 Oct 2013 04:53:46 -0000 1.1
+++ HPS-Proposal2014-v5-2pt2.lcdd 9 Oct 2013 19:07:18 -0000 1.2
@@ -2,7 +2,7 @@
<lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
<header>
<detector name="HPS-Proposal2014-v5-2pt2" />
- <generator name="GeomConverter" version="1.0" file="detectors/HPS-Proposal2014-v5-2pt2/compact.xml" checksum="2994665176" />
+ <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v5-2pt2/compact.xml" checksum="3944271539" />
<author name="NONE" />
<comment>HPS detector for 2014 proposal @ 2.2GeV</comment>
</header>
@@ -1177,6 +1177,8 @@
<constant name="back_z" value="440.0" />
<constant name="chamber_x" value="-140.828" />
<constant name="chamber_z" value="225.0" />
+ <constant name="honeycomb_x" value="-210.0" />
+ <constant name="honeycomb_z" value="190.0" />
<constant name="ecal_flange_x" value="21.17" />
<constant name="ecal_flange_z" value="1318" />
</define>
@@ -1240,6 +1242,10 @@
<D value="2.7" />
<atom value="26.9815" />
</material>
+ <material Z="13" formula=" " name="Al_Honeycomb">
+ <D value="0.13" />
+ <atom value="26.9815" />
+ </material>
<element Z="26" formula="Fe" name="Iron">
<atom value="55.845" />
</element>
@@ -1415,6 +1421,7 @@
<position name="egap_inside_right_pos" unit="mm" x="-91.025-chamber_x" y="0" z="0" />
<rotation name="egap_inside_right_rot" unit="deg" x="0" y="-8.594" z="0" />
</subtraction>
+ <box lunit="mm" name="honeycomb_box" x="60" y="15.999" z="60" />
<box lunit="mm" name="WorldBox" x="80000" y="80000" z="80000" />
<box lunit="mm" name="svt_chamber_outer_box" x="454.152" y="203.2" z="1219.2" />
<trd lunit="mm" name="svt_chamber_outer_flare1" x1="454.152" x2="454.152" y1="203.2" y2="412.8008" z="384.622" />
@@ -1531,6 +1538,10 @@
<materialref ref="Aluminum" />
<solidref ref="chamber_minus_egap_right" />
</volume>
+ <volume name="honeycomb_vol">
+ <materialref ref="Al_Honeycomb" />
+ <solidref ref="honeycomb_box" />
+ </volume>
<volume name="svt_chamber_vol">
<materialref ref="Stainless_304" />
<solidref ref="svt_chamber" />
@@ -5443,6 +5454,10 @@
<volumeref ref="ecal_chamber_vol" />
<position name="ecal_chamber_pos" unit="mm" x="ecal_flange_x+chamber_x" y="0" z="ecal_flange_z+chamber_z" />
</physvol>
+ <physvol>
+ <volumeref ref="honeycomb_vol" />
+ <position name="honeycomb_pos" unit="mm" x="ecal_flange_x+honeycomb_x" y="0" z="ecal_flange_z+honeycomb_z" />
+ </physvol>
<visref ref="WorldVis" />
</volume>
</structure>
hps-detectors/detectors/HPS-Proposal2014-v5-6pt6
diff -u -r1.1 -r1.2
--- compact.xml 3 Oct 2013 04:53:46 -0000 1.1
+++ compact.xml 9 Oct 2013 19:07:18 -0000 1.2
@@ -350,7 +350,7 @@
</fields>
<includes>
- <gdmlFile file="gdml/ecal_vacuum_flange_simple_v2.gdml" />
+ <gdmlFile file="gdml/ecal_vacuum_flange_simple_v3.gdml" />
<gdmlFile file="gdml/svt_chamber.gdml" />
</includes>
</lccdd>
hps-detectors/detectors/HPS-Proposal2014-v5-6pt6
diff -u -r1.1 -r1.2
--- HPS-Proposal2014-v5-6pt6.lcdd 3 Oct 2013 04:53:46 -0000 1.1
+++ HPS-Proposal2014-v5-6pt6.lcdd 9 Oct 2013 19:07:18 -0000 1.2
@@ -2,7 +2,7 @@
<lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
<header>
<detector name="HPS-Proposal2014-v5-6pt6" />
- <generator name="GeomConverter" version="1.0" file="detectors/HPS-Proposal2014-v5-6pt6/compact.xml" checksum="2475535813" />
+ <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v5-6pt6/compact.xml" checksum="3404436910" />
<author name="NONE" />
<comment>HPS detector for 2014 proposal @ 6.6GeV</comment>
</header>
@@ -1177,6 +1177,8 @@
<constant name="back_z" value="440.0" />
<constant name="chamber_x" value="-140.828" />
<constant name="chamber_z" value="225.0" />
+ <constant name="honeycomb_x" value="-210.0" />
+ <constant name="honeycomb_z" value="190.0" />
<constant name="ecal_flange_x" value="21.17" />
<constant name="ecal_flange_z" value="1318" />
</define>
@@ -1240,6 +1242,10 @@
<D value="2.7" />
<atom value="26.9815" />
</material>
+ <material Z="13" formula=" " name="Al_Honeycomb">
+ <D value="0.13" />
+ <atom value="26.9815" />
+ </material>
<element Z="26" formula="Fe" name="Iron">
<atom value="55.845" />
</element>
@@ -1415,6 +1421,7 @@
<position name="egap_inside_right_pos" unit="mm" x="-91.025-chamber_x" y="0" z="0" />
<rotation name="egap_inside_right_rot" unit="deg" x="0" y="-8.594" z="0" />
</subtraction>
+ <box lunit="mm" name="honeycomb_box" x="60" y="15.999" z="60" />
<box lunit="mm" name="WorldBox" x="80000" y="80000" z="80000" />
<box lunit="mm" name="svt_chamber_outer_box" x="454.152" y="203.2" z="1219.2" />
<trd lunit="mm" name="svt_chamber_outer_flare1" x1="454.152" x2="454.152" y1="203.2" y2="412.8008" z="384.622" />
@@ -1531,6 +1538,10 @@
<materialref ref="Aluminum" />
<solidref ref="chamber_minus_egap_right" />
</volume>
+ <volume name="honeycomb_vol">
+ <materialref ref="Al_Honeycomb" />
+ <solidref ref="honeycomb_box" />
+ </volume>
<volume name="svt_chamber_vol">
<materialref ref="Stainless_304" />
<solidref ref="svt_chamber" />
@@ -5443,6 +5454,10 @@
<volumeref ref="ecal_chamber_vol" />
<position name="ecal_chamber_pos" unit="mm" x="ecal_flange_x+chamber_x" y="0" z="ecal_flange_z+chamber_z" />
</physvol>
+ <physvol>
+ <volumeref ref="honeycomb_vol" />
+ <position name="honeycomb_pos" unit="mm" x="ecal_flange_x+honeycomb_x" y="0" z="ecal_flange_z+honeycomb_z" />
+ </physvol>
<visref ref="WorldVis" />
</volume>
</structure>
hps-detectors/detectors
diff -u -r1.10 -r1.11
--- taglist.txt 6 Sep 2013 23:53:09 -0000 1.10
+++ taglist.txt 9 Oct 2013 19:07:18 -0000 1.11
@@ -5,6 +5,9 @@
HPS-Proposal2014-v4-2pt2
HPS-Proposal2014-v4-6pt6
HPS-Proposal2014-v4-fieldmap
+HPS-Proposal2014-v5-1pt1
+HPS-Proposal2014-v5-2pt2
+HPS-Proposal2014-v5-6pt6
HPS-TestRun-v1
HPS-TestRun-v2
HPS-TestRun-v3
hps-detectors/gdml
diff -N ecal_vacuum_flange_simple_v3.gdml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ecal_vacuum_flange_simple_v3.gdml 9 Oct 2013 19:07:18 -0000 1.1
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!--
+ ECal vacuum flange based on manufacturing drawings from Stepan.
+ Includes Al honeycomb in beam gap.
+ @author Sho Uemura <[log in to unmask]>
+ @version $Id: ecal_vacuum_flange_simple_v3.gdml,v 1.1 2013/10/09 19:07:18 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" >
+
+ <define>
+ <constant name="front_x" value="0.0"/>
+ <constant name="front_z" value="10.0"/>
+ <constant name="back_x" value="-147.505"/>
+ <constant name="back_z" value="440.0"/>
+ <constant name="chamber_x" value="-140.828"/>
+ <constant name="chamber_z" value="225.0"/>
+ <constant name="honeycomb_x" value="-210.0"/>
+ <constant name="honeycomb_z" value="190.0"/>
+ <constant name="ecal_flange_x" value="21.17"/>
+ <constant name="ecal_flange_z" value="1318"/>
+ </define>
+
+ <materials>
+ <material Z="1" name="G4_Galactic" state="gas">
+ <T unit="K" value="2.73"/>
+ <P unit="pascal" value="3e-18"/>
+ <!-- <MEE unit="eV" value="21.8"/> -->
+ <D unit="g/cm3" value="2e-25"/>
+ <atom unit="g/mole" value="1.01"/>
+ </material>
+ <material Z="13" formula=" " name="Aluminum" >
+ <D value="2.7" />
+ <atom value="26.9815" />
+ </material>
+ <material Z="13" formula=" " name="Al_Honeycomb" >
+ <D value="0.13" />
+ <atom value="26.9815" />
+ </material>
+ </materials>
+
+ <solids>
+ <eltube name="flange_egap_inside_tube" lunit="mm" dx="26.33" dy="26.33" dz="30"/>
+ <eltube name="flange_photontube_inside" lunit="mm" dx="11" dy="11" dz="30"/>
+
+ <box lunit="mm" name="front_flange_box" x="768.35" y="457.2" z="20"/>
+
+ <trap name="front_egap_trap" aunit="deg" lunit="mm" z="30" theta="-4.796" phi="0"
+ y1="52.66" x1="25.683" x2="25.683" alpha1="0"
+ y2="52.66" x3="29.716" x4="29.716" alpha2="0"/>
+ <trap name="front_chamber_trap" aunit="deg" lunit="mm" z="30" theta="-0.988" phi="0"
+ y1="16" x1="331.198" x2="331.198" alpha1="0"
+ y2="16" x3="334.064" x4="334.064" alpha2="0"/>
+
+ <subtraction name="front_minus_chamber">
+ <first ref="front_flange_box"/>
+ <second ref="front_chamber_trap"/>
+ <position name="front_chamber_pos" unit="mm" x="-146.309" y="0" z="0"/>
+ </subtraction>
+ <subtraction name="front_minus_photontube">
+ <first ref="front_minus_chamber"/>
+ <second ref="flange_photontube_inside"/>
+ <position name="front_photontube_pos" unit="mm" x="20.007" y="0" z="0"/>
+ <rotation name="front_photontube_rot" unit="deg" x="0" y="1.748" z="0"/>
+ </subtraction>
+ <subtraction name="front_minus_egap">
+ <first ref="front_minus_photontube"/>
+ <second ref="front_egap_trap"/>
+ <position name="front_egap_pos" unit="mm" x="-44.683" y="0" z="0"/>
+ </subtraction>
+ <subtraction name="front_minus_egapleft">
+ <first ref="front_minus_egap"/>
+ <second ref="flange_egap_inside_tube"/>
+ <position name="front_egapleft_pos" unit="mm" x="-30.833" y="0" z="0"/>
+ <rotation name="front_egapleft_rot" unit="deg" x="0" y="-0.956" z="0"/>
+ </subtraction>
+ <subtraction name="front_minus_egapright">
+ <first ref="front_minus_egapleft"/>
+ <second ref="flange_egap_inside_tube"/>
+ <position name="front_egapright_pos" unit="mm" x="-58.532" y="0" z="0"/>
+ <rotation name="front_egapright_rot" unit="deg" x="0" y="-8.594" z="0"/>
+ </subtraction>
+
+
+ <box lunit="mm" name="back_flange_box" x="505" y="160" z="20"/>
+
+ <trap name="back_egap_trap" aunit="deg" lunit="mm" z="30" theta="-4.796" phi="0"
+ y1="52.66" x1="83.493" x2="83.493" alpha1="0"
+ y2="52.66" x3="87.526" x4="87.526" alpha2="0"/>
+ <trap name="back_chamber_trap" aunit="deg" lunit="mm" z="30" theta="-0.988" phi="0"
+ y1="16" x1="372.279" x2="372.279" alpha1="0"
+ y2="16" x3="375.145" x4="375.145" alpha2="0"/>
+
+ <subtraction name="back_minus_chamber">
+ <first ref="back_flange_box"/>
+ <second ref="back_chamber_trap"/>
+ <position name="back_chamber_pos" unit="mm" x="-153.726-back_x" y="0" z="0"/>
+ </subtraction>
+ <subtraction name="back_minus_photontube">
+ <first ref="back_minus_chamber"/>
+ <second ref="flange_photontube_inside"/>
+ <position name="back_photontube_pos" unit="mm" x="33.130-back_x" y="0" z="0"/>
+ <rotation name="back_photontube_rot" unit="deg" x="0" y="1.748" z="0"/>
+ </subtraction>
+ <subtraction name="back_minus_egap">
+ <first ref="back_minus_photontube"/>
+ <second ref="back_egap_trap"/>
+ <position name="back_egap_pos" unit="mm" x="-80.763-back_x" y="0" z="0"/>
+ </subtraction>
+ <subtraction name="back_minus_egapleft">
+ <first ref="back_minus_egap"/>
+ <second ref="flange_egap_inside_tube"/>
+ <position name="back_egapleft_pos" unit="mm" x="-38.008-back_x" y="0" z="0"/>
+ <rotation name="back_egapleft_rot" unit="deg" x="0" y="-0.956" z="0"/>
+ </subtraction>
+ <subtraction name="back_minus_egapright">
+ <first ref="back_minus_egapleft"/>
+ <second ref="flange_egap_inside_tube"/>
+ <position name="back_egapright_pos" unit="mm" x="-123.518-back_x" y="0" z="0"/>
+ <rotation name="back_egapright_rot" unit="deg" x="0" y="-8.594" z="0"/>
+ </subtraction>
+
+
+
+ <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="300"/>
+
+ <subtraction name="chamber_trim1">
+ <first ref="chamber_trap"/>
+ <second ref="chamber_cutaway_box"/>
+ <position name="chamber_trim1_pos" unit="mm" x="0" y="16" z="-90"/>
+ </subtraction>
+ <subtraction name="chamber_trim2">
+ <first ref="chamber_trim1"/>
+ <second ref="chamber_cutaway_box"/>
+ <position name="chamber_trim2_pos" unit="mm" x="0" y="-16" z="-90"/>
+ </subtraction>
+
+
+ <eltube name="photontube_outside" lunit="mm" dx="13" dy="13" dz="235"/>
+
+ <union name="chamber_with_photontube">
+ <first ref="chamber_trim2"/>
+ <second ref="photontube_outside"/>
+ <position name="photontube_outside_pos" unit="mm" x="26.569-chamber_x" y="0" z="0"/>
+ <rotation name="photontube_outside_rot" unit="deg" x="0" y="1.748" z="0"/>
+ </union>
+
+
+ <trap name="egap_outside_trap_upper" aunit="deg" lunit="mm" z="450" theta="-4.796" phi="0"
+ y1="32.33" x1="106.912" 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.912" x1="52.344" alpha1="-0.269"
+ y2="32.33" x4="167.411" x3="112.843" alpha2="-0.269"/>
+ <union name="chamber_with_egap_upper">
+ <first ref="chamber_with_photontube"/>
+ <second ref="egap_outside_trap_upper"/>
+ <position name="egap_upper_pos" unit="mm" x="-63.810-chamber_x" y="16.165" z="0"/>
+ </union>
+ <union name="chamber_with_egap_lower">
+ <first ref="chamber_with_egap_upper"/>
+ <second ref="egap_outside_trap_lower"/>
+ <position name="egap_lower_pos" unit="mm" x="-63.810-chamber_x" y="-16.165" z="0"/>
+ </union>
+ <subtraction name="chamber_with_egap_trimtop">
+ <first ref="chamber_with_egap_lower"/>
+ <second ref="chamber_cutaway_box"/>
+ <position name="egap_trimtop_pos" unit="mm" x="0" y="34.33" z="-90"/>
+ </subtraction>
+ <subtraction name="chamber_with_egap_trimbot">
+ <first ref="chamber_with_egap_trimtop"/>
+ <second ref="chamber_cutaway_box"/>
+ <position name="egap_trimbot_pos" unit="mm" x="0" y="-34.33" z="-90"/>
+ </subtraction>
+
+ <box lunit="mm" name="chamber_end_box" x="768.35" y="457.2" z="50"/>
+
+ <subtraction name="chamber_outside_trim1">
+ <first ref="chamber_with_egap_trimbot"/>
+ <second ref="chamber_end_box"/>
+ <position name="outside_trim1_pos" unit="mm" x="0" y="0" z="-230"/>
+ </subtraction>
+ <subtraction name="chamber_outside_trim2">
+ <first ref="chamber_outside_trim1"/>
+ <second ref="chamber_end_box"/>
+ <position name="outside_trim2_pos" unit="mm" x="0" y="0" z="230"/>
+ </subtraction>
+
+
+ <eltube name="photontube_inside" lunit="mm" dx="11" dy="11" dz="235"/>
+
+ <subtraction name="chamber_minus_photontube">
+ <first ref="chamber_outside_trim2"/>
+ <second ref="photontube_inside"/>
+ <position name="photontube_inside_pos" unit="mm" x="26.569-chamber_x" y="0" z="0"/>
+ <rotation name="photontube_inside_rot" unit="deg" x="0" y="1.748" z="0"/>
+ </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"
+ y2="16" x3="374.667" x4="374.667" alpha2="0"/>
+
+ <subtraction name="chamber_minus_inside">
+ <first ref="chamber_minus_photontube"/>
+ <second ref="chamber_inside_trap"/>
+ <position name="chamber_inside_pos" unit="mm" x="-150.017-chamber_x" y="0" z="0"/>
+ </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"
+ y2="52.66" x3="86.854" x4="86.854" alpha2="0"/>
+
+ <subtraction name="chamber_minus_egapinside">
+ <first ref="chamber_minus_inside"/>
+ <second ref="egap_inside_trap"/>
+ <position name="egap_inside_pos" unit="mm" x="-62.723-chamber_x" y="0" z="0"/>
+ </subtraction>
+
+
+ <eltube name="egap_inside_tube" lunit="mm" dx="26.33" dy="26.33" dz="240"/>
+
+ <subtraction name="chamber_minus_egap_left">
+ <first ref="chamber_minus_egapinside"/>
+ <second ref="egap_inside_tube"/>
+ <position name="egap_inside_left_pos" unit="mm" x="-34.4205-chamber_x" y="0" z="0"/>
+ <rotation name="egap_inside_left_rot" unit="deg" x="0" y="-0.956" z="0"/>
+ </subtraction>
+ <subtraction name="chamber_minus_egap_right">
+ <first ref="chamber_minus_egap_left"/>
+ <second ref="egap_inside_tube"/>
+ <position name="egap_inside_right_pos" unit="mm" x="-91.025-chamber_x" y="0" z="0"/>
+ <rotation name="egap_inside_right_rot" unit="deg" x="0" y="-8.594" z="0"/>
+ </subtraction>
+
+ <box lunit="mm" name="honeycomb_box" x="60" y="15.999" z="60" />
+
+ <box lunit="mm" name="WorldBox" x="80000" y="80000" z="80000" />
+ </solids>
+
+ <structure>
+ <volume name="ecal_front_flange_vol">
+ <materialref ref="Aluminum"/>
+ <solidref ref="front_minus_egapright"/>
+ </volume>
+ <volume name="ecal_back_flange_vol">
+ <materialref ref="Aluminum"/>
+ <solidref ref="back_minus_egapright"/>
+ </volume>
+ <volume name="ecal_chamber_vol">
+ <materialref ref="Aluminum"/>
+ <solidref ref="chamber_minus_egap_right"/>
+ </volume>
+ <volume name="honeycomb_vol">
+ <materialref ref="Al_Honeycomb"/>
+ <solidref ref="honeycomb_box"/>
+ </volume>
+ <volume name="world_volume" >
+ <materialref ref="G4_Galactic" />
+ <solidref ref="WorldBox" />
+ <physvol>
+ <volumeref ref="ecal_front_flange_vol"/>
+ <position name="ecal_front_flange_pos" unit="mm" x="ecal_flange_x" y="0" z="ecal_flange_z+front_z"/>
+ </physvol>
+ <physvol>
+ <volumeref ref="ecal_back_flange_vol"/>
+ <position name="ecal_back_flange_pos" unit="mm" x="ecal_flange_x+back_x" y="0" z="ecal_flange_z+back_z"/>
+ </physvol>
+ <physvol>
+ <volumeref ref="ecal_chamber_vol"/>
+ <position name="ecal_chamber_pos" unit="mm" x="ecal_flange_x+chamber_x" y="0" z="ecal_flange_z+chamber_z"/>
+ </physvol>
+ <physvol>
+ <volumeref ref="honeycomb_vol"/>
+ <position name="honeycomb_pos" unit="mm" x="ecal_flange_x+honeycomb_x" y="0" z="ecal_flange_z+honeycomb_z"/>
+ </physvol>
+ </volume>
+ </structure>
+
+ <setup name="Default" version="1.0">
+ <world ref="world_volume"/>
+ </setup>
+
+</gdml>
hps-detectors/detectors/HPS-Proposal2014-v4-fieldmap
diff -u -r1.2 -r1.3
--- HPS-Proposal2014-v4-fieldmap.lcdd 6 Sep 2013 23:53:10 -0000 1.2
+++ HPS-Proposal2014-v4-fieldmap.lcdd 9 Oct 2013 19:07:18 -0000 1.3
@@ -2,7 +2,7 @@
<lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
<header>
<detector name="HPS-Proposal2014-v4-fieldmap" />
- <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v4-fieldmap/compact.xml" checksum="3393424375" />
+ <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v4-fieldmap/compact.xml" checksum="94465312" />
<author name="NONE" />
<comment>HPS detector for 2014 proposal @ 2.2GeV</comment>
</header>
@@ -5393,7 +5393,7 @@
</setup>
</gdml>
<fields>
- <field_map_3d name="HPSDipoleFieldMap3D" lunit="mm" funit="tesla" filename="fieldmap/HPS_b18d36_unfolded.dat" xoffset="0.0" yoffset="0.0" zoffset="0.0" />
+ <field_map_3d name="HPSDipoleFieldMap3D" lunit="mm" funit="tesla" filename="fieldmap/HPS_b18d36_unfolded.dat" xoffset="2.117" yoffset="0.0" zoffset="45.72" />
</fields>
</lcdd>
CVSspam 0.2.12