Print

Print


Commit in GeomConverter/resources/org/lcsim/detector/db on MAIN
SiTrackerBarrelTest00/compact.xml-781.2 removed
                     /detector.properties-11.1 removed
SiTrackerBarrelTest01/compact.xml-851.2 removed
                     /detector.properties-11.1 removed
SiTrackerEndcapTest00/compact.xml-1991.3 removed
                     /detector.properties-11.1 removed
SiTrackerEndcapTest01/compact.xml-871.3 removed
                     /detector.properties-11.1 removed
SiTrackerTest00/compact.xml-1421.1 removed
               /detector.properties-11.1 removed
SiTrackerTest01/compact.xml-1481.3 removed
               /detector.properties-11.1 removed
-745
12 removed files
JM: moving test detectors out of geomconverter to lcdetectors

GeomConverter/resources/org/lcsim/detector/db/SiTrackerBarrelTest00
compact.xml removed after 1.2
diff -N compact.xml
--- compact.xml	12 Oct 2007 23:01:33 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-<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="SiTrackerBarrelTest00">
-    <comment/>
-  </info>
-  <define>
-    <constant name="cm" value="10"/>
-    <constant name="world_side" value="30000"/>
-    <constant name="world_x" value="world_side"/>
-    <constant name="world_y" value="world_side"/>
-    <constant name="world_z" value="world_side"/>
-    <constant name="tracking_region_radius" value="180.0 * cm"/>
-    <constant name="tracking_region_zmax" value="300.0 * cm"/>
-  </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="2" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrel_RO" vis="TestVis">
-      <module name="SiTrackerModule">
-	<module_envelope width="97.79" length="97.79" thickness="5.5"/>
-	<module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-	  <position z="-1.702"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="3.175" material="Rohacell31" sensitive="false">
-	  <position z="0.0"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-	  <position z="1.702"/>
-	</module_component>
-	<module_component width="92.031" length="92.031" thickness="0.3" material="Silicon" sensitive="true">
-	  <position z="2.082"/>
-	</module_component>
-	<module_component width="63.8" length="6.67" thickness="0.3" material="Silicon" sensitive="false">
-	  <position z="2.492"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="0.1" material="Kapton" sensitive="false">
-	  <position z="2.692"/>
-	</module_component>
-      </module>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="195.0" outer_r="245.0" z_length="267.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="16" phi0="0.196" rc="205.0" dr="0"/>
-	<z_layout dr="5.5" z0="218.0" nz="7"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="451.0" outer_r="501.0" z_length="608.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="36" phi0="0.087" rc="461.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="559.0" nz="15"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="706.0" outer_r="756.0" z_length="948.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="54" phi0="0.058" rc="716.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="899.0" nz="23"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="962.0" outer_r="1012.0" z_length="1289.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="72" phi0="0.0436" rc="972.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="1240.0" nz="29"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="1218.0" outer_r="1265.0" z_length="3260.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="90" phi0="0.01745" rc="1228.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="1581.0" nz="37"/>
-      </layer>
-    </detector>
-  </detectors>
-  <readouts>
-    <readout name="SiTrackerBarrel_RO">
-      <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
-    </readout>
-  </readouts>
-  <fields>
-  </fields>
-</lccdd>

GeomConverter/resources/org/lcsim/detector/db/SiTrackerBarrelTest00
detector.properties removed after 1.1
diff -N detector.properties
--- detector.properties	12 Sep 2007 18:33:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-name: SiTrackerBarrelTest00

