8 modified files
GeomConverter/src/org/lcsim/detector
diff -u -r1.2 -r1.3
--- DetectorStore.java 17 Mar 2007 00:10:40 -0000 1.2
+++ DetectorStore.java 10 May 2007 07:55:15 -0000 1.3
@@ -4,6 +4,8 @@
import org.lcsim.detector.material.MaterialStore;
import org.lcsim.detector.solids.ISolidStore;
import org.lcsim.detector.solids.SolidStore;
+import org.lcsim.detector.identifier.IdentifierDictionaryManager;
+import org.lcsim.detector.identifier.IIdentifierDictionaryManager;
public class DetectorStore
implements IDetectorStore
@@ -48,8 +50,13 @@
{
return PhysicalVolumeNavigatorStore.getInstance();
}
+
+ public IIdentifierDictionaryManager getIdentifierDictionaryManager()
+ {
+ return IdentifierDictionaryManager.getInstance();
+ }
- public void reset()
+ public void clear()
{
getDetectorElementStore().clear();
getLogicalVolumeStore().clear();
@@ -57,6 +64,7 @@
getPhysicalVolumeNavigatorStore().clear();
getPhysicalVolumeStore().clear();
getSolidStore().clear();
+ getIdentifierDictionaryManager().clear();
}
}
GeomConverter/src/org/lcsim/detector
diff -u -r1.3 -r1.4
--- IDetectorStore.java 17 Mar 2007 00:10:40 -0000 1.3
+++ IDetectorStore.java 10 May 2007 07:55:15 -0000 1.4
@@ -11,4 +11,5 @@
public ISolidStore getSolidStore();
public IMaterialStore getMaterialStore();
public IDetectorElementStore getDetectorElementStore();
-}
\ No newline at end of file
+ public void clear();
+}
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.15 -r1.16
--- SiTrackerBarrelConverter.java 10 May 2007 00:12:24 -0000 1.15
+++ SiTrackerBarrelConverter.java 10 May 2007 07:55:15 -0000 1.16
@@ -502,7 +502,7 @@
// Set the sensor id for double-sided.
expId.addValue(sensorId);
-
+
// Get the identifier dictionary from the manager.
// Subdetector doesn't have this reference setup yet.
IIdentifierDictionary iddict =
GeomConverter/src/org/lcsim/detector/identifier
diff -u -r1.1 -r1.2
--- IIdentifierDictionaryManager.java 2 May 2007 01:58:19 -0000 1.1
+++ IIdentifierDictionaryManager.java 10 May 2007 07:55:15 -0000 1.2
@@ -3,11 +3,12 @@
* COMMENT
*
* @author Jeremy McCormick
- * @version $Id: IIdentifierDictionaryManager.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ * @version $Id: IIdentifierDictionaryManager.java,v 1.2 2007/05/10 07:55:15 jeremy Exp $
*/
public interface IIdentifierDictionaryManager
{
public IIdentifierDictionary getIdentifierDictionary(String name);
public void addIdentifierDictionary(IIdentifierDictionary dict);
-}
\ No newline at end of file
+ public void clear();
+}
GeomConverter/src/org/lcsim/detector/identifier
diff -u -r1.1 -r1.2
--- IdentifierDictionaryManager.java 2 May 2007 01:58:19 -0000 1.1
+++ IdentifierDictionaryManager.java 10 May 2007 07:55:15 -0000 1.2
@@ -7,7 +7,7 @@
* COMMENT
*
* @author Jeremy McCormick
- * @version $Id: IdentifierDictionaryManager.java,v 1.1 2007/05/02 01:58:19 jeremy Exp $
+ * @version $Id: IdentifierDictionaryManager.java,v 1.2 2007/05/10 07:55:15 jeremy Exp $
*/
public class IdentifierDictionaryManager
@@ -32,5 +32,10 @@
public static IIdentifierDictionaryManager getInstance()
{
return instance;
- }
-}
\ No newline at end of file
+ }
+
+ public void clear()
+ {
+ dicts.clear();
+ }
+}
GeomConverter/src/org/lcsim/geometry
diff -u -r1.8 -r1.9
--- GeometryReader.java 9 May 2007 00:59:58 -0000 1.8
+++ GeometryReader.java 10 May 2007 07:55:16 -0000 1.9
@@ -11,6 +11,7 @@
import org.lcsim.geometry.compact.Segmentation;
import org.lcsim.geometry.compact.Subdetector;
import org.lcsim.util.xml.ElementFactory.ElementCreationException;
+import org.lcsim.detector.DetectorStore;
/**
*
@@ -30,8 +31,8 @@
* Support added for detailed geometry representation.
* --JM, 15 March 2007
*
- * @author Tony Johnson <[log in to unmask]>
- * @author Jeremy McCormick <[log in to unmask]>
+ * @author Tony Johnson
+ * @author Jeremy McCormick
*/
public class GeometryReader extends CompactReader
{
@@ -47,6 +48,9 @@
// Build a compact description with support for specific types.
Detector detector = (Detector)super.read(in);
+ // Clear existing detector store.
+ DetectorStore.getInstance().clear();
+
// Build the detailed detector description.
DetectorConverter cnv = new DetectorConverter();
cnv.convert(
@@ -81,4 +85,4 @@
register(Field.class,"org.lcsim.geometry.field");
}
}
-}
\ No newline at end of file
+}
GeomConverter/test/org/lcsim/detector/converter/compact
diff -u -r1.4 -r1.5
--- SiTrackerBarrelTest.xml 9 Apr 2007 23:19:54 -0000 1.4
+++ SiTrackerBarrelTest.xml 10 May 2007 07:55:16 -0000 1.5
@@ -1,114 +1,78 @@
-<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="subdetectors_test">
- <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="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="93.531" length="93.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:2,layer:4,phi:8,z:8,sensor:1</id>
- </readout>
- <readout name="VtxBarrel_RO">
- <id>system:6,barrel:2,layer:4,phi:8,z:8,sensor:1</id>
- </readout>
- </readouts>
- <fields>
- </fields>
+<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="93.531" length="93.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</id>
+ </readout>
+ </readouts>
+ <fields>
+ </fields>
</lccdd>
-
- <!--
- <module_component width="97.79" length="97.79" thickness="0.1" material="Kapton" sensitive="false">
- <position z="-2.692"/>
- </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="93.031" length="93.031" thickness="0.3" material="Silicon" sensitive="true">
- <position z="-2.082"/>
- <rotation z="0.04" />
- </module_component>
- -->
-<!--
- <detector id="1" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrel_RO" vis="TestVis">
- <module name="MyModule">
- <module_envelope width="100.0" length="100.0" thickness="5.0"/>
- <module_component zc="-2.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="true"/>
- <module_component zc="-1.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="false"/>
- <module_component zc="0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="false"/>
- <module_component zc="1.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="false"/>
- <module_component zc="2.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="true">
- <rotation x="0.0"/>
- </module_component>
- </module>
- <layer module="MyModule">
- <barrel_envelope inner_r="900.0" outer_r="1100.0" z_length="1000.0" />
- <rphi_layout phi_tilt="0.2" nphi="50" phi0="0.2" rc="1000.0" />
- <z_layout dr="10" z0="450" nz="10"/>
- </layer>
- </detector>
- -->
GeomConverter/test/org/lcsim/geometry/subdetector
diff -u -r1.2 -r1.3
--- SiTrackerBarrelTest.xml 11 Oct 2006 00:08:35 -0000 1.2
+++ SiTrackerBarrelTest.xml 10 May 2007 07:55:16 -0000 1.3
@@ -1,166 +1,78 @@
-<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="subdetectors_test">
- <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="VtxBarrel" type="SiTrackerBarrel" readout="VtxBarrel_RO" vis="TestVis">
- <module name="VtxBarrelModuleInner">
- <module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
- <module_component width="7.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
- <position z="-0.08"/>
- </module_component>
- <module_component width="7.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
- <position z="0.075"/>
- </module_component>
- <module_component width="9.6" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
- <position z="0.150"/>
- </module_component>
- </module>
- <module name="VtxBarrelModuleOuter">
- <module_envelope width="14.0" length="126.0" thickness="0.6"/>
- <module_component width="11.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">
- <position z="-0.08"/>
- </module_component>
- <module_component width="11.6" length="125.0" thickness="0.05" material="Epoxy" sensitive="false">
- <position z="0.075"/>
- </module_component>
- <module_component width="13.8" length="125.0" thickness="0.1" material="Silicon" sensitive="true">
- <position z="0.150"/>
- </module_component>
- </module>
- <layer module="VtxBarrelModuleInner" id="1">
- <barrel_envelope inner_r="13.0" outer_r="17.0" z_length="63 * 2"/>
- <rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="15.05" dr="-1.15"/>
- <z_layout dr="0.0" z0="0.0" nz="1"/>
- </layer>
- <layer module="VtxBarrelModuleOuter" id="2">
- <barrel_envelope inner_r="21.0" outer_r="25.0" z_length="63 * 2"/>
- <rphi_layout phi_tilt="0.0" nphi="12" phi0="0.2618" rc="23.03" dr="-1.13"/>
- <z_layout dr="0.0" z0="0.0" nz="1"/>
- </layer>
- <layer module="VtxBarrelModuleOuter" id="3">
- <barrel_envelope inner_r="34.0" outer_r="38.0" z_length="63 * 2"/>
- <rphi_layout phi_tilt="0.0" nphi="18" phi0="0.0" rc="35.79" dr="-0.89"/>
- <z_layout dr="0.0" z0="0.0" nz="1"/>
- </layer>
- <layer module="VtxBarrelModuleOuter" id="4">
- <barrel_envelope inner_r="46.6" outer_r="50.6" z_length="63 * 2"/>
- <rphi_layout phi_tilt="0.0" nphi="24" phi0="0.1309" rc="47.5" dr="0.81"/>
- <z_layout dr="0.0" z0="0.0" nz="1"/>
- </layer>
- <layer module="VtxBarrelModuleOuter" id="5">
- <barrel_envelope inner_r="59.0" outer_r="63.0" z_length="63 * 2"/>
- <rphi_layout phi_tilt="0.0" nphi="30" phi0="0.0" rc="59.9" dr="0.77"/>
- <z_layout dr="0.0" z0="0.0" nz="1"/>
- </layer>
- </detector>
--->
- <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="93.531" length="93.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:2,layer:4,phi:8,z:8,sensor:1</id>
- </readout>
- <readout name="VtxBarrel_RO">
- <id>system:6,barrel:2,layer:4,phi:8,z:8,sensor:1</id>
- </readout>
- </readouts>
- <fields>
- </fields>
+<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="93.531" length="93.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</id>
+ </readout>
+ </readouts>
+ <fields>
+ </fields>
</lccdd>
-
- <!--
- <module_component width="97.79" length="97.79" thickness="0.1" material="Kapton" sensitive="false">
- <position z="-2.692"/>
- </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="93.031" length="93.031" thickness="0.3" material="Silicon" sensitive="true">
- <position z="-2.082"/>
- <rotation z="0.04" />
- </module_component>
- -->
-<!--
- <detector id="1" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrel_RO" vis="TestVis">
- <module name="MyModule">
- <module_envelope width="100.0" length="100.0" thickness="5.0"/>
- <module_component zc="-2.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="true"/>
- <module_component zc="-1.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="false"/>
- <module_component zc="0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="false"/>
- <module_component zc="1.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="false"/>
- <module_component zc="2.0" width="100" length="100" thickness="1.0" material="Silicon" sensitive="true">
- <rotation x="0.0"/>
- </module_component>
- </module>
- <layer module="MyModule">
- <barrel_envelope inner_r="900.0" outer_r="1100.0" z_length="1000.0" />
- <rphi_layout phi_tilt="0.2" nphi="50" phi0="0.2" rc="1000.0" />
- <z_layout dr="10" z0="450" nz="10"/>
- </layer>
- </detector>
- -->
CVSspam 0.2.8