GeomConverter/test/org/lcsim/detector/converter/compact
diff -u -r1.3 -r1.4
--- SiTrackerEndcapConverterTest.java 5 Dec 2007 01:48:46 -0000 1.3
+++ SiTrackerEndcapConverterTest.java 22 May 2008 07:54:09 -0000 1.4
@@ -14,7 +14,7 @@
* COMMENT
*
* @author Jeremy McCormick
- * @version $Id: SiTrackerEndcapConverterTest.java,v 1.3 2007/12/05 01:48:46 jeremy Exp $
+ * @version $Id: SiTrackerEndcapConverterTest.java,v 1.4 2008/05/22 07:54:09 jeremy Exp $
*/
public class SiTrackerEndcapConverterTest
@@ -32,8 +32,9 @@
return new TestSuite(SiTrackerEndcapConverterTest.class);
}
+ // Location in testResources dir.
private static final String resource =
- "/org/lcsim/detector/db/SiTrackerEndcapTest00/compact.xml";
+ "/org/lcsim/detector/converter/compact/SiTrackerEndcapTest.xml";
public void setUp()
{
GeomConverter/testResources/org/lcsim/detector/converter/compact
diff -u -r1.7 -r1.8
--- SiTrackerEndcapTest.xml 21 Apr 2008 20:01:17 -0000 1.7
+++ SiTrackerEndcapTest.xml 22 May 2008 07:54:09 -0000 1.8
@@ -1,8 +1,8 @@
<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
- <info name="SiTrackerEndcapTest">
- <comment/>
+ <info name="SiTrackerEndcapTest01">
+ <comment>SiTrackerEndcapTest00 plus 5T mag field.</comment>
</info>
<define>
<constant name="cm" value="10"/>
@@ -15,15 +15,25 @@
</define>
<materials>
</materials>
+<!--
<display>
<vis name="TestVis" alpha="1.0" r="1.0" g="0.0" b="0.0" drawingStyle="wireframe" lineStyle="unbroken" showDaughters="true" visible="true"/>
</display>
+-->
<detectors>
- <detector id="1" name="SiTrackerEndcap" type="SiTrackerEndcap" readout="SiTrackerEndcap_RO" vis="TestVis">
+
+ <detector id="1" name="SiTrackerEndcap" type="SiTrackerEndcap" readout="SiTrackerEndcap_RO">
<module name="SiTrackerEndcapModule">
- <module_component thickness="2.0" material="Silicon" sensitive="true" />
- <module_component thickness="8.0" material="Air" />
+ <module_component thickness="0.1" material="Kapton" />
+ <module_component thickness="0.017" material="Silicon" />
+ <module_component thickness="0.3" material="Silicon" sensitive="true" />
+ <module_component thickness="0.228" material="CarbonFiber_50D" />
+ <module_component thickness="3.175" material="Rohacell31_50D" />
+ <module_component thickness="0.228" material="CarbonFiber_50D" />
+ <module_component thickness="0.3" material="Silicon" sensitive="true" />
+ <module_component thickness="0.017" material="Silicon" />
+ <module_component thickness="0.1" material="Kapton" />
</module>
<!-- Forward Tracker Layers -->
@@ -58,132 +68,20 @@
</detector>
</detectors>
+
<readouts>
<readout name="SiTrackerEndcap_RO">
- <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
+ <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:12</id>
</readout>
</readouts>
+
<fields>
+ <!-- field copied from sid01 -->
+ <field type="Solenoid"
+ name="GlobalSolenoid"
+ inner_field="5.0"
+ outer_field="-0.6"
+ zmax="1000"
+ outer_radius="(250.0+ 5.0 + 17.5 + 40./2.)*cm" />
</fields>
</lccdd>
-
-<!--
-
-Envelopes:
-
-layer 1
-innerRadius = 185 mm
-outerRadius = 482 mm
-innerZ = 626 mm
-thickness = 10 mm
-
-layer 2
-innerRadius = 185 mm
-outerRadius = 741 mm
-innerZ = 966 mm
-thickness = 10 mm
-
-layer 3
-innerRadius = 185 mm
-outerRadius = 999 mm
-innerZ = 1307 mm
-thickness = 10 mm
-
-layer 4
-innerRadius = 185 mm
-outerRadius = 1257 mm
-innerZ = 1648 mm
-thickness = 10 mm
-
-Support Disks, locations are in envelope coordinates
-
-layer 1:
-innerRadius = 185 mm
-outerRadius = 482 mm
-innerZ = 0 mm
-
-material = CarbonFiber
-thickness = 0.39 mm
-material = Rohacell31
-thickness = 12 mm
-material = CarbonFiber
-thickness = 0.39 mm
-
-layer 2:
-innerRadius = 185 mm
-outerRadius = 741 mm
-innerZ = 0 mm
-
-material = CarbonFiber
-thickness = 0.39 mm
-material = Rohacell31
-thickness = 12 mm
-material = CarbonFiber
-thickness = 0.39 mm
-
-layer 3:
-innerRadius = 185 mm
-outerRadius = 482 mm
-innerZ = 0 mm
-
-material = CarbonFiber
-thickness = 0.39 mm
-material = Rohacell31
-thickness = 12 mm
-material = CarbonFiber
-thickness = 0.39 mm
-
-layer 4:
-innerRadius = 185 mm
-outerRadius = 482 mm
-innerZ = 0 mm
-
-material = CarbonFiber
-thickness = 0.39 mm
-material = Rohacell31
-thickness = 12 mm
-material = CarbonFiber
-thickness = 0.39 mm
-
-Wedge Envelopes, locations relative to disk envelope coordinates
-
-Layer 1:
-dx1 = 24.355 mm
-dx2 = 62.893 mm
-dy1 = 10 mm
-dy2 = 10 mm
-dz = 292.720 mm
-
-r = 331.360 mm
-phi = i*PI/24; i=0,23
-
-
-Layer 2:
-dx1 = 24.355 mm
-dx2 = 96.595 mm
-dy1 = 10 mm
-dy2 = 10 mm
-dz = 548.720 mm
-
-r = 459.360 mm
-
-Layer 3:
-dx1 = 24.355 mm
-dx2 = 130.298 mm
-dy1 = 10 mm
-dy2 = 10 mm
-dz = 804.720 mm
-
-r = 587.360 mm
-
-Layer 4:
-dx1 = 24.355 mm
-dx2 = 164.000 mm
-dy1 = 10 mm
-dy2 = 10 mm
-dz = 1060.720
-
-r = 715.36 mm
-
--->
-