GeomConverter/resources/org/lcsim/detector/db/SiTrackerBarrelTest01
compact.xml removed after 1.2
diff -N compact.xml
--- compact.xml	7 Dec 2007 23:22:30 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-<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="SiTrackerBarrelTest01">
-    <comment/>
-  </info>
-  <define>
-    <constant name="cm" value="10"/>
-    <constant name="world_side" value="30000"/>
-    <constant name="world_x" value="world_side"/>
-    <constant name="world_y" value="world_side"/>
-    <constant name="world_z" value="world_side"/>
-    <constant name="tracking_region_radius" value="180.0 * cm"/>
-    <constant name="tracking_region_zmax" value="300.0 * cm"/>
-  </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="2" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrel_RO" vis="TestVis">
-      <module name="SiTrackerModule">
-	<module_envelope width="97.79" length="97.79" thickness="5.5"/>
-	<module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-	  <position z="-1.702"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="3.175" material="Rohacell31" sensitive="false">
-	  <position z="0.0"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-	  <position z="1.702"/>
-	</module_component>
-	<module_component width="92.031" length="92.031" thickness="0.3" material="Silicon" sensitive="true">
-	  <position z="2.082"/>
-	</module_component>
-	<module_component width="63.8" length="6.67" thickness="0.3" material="Silicon" sensitive="false">
-	  <position z="2.492"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="0.1" material="Kapton" sensitive="false">
-	  <position z="2.692"/>
-	</module_component>
-      </module>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="195.0" outer_r="245.0" z_length="267.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="16" phi0="0.196" rc="205.0" dr="0"/>
-	<z_layout dr="5.5" z0="218.0" nz="7"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="451.0" outer_r="501.0" z_length="608.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="36" phi0="0.087" rc="461.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="559.0" nz="15"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="706.0" outer_r="756.0" z_length="948.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="54" phi0="0.058" rc="716.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="899.0" nz="23"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="962.0" outer_r="1012.0" z_length="1289.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="72" phi0="0.0436" rc="972.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="1240.0" nz="29"/>
-      </layer>
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="1218.0" outer_r="1265.0" z_length="3260.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="90" phi0="0.01745" rc="1228.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="1581.0" nz="37"/>
-      </layer>
-    </detector>
-  </detectors>
-  <readouts>
-    <readout name="SiTrackerBarrel_RO">
-      <id>system:6,barrel:3,layer:4,module:12,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>

GeomConverter/resources/org/lcsim/detector/db/SiTrackerBarrelTest01
detector.properties removed after 1.1
diff -N detector.properties
--- detector.properties	7 Dec 2007 23:14:19 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-name: SiTrackerBarrelTest00

GeomConverter/resources/org/lcsim/detector/db/SiTrackerEndcapTest00
compact.xml removed after 1.3
diff -N compact.xml
--- compact.xml	21 Apr 2008 20:01:18 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,199 +0,0 @@
-<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="SiTrackerEndcapTest00">
-    <comment/>
-  </info>
-  <define>
-    <constant name="cm" value="10"/>
-    <constant name="world_side" value="30000"/>
-    <constant name="world_x" value="world_side"/>
-    <constant name="world_y" value="world_side"/>
-    <constant name="world_z" value="world_side"/>
-    <constant name="tracking_region_radius" value="180.0 * cm"/>
-    <constant name="tracking_region_zmax" value="300.0 * cm"/>
-  </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">
-        
-        <module name="SiTrackerEndcapModule">
-            <module_component thickness="0.3"   material="Silicon" sensitive="true" />        
-<!--
-            <module_component thickness="0.1"   material="Kapton" />        
-            <module_component thickness="0.017" material="Silicon" />        
-            <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 -->       
-        <layer id="1" inner_r="28.531" outer_r="169.53" inner_z="206.225" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-            <module_parameters r_size="52.221" phi_size_max="50" />
-        </layer>
-<!--
-
-        <layer id="2" inner_r="75.831" outer_r="169.53" inner_z="540.677" thickness="10.0" nwedges="24">
-			<module_parameters r_size="52.221" phi_size_max="50" />
-        </layer>
-
-        <layer id="3" inner_r="117.309" outer_r="169.53" inner_z="831.761" thickness="10.0" nwedges="24">
-        	<module_parameters r_size="52.221" phi_size_max="50" />
-        </layer>        
-        
-        <layer id="4" inner_r="185.0" outer_r="478.0" inner_z="626.0" thickness="10.0" nwedges="24">
-            <module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
-
-        <layer id="5" inner_r="185.0" outer_r="734.0" inner_z="966.0" thickness="10.0" nwedges="24">
-			<module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
-
-        <layer id="6" inner_r="185.0" outer_r="990.0" inner_z="1307.0" thickness="10.0" nwedges="24">		
-        	<module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
-
-        <layer id="7" inner_r="185.0" outer_r="1246.0" inner_z="1648.0" thickness="10.0" nwedges="24">
-            <module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
--->
-                   
-    </detector>
-  </detectors>
-  <readouts>
-    <readout name="SiTrackerEndcap_RO">
-      <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:12</id>
-    </readout>
-  </readouts>
-  <fields>
-  </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
-
--->
-

