Author: [log in to unmask]
Date: Tue Mar 3 14:47:12 2015
New Revision: 2233
Log:
made tracking volume vacuum
Modified:
java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/HPS-ECalCommissioning-v2-fieldmap.lcdd
java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/compact.xml
Modified: java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/HPS-ECalCommissioning-v2-fieldmap.lcdd
=============================================================================
--- java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/HPS-ECalCommissioning-v2-fieldmap.lcdd (original)
+++ java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/HPS-ECalCommissioning-v2-fieldmap.lcdd Tue Mar 3 14:47:12 2015
@@ -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-ECalCommissioning-v2-fieldmap" />
- <generator name="GeomConverter" version="1.0" file="detectors/HPS-ECalCommissioning-v2-fieldmap/compact.xml" checksum="2656631129" />
+ <generator name="GeomConverter" version="1.0" file="detectors/HPS-ECalCommissioning-v2-fieldmap/compact.xml" checksum="3373452241" />
<author name="NONE" />
<comment>HPS ECal commissioning for pass2 with no SVT using a fieldmap scaled to By=-0.3309T</comment>
</header>
@@ -1239,14 +1239,8 @@
<constant name="ecal_flange_z" value="1318" />
</define>
<materials>
- <element Z="7" formula="N" name="N">
- <atom type="A" unit="g/mol" value="14.0068" />
- </element>
- <element Z="8" formula="O" name="O">
- <atom type="A" unit="g/mol" value="15.9994" />
- </element>
- <element Z="18" formula="Ar" name="Ar">
- <atom type="A" unit="g/mol" value="39.9477" />
+ <element Z="1" formula="H" name="H">
+ <atom type="A" unit="g/mol" value="1.00794" />
</element>
<element Z="82" formula="Pb" name="Pb">
<atom type="A" unit="g/mol" value="207.217" />
@@ -1254,28 +1248,26 @@
<element Z="74" formula="W" name="W">
<atom type="A" unit="g/mol" value="183.842" />
</element>
- <material name="Air">
- <D type="density" unit="g/cm3" value="0.0012" />
- <fraction n="0.754" ref="N" />
- <fraction n="0.234" ref="O" />
- <fraction n="0.012" ref="Ar" />
+ <element Z="8" formula="O" name="O">
+ <atom type="A" unit="g/mol" value="15.9994" />
+ </element>
+ <material name="Vacuum">
+ <D type="density" unit="g/cm3" value="0.00000001" />
+ <fraction n="1" ref="H" />
+ </material>
+ <material name="WorldMaterial">
+ <D type="density" unit="g/cm3" value="0.0000000000000001" />
+ <fraction n="1.0" ref="Vacuum" />
</material>
<material name="TrackingMaterial">
<D type="density" unit="g/cm3" value="0.0000000000000001" />
- <fraction n="1.0" ref="Air" />
+ <fraction n="1.0" ref="Vacuum" />
</material>
<material name="LeadTungstate">
<D value="8.28" unit="g/cm3" type="density" />
<composite n="1" ref="Pb" />
<composite n="1" ref="W" />
<composite n="4" ref="O" />
- </material>
- <element name="H" formula="H" Z="1">
- <atom type="A" unit="g/mol" value="1.00794" />
- </element>
- <material name="Vacuum">
- <D type="density" unit="g/cm3" value="0.00000001" />
- <fraction n="1" ref="H" />
</material>
<element name="Si" formula="Si" Z="14">
<atom type="A" unit="g/mol" value="28.0854" />
@@ -2067,7 +2059,7 @@
<visref ref="TrackingVis" />
</volume>
<volume name="world_volume">
- <materialref ref="Air" />
+ <materialref ref="WorldMaterial" />
<solidref ref="world_box" />
<physvol>
<volumeref ref="tracking_volume" />
Modified: java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/compact.xml
=============================================================================
--- java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/compact.xml (original)
+++ java/trunk/detector-data/detectors/HPS-ECalCommissioning-v2-fieldmap/compact.xml Tue Mar 3 14:47:12 2015
@@ -220,10 +220,15 @@
</define>
<materials>
+ <!-- Set the world material to vacuum. -->
+ <material name="WorldMaterial">
+ <D type="density" unit="g/cm3" value="0.0000000000000001"/>
+ <fraction n="1.0" ref="Vacuum" />
+ </material>
<!-- Set tracking material to vacuum. -->
<material name="TrackingMaterial">
<D type="density" unit="g/cm3" value="0.0000000000000001"/>
- <fraction n="1.0" ref="Air" />
+ <fraction n="1.0" ref="Vacuum" />
</material>
<!-- ECal crystal material. -->
<material name="LeadTungstate">
