Print

Print


Commit in GeomConverter/testResources/org/lcsim/geometry/subdetector on MAIN
HPSTest.xml+120-1721.1 -> 1.2
correct bug in ID; set section volume invisible

GeomConverter/testResources/org/lcsim/geometry/subdetector
HPSTest.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- HPSTest.xml	14 Apr 2011 22:16:13 -0000	1.1
+++ HPSTest.xml	19 Apr 2011 22:04:17 -0000	1.2
@@ -2,8 +2,8 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
 	xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
 
-	<info name="HPS-Dedicated-v3.2">
-		<comment>Detector for a Dark Photon Search</comment>
+	<info name="HPSTest">
+		<comment>HPS test detector for GeomConverter including tracker and inner ECal</comment>
 	</info>
 
 	<define>
@@ -20,10 +20,9 @@
 		<constant name="SA" value="0.050" />
 
 		<!-- tracking region -->
-		<constant name="tracking_region_radius" value="1.0*mm" />
-		<constant name="tracking_region_min" value="0.0*cm" />
-		<constant name="tracking_region_zmax" value="1.0*mm" />
-
+		<constant name="tracking_region_radius" value="200.0*cm"/>
+        <constant name="tracking_region_min" value="5.0*cm"/>
+        <constant name="tracking_region_zmax" value="100.0*cm"/>	
 
 		<constant name="xCent1" value="10*cm" />
 		<constant name="xCent2" value="20*cm" />
@@ -54,8 +53,6 @@
 	</define>
 
 	<materials>
-	
-	<!-- 
 		<material name="Hybrid">
 			<D type="density" value="3.9" unit="g/cm3" />
 			<fraction n="0.01581" ref="Hydrogen" />
@@ -64,180 +61,131 @@
 			<fraction n="0.10564" ref="Aluminum" />
 			<fraction n="0.4398" ref="Silicon" />
 		</material>
-
-		<material name="Chip">
-			<D type="density" value="3.2" unit="g/cm3" />
-			<fraction n="0.039" ref="Aluminum" />
-			<fraction n="0.957" ref="Silicon" />
-			<fraction n="0.0016" ref="Tin" />
-			<fraction n="0.0024" ref="Lead" />
-		</material>
-
-		<material name="FlexCable">
-			<D type="density" value="10" unit="g/cm3" />
-			<fraction n="0.155088" ref="Hydrogen" />
-			<fraction n="0.356334" ref="Carbon" />
-			<fraction n="0.032555" ref="Nitrogen" />
-			<fraction n="0.0811049" ref="Oxygen" />
-			<fraction n="0.00738516" ref="Aluminum" />
-			<fraction n="0.0246423" ref="Silicon" />
-			<fraction n="0.0596088" ref="Titanium" />
-			<fraction n="0.00101926" ref="Nickel" />
-			<fraction n="0.219478" ref="Copper" />
-			<fraction n="0.00103413" ref="Ruthenium" />
-			<fraction n="0.0342783" ref="Palladium" />
-			<fraction n="0.000879186" ref="Silver" />
-			<fraction n="0.0186181" ref="Tin" />
-			<fraction n="0.00112464" ref="Gold" />
-			<fraction n="0.00685001" ref="Lead" />
-		</material>
-
-		<material name="Stave">
-			<D type="density" value="10" unit="g/cm3" />
-			<fraction n="0.0621474" ref="Hydrogen" />
-			<fraction n="0.700638" ref="Carbon" />
-			<fraction n="0.00422771" ref="Nitrogen" />
-			<fraction n="0.0332932" ref="Oxygen" />
-			<fraction n="0.0012558" ref="Fluorine" />
-			<fraction n="0.183551" ref="Aluminum" />
-			<fraction n="0.00801284" ref="Silicon" />
-			<fraction n="0.000420019" ref="Titanium" />
-			<fraction n="1.81336e-05" ref="Vanadium" />
-			<fraction n="4.62406e-05" ref="Chromium" />
-			<fraction n="0.000524621" ref="Manganese" />
-			<fraction n="0.000360016" ref="Iron" />
-			<fraction n="0.000115602" ref="Copper" />
-			<fraction n="0.00538952" ref="Zinc" />
-		</material>
-		 -->
-
 	</materials>
 
-
 	<detectors>