GeomConverter/resources/org/lcsim/detector/db/SiTrackerEndcapTest00
detector.properties removed after 1.1
diff -N detector.properties
--- detector.properties	3 Dec 2007 23:50:49 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-name: SiTrackerEndcapTest00

GeomConverter/resources/org/lcsim/detector/db/SiTrackerEndcapTest01
compact.xml removed after 1.3
diff -N compact.xml
--- compact.xml	6 May 2008 20:06:20 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-<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="SiTrackerEndcapTest01">
-    <comment>SiTrackerEndcapTest00 plus 5T mag field.</comment>
-  </info>
-  <define>
-    <constant name="cm" value="10"/>
-    <constant name="world_side" value="30000"/>
-    <constant name="world_x" value="world_side"/>
-    <constant name="world_y" value="world_side"/>
-    <constant name="world_z" value="world_side"/>
-    <constant name="tracking_region_radius" value="180.0 * cm"/>
-    <constant name="tracking_region_zmax" value="300.0 * cm"/>
-  </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">
-        
-        <module name="SiTrackerEndcapModule">
-            <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 -->       
-        <layer id="1" inner_r="28.531" outer_r="169.53" inner_z="206.225" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-            <module_parameters r_size="52.221" phi_size_max="50" />
-        </layer>
-
-        <layer id="2" inner_r="75.831" outer_r="169.53" inner_z="540.677" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-			<module_parameters r_size="52.221" phi_size_max="50" />
-        </layer>
-
-        <layer id="3" inner_r="117.309" outer_r="169.53" inner_z="831.761" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-        	<module_parameters r_size="52.221" phi_size_max="50" />
-        </layer>        
-        
-        <!-- Endcap Tracker Layers -->
-        <layer id="4" inner_r="185.0" outer_r="478.0" inner_z="626.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-            <module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
-
-        <layer id="5" inner_r="185.0" outer_r="734.0" inner_z="966.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-			<module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
-
-        <layer id="6" inner_r="185.0" outer_r="990.0" inner_z="1307.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">		
-        	<module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
-
-        <layer id="7" inner_r="185.0" outer_r="1246.0" inner_z="1648.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-            <module_parameters r_size="85.333" phi_size_max="80" />
-        </layer>
-                   
-    </detector>
-  </detectors>
-
-  <readouts>
-    <readout name="SiTrackerEndcap_RO">
-      <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>

GeomConverter/resources/org/lcsim/detector/db/SiTrackerEndcapTest01
detector.properties removed after 1.1
diff -N detector.properties
--- detector.properties	7 Dec 2007 23:07:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-name: SiTrackerEndcapTest01

