hps-detectors/detectors/HPS-EcalTest-v1pt0
diff -u -r1.1 -r1.2
--- HPS-EcalTest-v1pt0.lcdd 16 May 2011 18:20:01 -0000 1.1
+++ HPS-EcalTest-v1pt0.lcdd 24 May 2011 19:15:57 -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-EcalTest-v1pt0" />
- <generator name="GeomConverter" version="1.0" file="./detectors/HPS-EcalTest-v1pt0/compact.xml" checksum="35066053" />
+ <generator name="GeomConverter" version="1.0" file="./detectors/HPS-EcalTest-v1pt0/compact.xml" checksum="2251097488" />
<author name="NONE" />
<comment>HPS ECal test detector</comment>
</header>
@@ -36,6 +36,9 @@
</idspec>
</iddict>
<sensitive_detectors>
+ <tracker name="Target" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TargetHits">
+ <idspecref ref="TargetHits" />
+ </tracker>
<tracker name="Tracker" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits">
<idspecref ref="TrackerHits" />
</tracker>
@@ -49,12 +52,6 @@
<region name="TrackingRegion" store_secondaries="true" cut="10.0" lunit="mm" threshold="1.0" eunit="MeV" />
</regions>
<display>
- <vis name="InvisibleWithDaughters" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="false">
- <color R="1.0" G="1.0" B="1.0" alpha="1.0" />
- </vis>
- <vis name="InvisibleNoDaughters" line_style="unbroken" drawing_style="wireframe" show_daughters="false" visible="false">
- <color R="1.0" G="1.0" B="1.0" alpha="1.0" />
- </vis>
<vis name="WorldVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="false">
<color R="1.0" G="1.0" B="1.0" alpha="1.0" />
</vis>
@@ -92,6 +89,12 @@
<constant name="tracking_region_zmax" value="500.0" />
<constant name="ecal_back" value="8.0" />
<constant name="SA" value="0.1" />
+ <position name="TungstenTargetVolume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
+ <rotation name="TungstenTargetVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+ <position name="Target_layer1_module0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
+ <rotation name="Target_layer1_module0_rotation" x="1.5707963267948966" y="0.0" z="-1.5707963267948966" unit="radian" />
+ <position name="Target_layer1_module0_reflect_position" x="0.0" y="0.0" z="-0.0" unit="mm" />
+ <rotation name="Target_layer1_module0_reflect_rotation" x="1.5707963267948966" y="0.0" z="-1.5707963267948966" unit="radian" />
<position name="Module1Volume_component0_position" x="0.0" y="-0.1" z="0.0" unit="mm" />
<rotation name="Module1Volume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
<position name="Module1Volume_component1_position" x="0.0" y="0.16" z="0.0" unit="mm" />
@@ -624,6 +627,12 @@
<D type="density" unit="g/cm3" value="0.00000001" />
<fraction n="1" ref="H" />
</material>
+ <material name="Tungsten">
+ <RL type="X0" unit="cm" value="0.350418" />
+ <NIL type="lambda" unit="cm" value="10.3057" />
+ <D type="density" unit="g/cm3" value="19.3" />
+ <composite n="1" ref="W" />
+ </material>
<element name="Si" formula="Si" Z="14">
<atom type="A" unit="g/mol" value="28.0854" />
</element>
@@ -658,6 +667,8 @@
<solids>
<box name="world_box" x="world_x" y="world_y" z="world_z" />
<tube name="tracking_cylinder" deltaphi="6.283185307179586" rmin="0.0" rmax="tracking_region_radius" z="2*tracking_region_zmax" />
+ <trd name="TungstenTargetTrd" x1="100.0" x2="100.0" y1="0.00438" y2="0.00438" z="100.0" />
+ <trd name="TungstenTargetVolume_component0_trd" x1="100.0" x2="100.0" y1="0.00438" y2="0.00438" z="100.0" />
<trd name="Module1Trd" x1="40.0" x2="40.0" y1="0.52" y2="0.52" z="100.0" />
<trd name="Module1Volume_component0_trd" x1="40.0" x2="40.0" y1="0.32" y2="0.32" z="100.0" />
<trd name="Module1Volume_component1_trd" x1="40.0" x2="40.0" y1="0.2" y2="0.2" z="100.0" />
@@ -665,6 +676,20 @@
<box name="ecal_env_box" x="809.6" y="88.0" z="176.0" />
</solids>
<structure>
+ <volume name="TungstenTargetVolume_component0">
+ <materialref ref="Tungsten" />
+ <solidref ref="TungstenTargetVolume_component0_trd" />
+ </volume>
+ <volume name="TungstenTargetVolume">
+ <materialref ref="Vacuum" />
+ <solidref ref="TungstenTargetTrd" />
+ <physvol>
+ <volumeref ref="TungstenTargetVolume_component0" />
+ <positionref ref="TungstenTargetVolume_component0_position" />
+ <rotationref ref="TungstenTargetVolume_component0_rotation" />
+ <physvolid field_name="component" value="0" />
+ </physvol>
+ </volume>
<volume name="Module1Volume_component0">
<materialref ref="Silicon" />
<solidref ref="Module1Volume_component0_trd" />
@@ -2309,12 +2334,29 @@
<physvolid field_name="ix" value="-23" />
<physvolid field_name="iy" value="5" />
</physvol>
- <visref ref="InvisibleWithDaughters" />
</volume>
<volume name="tracking_volume">
<materialref ref="Air" />
<solidref ref="tracking_cylinder" />
<physvol>
+ <volumeref ref="TungstenTargetVolume" />
+ <positionref ref="Target_layer1_module0_position" />
+ <rotationref ref="Target_layer1_module0_rotation" />
+ <physvolid field_name="system" value="12" />
+ <physvolid field_name="barrel" value="0" />
+ <physvolid field_name="layer" value="1" />
+ <physvolid field_name="module" value="0" />
+ </physvol>
+ <physvol>
+ <volumeref ref="TungstenTargetVolume" />
+ <positionref ref="Target_layer1_module0_reflect_position" />
+ <rotationref ref="Target_layer1_module0_reflect_rotation" />
+ <physvolid field_name="system" value="12" />
+ <physvolid field_name="barrel" value="0" />
+ <physvolid field_name="layer" value="1" />
+ <physvolid field_name="module" value="1" />
+ </physvol>
+ <physvol>
<volumeref ref="Module1Volume" />
<positionref ref="Tracker_layer1_module0_position" />
<rotationref ref="Tracker_layer1_module0_rotation" />
@@ -2527,7 +2569,7 @@
</setup>
</gdml>
<fields>
- <solenoid name="GlobalSolenoid" lunit="mm" funit="tesla" outer_radius="1014.4" inner_field="1.0" outer_field="1.0" zmax="177.8" zmin="-177.8" inner_radius="0.0" />
+ <solenoid name="GlobalSolenoid" lunit="mm" funit="tesla" outer_radius="1014.4" inner_field="-0.5" outer_field="-0.5" zmax="177.8" zmin="-177.8" inner_radius="0.0" />
</fields>
</lcdd>
hps-detectors/detectors/HPS-EcalTest-v1pt0
diff -u -r1.1 -r1.2
--- compact.xml 16 May 2011 18:10:32 -0000 1.1
+++ compact.xml 24 May 2011 19:15:57 -0000 1.2
@@ -86,6 +86,16 @@
<detectors>
+ <detector id="12" name="Target" type="SiTrackerFixedTarget2" readout="TargetHits" combineHits="true">
+ <module name="TungstenTarget">
+ <trd x1="5*cm" x2="5*cm" z="5*cm" />
+ <module_component thickness="0.3504*cm*0.00125" material = "Tungsten" sensitive="false"/>
+ </module>
+ <layer id="1">
+ <quadrant yStart="0" ny="1" yStep="modLength" zStart="0" nz="1" zStep="modWidth" phi0="0.0" x="0.0" dx="0.0*cm" module="TungstenTarget"/>
+ </layer>
+ </detector>
+
<detector id="11"
name="HPSEcalTest"
type="HPSEcal"
@@ -241,8 +251,8 @@
<fields>
<field type="Solenoid"
name="GlobalSolenoid"
- inner_field="1.0"
- outer_field="1.0"
+ inner_field="-0.5"
+ outer_field="-0.5"
zmax="17.78*cm"
inner_radius="0.0"
outer_radius="101.44*cm"