-		<!--
-			<detector id="0" name="Target" type="PolyconeSupport"
-			insideTrackingVolume="true"> <material name="Tungsten"/> <zplane
-			rmin="0" rmax="0.3504*cm*0.01/2" z="-10*cm" /> <zplane rmin="0"
-			rmax="0.3504*cm*0.01/2" z="10*cm" /> </detector>
-		-->
-		<detector id="13" name="HPSEcalTest" type="HPSEcal"
-			insideTrackingVolume="false">
-			<material name="Air" />
-			<dimensions x1="ecal_front" y1="ecal_front" x2="ecal_back"
-				y2="ecal_back" z="ecal_z" />
-			<layout beamgap="20.0*mm" nx="46" ny="5" dface="130.0*cm" />
-			<!-- <layout beamgap="20.0*mm" nx="4" ny="1" />-->
-		</detector>
-
-		<detector id="10" 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.0025"
-					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="1" name="Tracker" type="SiTrackerFixedTarget2"
-			readout="TrackerHits" combineHits="true" reflect="true">
-			<module name="Module1">
-				<trd x1="modWidth/2" x2="modWidth/2" z="modLength/2" />
-				<module_component thickness="0.032*cm" material="Silicon"
-					sensitive="true" />
-				<module_component thickness="0.02*cm" material="Carbon"
-					sensitive="false" />
-			</module>
-
-			<layer id="1">
-				<quadrant yStart="0" ny="1" yStep="modLength" zStart="(zgap1+modWidth)/2"
-					nz="1" zStep="modWidth" phi0="0.0" x="xCent1" dx="0.0*cm" module="Module1" />
-			</layer>
-			<layer id="2">
-				<quadrant yStart="-1*modWidth/2" ny="2" yStep="modWidth"
-					zStart="(zgap1+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
-					x="xCent1+zPlaneDist" dx="0.0*cm" module="Module1" />
-			</layer>
-
-
-			<layer id="3">
-				<quadrant yStart="0" ny="1" yStep="modLength" zStart="(zgap2+modWidth)/2"
-					nz="2" zStep="modWidth" phi0="0.0" x="xCent2" dx="0.0*cm" module="Module1" />
-			</layer>
-			<layer id="4">
-				<quadrant yStart="-1*modWidth" ny="3" yStep="modWidth"
-					zStart="(zgap2+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
-					x="xCent2+zPlaneDist" dx="0.0*cm" module="Module1" />
-			</layer>
-
-			<layer id="5">
-				<quadrant yStart="0" ny="1" yStep="modLength" zStart="(zgap3+modWidth)/2"
-					nz="2" zStep="modWidth" phi0="0.0" x="xCent3" dx="0.0*cm" module="Module1" />
-			</layer>
-			<layer id="6">
-				<quadrant yStart="-1*modWidth" ny="3" yStep="modWidth"
-					zStart="(zgap3+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
-					x="xCent3+zPlaneDist" dx="0.0*cm" module="Module1" />
-			</layer>
-
-
-
-			<layer id="7">
-				<quadrant yStart="-2*modWidth" ny="5" yStep="modWidth"
-					zStart="(zgap4+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0-SA"
-					x="xCent4" dx="0.0*cm" module="Module1" />
-			</layer>
-			<layer id="8">
-				<quadrant yStart="-2*modWidth" ny="5" yStep="modWidth"
-					zStart="(zgap4+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
-					x="xCent4+zPlaneDist" dx="0.0*cm" module="Module1" />
-			</layer>
-
-			<layer id="9">
-				<quadrant yStart="-3*modWidth" ny="7" yStep="modWidth"
-					zStart="(zgap5+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0+SA"
-					x="xCent5" dx="0.0*cm" module="Module1" />
-			</layer>
-			<layer id="10">
-				<quadrant yStart="-3*modWidth" ny="7" yStep="modWidth"
-					zStart="(zgap5+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
-					x="xCent5+zPlaneDist" dx="0.0*cm" module="Module1" />
-			</layer>
-
-
-			<layer id="11">
-				<quadrant yStart="-7*modWidth/2" ny="8" yStep="modWidth"
-					zStart="(zgap6+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0-SA"
-					x="xCent6" dx="0.0*cm" module="Module1" />
-			</layer>
-			<layer id="12">
-				<quadrant yStart="-7*modWidth/2" ny="8" yStep="modWidth"
-					zStart="(zgap6+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
-					x="xCent6+zPlaneDist" dx="0.0*cm" module="Module1" />
-			</layer>
+		<!-- TEST -->
+        <detector id="0" name="Target2" type="PolyconeSupport"
+                  insideTrackingVolume="true"> <material name="Hybrid"/> <zplane
+                  rmin="0" rmax="0.3504*cm*0.01/2" z="-10*cm" /> <zplane rmin="0"
+                  rmax="0.3504*cm*0.01/2" z="10*cm" /> </detector>
+        <detector id="13" name="HPSEcalTest" type="HPSEcal" insideTrackingVolume="false" readout="EcalHits">
+            <material name="Air" />
+            <dimensions x1="ecal_front" y1="ecal_front" x2="ecal_back"
+                        y2="ecal_back" z="ecal_z" />
+            <layout beamgap="20.0*mm" nx="46" ny="5" dface="130.0*cm" />
+            <!-- <layout beamgap="20.0*mm" nx="4" ny="1" />-->
+        </detector>
+        
+        <detector id="10" 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.0025"
+                                  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="1" name="Tracker" type="SiTrackerFixedTarget2"
+                  readout="TrackerHits" combineHits="true" reflect="true">
+            <module name="Module1">
+                <trd x1="modWidth/2" x2="modWidth/2" z="modLength/2" />
+                <module_component thickness="0.032*cm" material="Silicon"
+                                  sensitive="true" />
+                <module_component thickness="0.02*cm" material="Carbon"
+                                  sensitive="false" />
+            </module>
+            
+            <layer id="1">
+                <quadrant yStart="0" ny="1" yStep="modLength" zStart="(zgap1+modWidth)/2"
+                          nz="1" zStep="modWidth" phi0="0.0" x="xCent1" dx="0.0*cm" module="Module1" />
+            </layer>
+            <layer id="2">
+                <quadrant yStart="-1*modWidth/2" ny="2" yStep="modWidth"
+                          zStart="(zgap1+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
+                          x="xCent1+zPlaneDist" dx="0.0*cm" module="Module1" />
+            </layer>
+            
+            
+            <layer id="3">
+                <quadrant yStart="0" ny="1" yStep="modLength" zStart="(zgap2+modWidth)/2"
+                          nz="2" zStep="modWidth" phi0="0.0" x="xCent2" dx="0.0*cm" module="Module1" />
+            </layer>
+            <layer id="4">
+                <quadrant yStart="-1*modWidth" ny="3" yStep="modWidth"
+                          zStart="(zgap2+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
+                          x="xCent2+zPlaneDist" dx="0.0*cm" module="Module1" />
+            </layer>
+            
+            <layer id="5">
+                <quadrant yStart="0" ny="1" yStep="modLength" zStart="(zgap3+modWidth)/2"
+                          nz="2" zStep="modWidth" phi0="0.0" x="xCent3" dx="0.0*cm" module="Module1" />
+            </layer>
+            <layer id="6">
+                <quadrant yStart="-1*modWidth" ny="3" yStep="modWidth"
+                          zStart="(zgap3+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
+                          x="xCent3+zPlaneDist" dx="0.0*cm" module="Module1" />
+            </layer>
+            
+            
+            
+            <layer id="7">
+                <quadrant yStart="-2*modWidth" ny="5" yStep="modWidth"
+                          zStart="(zgap4+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0-SA"
+                          x="xCent4" dx="0.0*cm" module="Module1" />
+            </layer>
+            <layer id="8">
+                <quadrant yStart="-2*modWidth" ny="5" yStep="modWidth"
+                          zStart="(zgap4+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
+                          x="xCent4+zPlaneDist" dx="0.0*cm" module="Module1" />
+            </layer>
+            
+            <layer id="9">
+                <quadrant yStart="-3*modWidth" ny="7" yStep="modWidth"
+                          zStart="(zgap5+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0+SA"
+                          x="xCent5" dx="0.0*cm" module="Module1" />
+            </layer>
+            <layer id="10">
+                <quadrant yStart="-3*modWidth" ny="7" yStep="modWidth"
+                          zStart="(zgap5+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
+                          x="xCent5+zPlaneDist" dx="0.0*cm" module="Module1" />
+			</layer>
+
+
+            <layer id="11">
+                <quadrant yStart="-7*modWidth/2" ny="8" yStep="modWidth"
+                          zStart="(zgap6+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0-SA"
+                          x="xCent6" dx="0.0*cm" module="Module1" />
+			</layer>
+            <layer id="12">
+                <quadrant yStart="-7*modWidth/2" ny="8" yStep="modWidth"
+                          zStart="(zgap6+modLength)/2" nz="1" zStep="modLength" phi0="pi/2.0"
+                          x="xCent6+zPlaneDist" dx="0.0*cm" module="Module1" />
+            </layer>
 
 		</detector>
 
 	</detectors>
 
 	<readouts>
-		<readout name="TargetHits">
-			<id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12
-			</id>
-		</readout>
-		<readout name="TrackerHits">
-			<id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12
-			</id>
-		</readout>
-	</readouts>
-
+        <readout name="EcalHits">
+            <id>system:6,side:-2,layer:4,ix:9,iy:9</id>
+        </readout>
+        <readout name="TargetHits">
+            <id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12</id>
+        </readout>
+        <readout name="TrackerHits">
+            <id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12</id>
+        </readout>
+    </readouts>
+    
 	<!--
-		<fields> <field type="Dipole" name="AnalyzingDipole" zmin="15*cm"
+        <fields> <field type="Dipole" name="AnalyzingDipole" zmin="15*cm"
 		zmax="60*cm" rmax="20*cm"> <dipoleCoeff value="1.0"/> </field>
 		</fields>
 	-->
CVSspam 0.2.8