GeomConverter/resources/org/lcsim/detector/db/SiTrackerTest00
compact.xml removed after 1.1
diff -N compact.xml
--- compact.xml	4 Dec 2007 23:09:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,142 +0,0 @@
-<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="SiTrackerTest00">
-    <comment/>
-  </info>
-
-  <define>
-    <constant name="cm" value="10"/>
-    <constant name="world_side" value="30000"/>
-    <constant name="world_x" value="world_side"/>
-    <constant name="world_y" value="world_side"/>
-    <constant name="world_z" value="world_side"/>
-    <constant name="tracking_region_radius" value="180.0 * cm"/>
-    <constant name="tracking_region_zmax" value="300.0 * cm"/>
-  </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="2" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrel_RO" vis="TestVis">
-
-      <module name="SiTrackerModule">
-	<module_envelope width="97.79" length="97.79" thickness="5.5"/>
-	<module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-	  <position z="-1.702"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="3.175" material="Rohacell31" sensitive="false">
-	  <position z="0.0"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-	  <position z="1.702"/>
-	</module_component>
-	<module_component width="92.031" length="92.031" thickness="0.3" material="Silicon" sensitive="true">
-	  <position z="2.082"/>
-	</module_component>
-	<module_component width="63.8" length="6.67" thickness="0.3" material="Silicon" sensitive="false">
-	  <position z="2.492"/>
-	</module_component>
-	<module_component width="97.79" length="97.79" thickness="0.1" material="Kapton" sensitive="false">
-	  <position z="2.692"/>
-	</module_component>
-      </module>
-
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="195.0" outer_r="245.0" z_length="267.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="16" phi0="0.196" rc="205.0" dr="0"/>
-	<z_layout dr="5.5" z0="218.0" nz="7"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="451.0" outer_r="501.0" z_length="608.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="36" phi0="0.087" rc="461.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="559.0" nz="15"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="706.0" outer_r="756.0" z_length="948.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="54" phi0="0.058" rc="716.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="899.0" nz="23"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="962.0" outer_r="1012.0" z_length="1289.0 * 2.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="72" phi0="0.0436" rc="972.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="1240.0" nz="29"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-	<barrel_envelope inner_r="1218.0" outer_r="1265.0" z_length="3260.0"/>
-	<rphi_layout phi_tilt="0.19" nphi="90" phi0="0.01745" rc="1228.0" dr="0.0"/>
-	<z_layout dr="5.5" z0="1581.0" nz="37"/>
-      </layer>
-
-    </detector>
-
-    <detector id="1" name="SiTrackerEndcap" type="SiTrackerEndcap" readout="SiTrackerEndcap_RO" vis="TestVis">
-
-      <module name="SiTrackerEndcapModule">
-	<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 -->       
-      <layer id="1" inner_r="28.531" outer_r="169.53" inner_z="206.225" thickness="10.0" nwedges="24">
-	<module_parameters r_size="52.221" phi_size_max="50" />
-      </layer>
-
-      <layer id="2" inner_r="75.831" outer_r="169.53" inner_z="540.677" thickness="10.0" nwedges="24">
-	<module_parameters r_size="52.221" phi_size_max="50" />
-      </layer>
-
-      <layer id="3" inner_r="117.309" outer_r="169.53" inner_z="831.761" thickness="10.0" nwedges="24">
-	<module_parameters r_size="52.221" phi_size_max="50" />
-      </layer>        
-      
-      <!-- Endcap Tracker Layers -->
-      <layer id="4" inner_r="185.0" outer_r="478.0" inner_z="626.0" thickness="10.0" nwedges="24">
-	<module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-
-      <layer id="5" inner_r="185.0" outer_r="734.0" inner_z="966.0" thickness="10.0" nwedges="24">
-	<module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-
-      <layer id="6" inner_r="185.0" outer_r="990.0" inner_z="1307.0" thickness="10.0" nwedges="24">		
-	<module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-
-      <layer id="7" inner_r="185.0" outer_r="1246.0" inner_z="1648.0" thickness="10.0" nwedges="24">
-	<module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-      
-    </detector>
-
-  </detectors>
-
-  <readouts>
-
-    <readout name="SiTrackerBarrel_RO">
-      <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
-    </readout>
-
-    <readout name="SiTrackerEndcap_RO">
-      <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
-    </readout>
-
-  </readouts>
-  <fields>
-  </fields>
-</lccdd>

GeomConverter/resources/org/lcsim/detector/db/SiTrackerTest00
detector.properties removed after 1.1
diff -N detector.properties
--- detector.properties	4 Dec 2007 23:09:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-name: SiTrackerTest00

