Print

Print


Commit in GeomConverter/testResources/org/lcsim on MAIN
detector/converter/compact/SiTrackerBarrelTest.xml+5-51.3 -> 1.4
geometry/subdetector/SiTrackerBarrelTest.xml+5-51.2 -> 1.3
+10-10
2 modified files
JM: correction to test files

GeomConverter/testResources/org/lcsim/detector/converter/compact
SiTrackerBarrelTest.xml 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SiTrackerBarrelTest.xml	7 Nov 2007 01:13:18 -0000	1.3
+++ SiTrackerBarrelTest.xml	3 Jul 2008 21:49:22 -0000	1.4
@@ -56,27 +56,27 @@
 	  <position z="2.692"/>
 	</module_component>
       </module>
-      <layer module="SiTrackerModule">
+      <layer module="SiTrackerModule" id="1">
 	<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">
+      <layer module="SiTrackerModule" id="2">
 	<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">
+      <layer module="SiTrackerModule" id="3">
 	<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">
+      <layer module="SiTrackerModule" id="4">
 	<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">
+      <layer module="SiTrackerModule" id="5">
 	<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"/>

GeomConverter/testResources/org/lcsim/geometry/subdetector
SiTrackerBarrelTest.xml 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SiTrackerBarrelTest.xml	7 Nov 2007 01:13:18 -0000	1.2
+++ SiTrackerBarrelTest.xml	3 Jul 2008 21:49:22 -0000	1.3
@@ -41,27 +41,27 @@
 	  <position z="2.692"/>
 	</module_component>
       </module>
-      <layer module="SiTrackerModule">
+      <layer module="SiTrackerModule" id="1">
 	<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">
+      <layer module="SiTrackerModule" id="2">
 	<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">
+      <layer module="SiTrackerModule" id="3">
 	<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">
+      <layer module="SiTrackerModule" id="4">
 	<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">
+      <layer module="SiTrackerModule" id="5">
 	<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"/>
CVSspam 0.2.8