GeomConverter/resources/org/lcsim/detector/db/SiTrackerTest01
compact.xml removed after 1.3
diff -N compact.xml
--- compact.xml	23 Apr 2008 17:16:31 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,148 +0,0 @@
-<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="SiTrackerTest01">
-    <comment/>
-  </info>
-
-  <define>
-    <constant name="cm" value="10"/>
-    <constant name="world_side" value="30000"/>
-    <constant name="world_x" value="world_side"/>
-    <constant name="world_y" value="world_side"/>
-    <constant name="world_z" value="world_side"/>
-    <constant name="tracking_region_radius" value="180.0 * cm"/>
-    <constant name="tracking_region_zmax" value="300.0 * cm"/>
-  </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="2" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrel_RO" vis="TestVis">
-
-      <module name="SiTrackerModule">
-        <module_envelope width="97.79" length="97.79" thickness="5.5"/>
-        <module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-          <position z="-1.702"/>
-        </module_component>
-        <module_component width="97.79" length="97.79" thickness="3.175" material="Rohacell31" sensitive="false">
-          <position z="0.0"/>
-        </module_component>
-        <module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
-          <position z="1.702"/>
-        </module_component>
-        <module_component width="92.031" length="92.031" thickness="0.3" material="Silicon" sensitive="true">
-          <position z="2.082"/>
-        </module_component>
-        <module_component width="63.8" length="6.67" thickness="0.3" material="Silicon" sensitive="false">
-          <position z="2.492"/>
-        </module_component>
-        <module_component width="97.79" length="97.79" thickness="0.1" material="Kapton" sensitive="false">
-          <position z="2.692"/>
-        </module_component>
-      </module>
-
-      <layer module="SiTrackerModule">
-        <barrel_envelope inner_r="195.0" outer_r="245.0" z_length="267.0 * 2.0"/>
-        <rphi_layout phi_tilt="0.19" nphi="16" phi0="0.196" rc="205.0" dr="0"/>
-        <z_layout dr="5.5" z0="218.0" nz="7"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-        <barrel_envelope inner_r="451.0" outer_r="501.0" z_length="608.0 * 2.0"/>
-        <rphi_layout phi_tilt="0.19" nphi="36" phi0="0.087" rc="461.0" dr="0.0"/>
-        <z_layout dr="5.5" z0="559.0" nz="15"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-        <barrel_envelope inner_r="706.0" outer_r="756.0" z_length="948.0 * 2.0"/>
-        <rphi_layout phi_tilt="0.19" nphi="54" phi0="0.058" rc="716.0" dr="0.0"/>
-        <z_layout dr="5.5" z0="899.0" nz="23"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-        <barrel_envelope inner_r="962.0" outer_r="1012.0" z_length="1289.0 * 2.0"/>
-        <rphi_layout phi_tilt="0.19" nphi="72" phi0="0.0436" rc="972.0" dr="0.0"/>
-        <z_layout dr="5.5" z0="1240.0" nz="29"/>
-      </layer>
-
-      <layer module="SiTrackerModule">
-        <barrel_envelope inner_r="1218.0" outer_r="1265.0" z_length="3260.0"/>
-        <rphi_layout phi_tilt="0.19" nphi="90" phi0="0.01745" rc="1228.0" dr="0.0"/>
-        <z_layout dr="5.5" z0="1581.0" nz="37"/>
-      </layer>
-
-    </detector>
-
-    <detector id="1" name="SiTrackerEndcap" type="SiTrackerEndcap" readout="SiTrackerEndcap_RO" vis="TestVis">
-
-      <module name="SiTrackerEndcapModule">
-        <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 -->       
-      <layer id="1" inner_r="28.531" outer_r="169.53" inner_z="206.225" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-        <module_parameters r_size="52.221" phi_size_max="50" />
-      </layer>
-
-      <layer id="2" inner_r="75.831" outer_r="169.53" inner_z="540.677" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-        <module_parameters r_size="52.221" phi_size_max="50" />
-      </layer>
-
-      <layer id="3" inner_r="117.309" outer_r="169.53" inner_z="831.761" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-        <module_parameters r_size="52.221" phi_size_max="50" />
-      </layer>        
-      
-      <!-- Endcap Tracker Layers -->
-      <layer id="4" inner_r="185.0" outer_r="478.0" inner_z="626.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-        <module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-
-      <layer id="5" inner_r="185.0" outer_r="734.0" inner_z="966.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-        <module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-
-      <layer id="6" inner_r="185.0" outer_r="990.0" inner_z="1307.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">		
-        <module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-
-      <layer id="7" inner_r="185.0" outer_r="1246.0" inner_z="1648.0" thickness="10.0" nwedges="24" module="SiTrackerEndcapModule">
-        <module_parameters r_size="85.333" phi_size_max="80" />
-      </layer>
-      
-    </detector>
-
-  </detectors>
-
-  <readouts>
-
-    <readout name="SiTrackerBarrel_RO">
-      <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
-    </readout>
-
-    <readout name="SiTrackerEndcap_RO">
-      <id>system:6,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:12</id>
-    </readout>
-
-  </readouts>
-  <fields>
-    <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>

GeomConverter/resources/org/lcsim/detector/db/SiTrackerTest01
detector.properties removed after 1.1
diff -N detector.properties
--- detector.properties	9 Jan 2008 01:27:37 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-name: SiTrackerTest01
CVSspam 0.2.8