Commit in hps-detectors/detectors/HPS-Proposal2014-v2 on MAIN
compact.xml+28-301.2 -> 1.3
HPS-Proposal2014-v2.lcdd+193-1511.2 -> 1.3
+221-181
2 modified files
v2 of the HPS detector for the 2014 proposal.  Includes two sensors across for layers 4,5,6...this time for real

hps-detectors/detectors/HPS-Proposal2014-v2
compact.xml 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- compact.xml	13 Nov 2012 22:20:49 -0000	1.2
+++ compact.xml	15 Nov 2012 02:38:59 -0000	1.3
@@ -243,21 +243,7 @@
                     <dimensions x="sensorLength" y="sensorWidth" /> 
                 </module_component>
                 <module_component thickness="0.0084*cm" material = "Carbon" sensitive="false"/> 
-            </module>  
-            <module name="LongModule">
-                <box x="longModuleLength" y="moduleWidth" />
-                <module_component thickness="0.032*cm" material = "Silicon" sensitive="true">
-                    <dimensions x="longSensorLength" y="sensorWidth" /> 
-                </module_component>
-                <module_component thickness="0.0084*cm" material = "Carbon" sensitive="false"/> 
-            </module>       
-            <module name="VerticalModule">
-                <box x="vertModLength" y="vertModWidth" />
-                <module_component thickness="0.032*cm" material = "Silicon" sensitive="true">
-                    <dimensions x="vertSensLength" y="vertSensWidth" /> 
-                </module_component>
-                <module_component thickness="0.0084*cm" material = "Carbon" sensitive="false"/> 
-            </module>     
+            </module>            
             <layer id="1">
                 <module_placement name="TestRunModule" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t+(pivot-z1t)*sin(x_rot_top_add)" z="z1t*cos(y_rot)-(x1t+x_off)*sin(y_rot)" rx="x_rot_top+x_rot_top_add" ry="-y_rot" rz="-PI/2-a1t"/>
                 <module_placement name="TestRunModule" id="1" x="z1b*sin(y_rot)+(x1b+x_off)*cos(y_rot)" y="y1b+(pivot-z1b)*sin(x_rot_bot_add)" z="z1b*cos(y_rot)-(x1b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a1b"/>
@@ -282,30 +268,42 @@
                 <module_placement name="TestRunModule" id="0" x="z6t*sin(y_rot)+(x6t+x_off)*cos(y_rot)" y="y6t+(pivot-z6t)*sin(x_rot_top_add)" z="z6t*cos(y_rot)-(x6t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a6t"/>
                 <module_placement name="TestRunModule" id="1" x="z6b*sin(y_rot)+(x6b+x_off)*cos(y_rot)" y="y6b+(pivot-z6b)*sin(x_rot_bot_add)" z="z6b*cos(y_rot)-(x6b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a6b"/>
             </layer>
-            <layer id="7">
-                <module_placement name="LongModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off)*cos(y_rot)" y="y7t+(pivot-z7t)*sin(x_rot_top_add)" z="z7t*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/>
-                <module_placement name="LongModule" id="1" x="z7b*sin(y_rot)+(x7b+x_off)*cos(y_rot)" y="y7b+(pivot-z7b)*sin(x_rot_bot_add)" z="z7b*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/>
+           <layer id="7">
+                <module_placement name="TestRunModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off-sensorLength/2)*cos(y_rot)" y="y7t+(pivot-z7t)*sin(x_rot_top_add)" z="(z7t+zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/>
+                <module_placement name="TestRunModule" id="1" x="z7b*sin(y_rot)+(x7b+x_off-sensorLength/2)*cos(y_rot)" y="y7b+(pivot-z7b)*sin(x_rot_bot_add)" z="(z7b+zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/>
+                <module_placement name="TestRunModule" id="2" x="z7t*sin(y_rot)+(x7t+x_off+sensorLength/2)*cos(y_rot)" y="y7t+(pivot-z7t)*sin(x_rot_top_add)" z="(z7t-zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/>
+                <module_placement name="TestRunModule" id="3" x="z7b*sin(y_rot)+(x7b+x_off+sensorLength/2)*cos(y_rot)" y="y7b+(pivot-z7b)*sin(x_rot_bot_add)" z="(z7b-zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/>
             </layer>
             <layer id="8">
-                <module_placement name="LongModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off)*cos(y_rot)" y="y8t+(pivot-z8t)*sin(x_rot_top_add)" z="z8t*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a8t"/>
-                <module_placement name="LongModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off)*cos(y_rot)" y="y8b+(pivot-z8b)*sin(x_rot_bot_add)" z="z8b*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>
+                <module_placement name="TestRunModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off-sensorLength/2)*cos(y_rot)" y="y8t+(pivot-z8t)*sin(x_rot_top_add)" z="(z8t+zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-SA2-a8t"/>
+                <module_placement name="TestRunModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off-sensorLength/2)*cos(y_rot)" y="y8b+(pivot-z8b)*sin(x_rot_bot_add)" z="(z8b+zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-a8b"/>
+                <module_placement name="TestRunModule" id="2" x="z8t*sin(y_rot)+(x8t+x_off+sensorLength/2)*cos(y_rot)" y="y8t+(pivot-z8t)*sin(x_rot_top_add)" z="(z8t-zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-SA2-a8t"/>
+                <module_placement name="TestRunModule" id="3" x="z8b*sin(y_rot)+(x8b+x_off+sensorLength/2)*cos(y_rot)" y="y8b+(pivot-z8b)*sin(x_rot_bot_add)" z="(z8b-zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-a8b"/>
             </layer>
               <layer id="9">
-                <module_placement name="LongModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off)*cos(y_rot)" y="y9t+(pivot-z9t)*sin(x_rot_top_add)" z="z9t*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/>
-                <module_placement name="LongModule" id="1" x="z9b*sin(y_rot)+(x9b+x_off)*cos(y_rot)" y="y9b+(pivot-z9b)*sin(x_rot_bot_add)" z="z9b*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/>
+                <module_placement name="TestRunModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off-sensorLength/2)*cos(y_rot)" y="y9t+(pivot-z9t)*sin(x_rot_top_add)" z="(z9t+zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/>
+                <module_placement name="TestRunModule" id="1" x="z9b*sin(y_rot)+(x9b+x_off-sensorLength/2)*cos(y_rot)" y="y9b+(pivot-z9b)*sin(x_rot_bot_add)" z="(z9b+zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/>
+                <module_placement name="TestRunModule" id="2" x="z9t*sin(y_rot)+(x9t+x_off+sensorLength/2)*cos(y_rot)" y="y9t+(pivot-z9t)*sin(x_rot_top_add)" z="(z9t-zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/>
+                <module_placement name="TestRunModule" id="3" x="z9b*sin(y_rot)+(x9b+x_off+sensorLength/2)*cos(y_rot)" y="y9b+(pivot-z9b)*sin(x_rot_bot_add)" z="(z9b-zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/>
             </layer>
             <layer id="10">
-                <module_placement name="LongModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off)*cos(y_rot)" y="y10t+(pivot-z10t)*sin(x_rot_top_add)" z="z10t*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a10t"/>
-                <module_placement name="LongModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off)*cos(y_rot)" y="y10b+(pivot-z10b)*sin(x_rot_bot_add)" z="z10b*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>
+    <module_placement name="TestRunModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off-sensorLength/2)*cos(y_rot)" y="y10t+(pivot-z10t)*sin(x_rot_top_add)" z="(z10t+zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-SA2-a10t"/>
+                <module_placement name="TestRunModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off-sensorLength/2)*cos(y_rot)" y="y10b+(pivot-z10b)*sin(x_rot_bot_add)" z="(z10b+zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-a10b"/>
+                <module_placement name="TestRunModule" id="2" x="z10t*sin(y_rot)+(x10t+x_off+sensorLength/2)*cos(y_rot)" y="y10t+(pivot-z10t)*sin(x_rot_top_add)" z="(z10t-zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-SA2-a10t"/>
+                <module_placement name="TestRunModule" id="3" x="z10b*sin(y_rot)+(x10b+x_off+sensorLength/2)*cos(y_rot)" y="y10b+(pivot-z10b)*sin(x_rot_bot_add)" z="(z10b-zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-a10b"/>
             </layer>
               <layer id="11">
-                <module_placement name="LongModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off)*cos(y_rot)" y="y11t+(pivot-z11t)*sin(x_rot_top_add)" z="z11t*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/>
-                <module_placement name="LongModule" id="1" x="z11b*sin(y_rot)+(x11b+x_off)*cos(y_rot)" y="y11b+(pivot-z11b)*sin(x_rot_bot_add)" z="z11b*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/>
-            </layer>
+    <module_placement name="TestRunModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off-sensorLength/2)*cos(y_rot)" y="y11t+(pivot-z11t)*sin(x_rot_top_add)" z="(z11t+zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/>
+                <module_placement name="TestRunModule" id="1" x="z11b*sin(y_rot)+(x11b+x_off-sensorLength/2)*cos(y_rot)" y="y11b+(pivot-z11b)*sin(x_rot_bot_add)" z="(z11b+zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/>
+                <module_placement name="TestRunModule" id="2" x="z11t*sin(y_rot)+(x11t+x_off+sensorLength/2)*cos(y_rot)" y="y11t+(pivot-z11t)*sin(x_rot_top_add)" z="(z11t-zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/>
+                <module_placement name="TestRunModule" id="3" x="z11b*sin(y_rot)+(x11b+x_off+sensorLength/2)*cos(y_rot)" y="y11b+(pivot-z11b)*sin(x_rot_bot_add)" z="(z11b-zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/>
+           </layer>
             <layer id="12">
-                <module_placement name="LongModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off)*cos(y_rot)" y="y12t+(pivot-z12t)*sin(x_rot_top_add)" z="z12t*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a12t"/>
-                <module_placement name="LongModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off)*cos(y_rot)" y="y12b+(pivot-z12b)*sin(x_rot_bot_add)" z="z12b*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
-            </layer>
+   <module_placement name="TestRunModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off-sensorLength/2)*cos(y_rot)" y="y12t+(pivot-z12t)*sin(x_rot_top_add)" z="(z12t+zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-SA2-a12t"/>
+                <module_placement name="TestRunModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off-sensorLength/2)*cos(y_rot)" y="y12b+(pivot-z12b)*sin(x_rot_bot_add)" z="(z12b+zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-a12b"/>
+                <module_placement name="TestRunModule" id="2" x="z12t*sin(y_rot)+(x12t+x_off+sensorLength/2)*cos(y_rot)" y="y12t+(pivot-z12t)*sin(x_rot_top_add)" z="(z12t-zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-SA2-a12t"/>
+                <module_placement name="TestRunModule" id="3" x="z12b*sin(y_rot)+(x12b+x_off+sensorLength/2)*cos(y_rot)" y="y12b+(pivot-z12b)*sin(x_rot_bot_add)" z="(z12b-zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-a12b"/>
+           </layer>
         </detector>     
         
        

hps-detectors/detectors/HPS-Proposal2014-v2
HPS-Proposal2014-v2.lcdd 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- HPS-Proposal2014-v2.lcdd	13 Nov 2012 22:20:49 -0000	1.2
+++ HPS-Proposal2014-v2.lcdd	15 Nov 2012 02:38:59 -0000	1.3
@@ -2,7 +2,7 @@
 <lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
   <header>
     <detector name="HPS-Proposal2014-v2" />
-    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v2/compact.xml" checksum="2634514331" />
+    <generator name="GeomConverter" version="1.0" file="/nfs/slac/g/hps/mgraham/DarkPhoton/hps-detectors/detectors/HPS-Proposal2014-v2/compact.xml" checksum="368184762" />
     <author name="NONE" />
     <comment>HPS detector for 2014 proposal @ 2.2GeV</comment>
   </header>
@@ -194,18 +194,6 @@
       <rotation name="TestRunModuleVolume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
       <position name="TestRunModuleVolume_component1_position" x="0.0" y="0.0" z="0.15999999999999998" unit="mm" />
       <rotation name="TestRunModuleVolume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
-      <position name="LongModuleVolume_component0_position" x="0.0" y="0.0" z="-0.04200000000000001" unit="mm" />
-      <rotation name="LongModuleVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
-      <position name="LongModuleVolume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />
-      <rotation name="LongModuleVolume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
-      <position name="LongModuleVolume_component1_position" x="0.0" y="0.0" z="0.15999999999999998" unit="mm" />
-      <rotation name="LongModuleVolume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
-      <position name="VerticalModuleVolume_component0_position" x="0.0" y="0.0" z="-0.04200000000000001" unit="mm" />
-      <rotation name="VerticalModuleVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
-      <position name="VerticalModuleVolume_component0Sensor0Position" x="0.0" y="0.0" z="0.0" unit="mm" />
-      <rotation name="VerticalModuleVolume_component0Sensor0Rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
-      <position name="VerticalModuleVolume_component1_position" x="0.0" y="0.0" z="0.15999999999999998" unit="mm" />
-      <rotation name="VerticalModuleVolume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
       <position name="Tracker_TestRunModule_layer1_module0_position" x="2.664050350484652" y="20.66989375063281" z="88.77503624741632" unit="mm" />
       <rotation name="Tracker_TestRunModule_layer1_module0_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
       <position name="Tracker_TestRunModule_layer1_module1_position" x="3.113982853522087" y="-20.66989375063281" z="103.76828675365114" unit="mm" />
@@ -230,30 +218,54 @@
       <rotation name="Tracker_TestRunModule_layer6_module0_rotation" x="0.0" y="3.1115926535900003" z="-4.812388980385" unit="radian" />
       <position name="Tracker_TestRunModule_layer6_module1_position" x="9.334149730513612" y="-23.669781251898428" z="311.0449772521787" unit="mm" />
       <rotation name="Tracker_TestRunModule_layer6_module1_rotation" x="0.0" y="3.1115926535900003" z="-4.7123889803850005" unit="radian" />
-      <position name="Tracker_LongModule_layer7_module0_position" x="14.662250431482915" y="26.669668753164046" z="488.59504974701133" unit="mm" />
-      <rotation name="Tracker_LongModule_layer7_module0_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_LongModule_layer7_module1_position" x="15.112182934520352" y="-26.669668753164046" z="503.58830025324613" unit="mm" />
-      <rotation name="Tracker_LongModule_layer7_module1_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_LongModule_layer8_module0_position" x="14.88331726797531" y="26.669668753164046" z="495.9617334957414" unit="mm" />
-      <rotation name="Tracker_LongModule_layer8_module0_rotation" x="0.0" y="3.1115926535900003" z="-4.762388980385" unit="radian" />
-      <position name="Tracker_LongModule_layer8_module1_position" x="15.333249771012744" y="-26.669668753164046" z="510.9549840019762" unit="mm" />
-      <rotation name="Tracker_LongModule_layer8_module1_rotation" x="0.0" y="3.1115926535900003" z="-4.7123889803850005" unit="radian" />
-      <position name="Tracker_LongModule_layer9_module0_position" x="20.66135047198205" y="29.669556254429665" z="688.505056496809" unit="mm" />
-      <rotation name="Tracker_LongModule_layer9_module0_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_LongModule_layer9_module1_position" x="21.111282975019485" y="-29.669556254429665" z="703.4983070030437" unit="mm" />
-      <rotation name="Tracker_LongModule_layer9_module1_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_LongModule_layer10_module0_position" x="20.88241730847444" y="29.669556254429665" z="695.8717402455388" unit="mm" />
-      <rotation name="Tracker_LongModule_layer10_module0_rotation" x="0.0" y="3.1115926535900003" z="-4.762388980385" unit="radian" />
-      <position name="Tracker_LongModule_layer10_module1_position" x="21.332349811511875" y="-29.669556254429665" z="710.8649907517737" unit="mm" />
-      <rotation name="Tracker_LongModule_layer10_module1_rotation" x="0.0" y="3.1115926535900003" z="-4.7123889803850005" unit="radian" />
-      <position name="Tracker_LongModule_layer11_module0_position" x="26.660450512481184" y="32.66944375569528" z="888.4150632466065" unit="mm" />
-      <rotation name="Tracker_LongModule_layer11_module0_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_LongModule_layer11_module1_position" x="27.110383015518618" y="-32.66944375569528" z="903.4083137528412" unit="mm" />
-      <rotation name="Tracker_LongModule_layer11_module1_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_LongModule_layer12_module0_position" x="26.88151734897357" y="32.66944375569528" z="895.7817469953363" unit="mm" />
-      <rotation name="Tracker_LongModule_layer12_module0_rotation" x="0.0" y="3.1115926535900003" z="-4.762388980385" unit="radian" />
-      <position name="Tracker_LongModule_layer12_module1_position" x="27.331449852011005" y="-32.66944375569528" z="910.7749975015712" unit="mm" />
-      <rotation name="Tracker_LongModule_layer12_module1_rotation" x="0.0" y="3.1115926535900003" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer7_module0_position" x="-34.48062697778605" y="26.669668753164046" z="489.59459978076035" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer7_module0_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer7_module1_position" x="-34.030694474748614" y="-26.669668753164046" z="504.58785028699515" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer7_module1_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer7_module2_position" x="63.80512784075189" y="26.669668753164046" z="487.59549971326237" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer7_module2_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer7_module3_position" x="64.25506034378932" y="-26.669668753164046" z="502.5887502194972" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer7_module3_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module0_position" x="-34.25956014129366" y="26.669668753164046" z="496.9612835294904" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module1_position" x="-33.809627638256224" y="-26.669668753164046" z="511.95453403572515" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module2_position" x="64.02619467724428" y="26.669668753164046" z="494.9621834619924" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module2_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module3_position" x="64.47612718028171" y="-26.669668753164046" z="509.9554339682272" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module3_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer9_module0_position" x="-28.48152693728692" y="29.669556254429665" z="689.5046065305579" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer9_module0_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer9_module1_position" x="-28.031594434249484" y="-29.669556254429665" z="704.4978570367928" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer9_module1_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer9_module2_position" x="69.80422788125102" y="29.669556254429665" z="687.5055064630599" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer9_module2_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer9_module3_position" x="70.25416038428845" y="-29.669556254429665" z="702.4987569692947" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer9_module3_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module0_position" x="-28.26046010079453" y="29.669556254429665" z="696.8712902792878" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module1_position" x="-27.810527597757094" y="-29.669556254429665" z="711.8645407855226" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module2_position" x="70.0252947177434" y="29.669556254429665" z="694.8721902117899" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module2_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module3_position" x="70.47522722078085" y="-29.669556254429665" z="709.8654407180246" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module3_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer11_module0_position" x="-22.482426896787786" y="32.66944375569528" z="889.4146132803554" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer11_module0_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer11_module1_position" x="-22.03249439375035" y="-32.66944375569528" z="904.4078637865903" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer11_module1_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer11_module2_position" x="75.80332792175015" y="32.66944375569528" z="887.4155132128574" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer11_module2_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer11_module3_position" x="76.25326042478758" y="-32.66944375569528" z="902.4087637190922" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer11_module3_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module0_position" x="-22.2613600602954" y="32.66944375569528" z="896.7812970290853" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module0_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module1_position" x="-21.811427557257964" y="-32.66944375569528" z="911.7745475353202" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module1_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module2_position" x="76.02439475824254" y="32.66944375569528" z="894.7821969615874" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="-0.03" z="-1.620796326795" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module3_position" x="76.47432726127997" y="-32.66944375569528" z="909.7754474678221" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="-0.03" z="-1.570796326795" unit="radian" />
       <position name="crystal1-1_pos_pos_bot" x="7.524739275395541" y="-27.67473927539554" z="1450.1626281236922" unit="mm" />
       <rotation name="crystal1-1_rot_pos_bot" x="-0.0084372997827221" y="-0.0084372997827221" z="0.0" unit="radian" />
       <position name="crystal1-1_pos_neg_bot" x="-7.524739275395541" y="-27.67473927539554" z="1450.1626281236922" unit="mm" />
@@ -2069,14 +2081,6 @@
       <box name="TestRunModuleVolume_component0Box" x="40.34" y="100.0" z="0.32" />
       <box name="TestRunModuleVolume_component0Sensor0Box" x="38.3399" y="98.33" z="0.32" />
       <box name="TestRunModuleVolume_component1Box" x="40.34" y="100.0" z="0.08399999999999999" />
-      <box name="LongModuleBox" x="40.34" y="200.0" z="0.404" />
-      <box name="LongModuleVolume_component0Box" x="40.34" y="200.0" z="0.32" />
-      <box name="LongModuleVolume_component0Sensor0Box" x="38.3399" y="196.66" z="0.32" />
-      <box name="LongModuleVolume_component1Box" x="40.34" y="200.0" z="0.08399999999999999" />
-      <box name="VerticalModuleBox" x="40.34" y="40.34" z="0.404" />
-      <box name="VerticalModuleVolume_component0Box" x="40.34" y="40.34" z="0.32" />
-      <box name="VerticalModuleVolume_component0Sensor0Box" x="38.3399" y="38.3399" z="0.32" />
-      <box name="VerticalModuleVolume_component1Box" x="40.34" y="40.34" z="0.08399999999999999" />
       <trd name="crystal_trap" x1="13.3" x2="16.0" y1="13.3" y2="16.0" z="160.0" />
       <box lunit="mm" name="WorldBox" x="1570.55" y="1250.62" z="884.4" />
       <tessellated name="split_0" lunit="mm">
@@ -3810,76 +3814,6 @@
           <physvolid field_name="component" value="1" />
         </physvol>
       </volume>
-      <volume name="LongModuleVolume_component0Sensor0">
-        <materialref ref="Silicon" />
-        <solidref ref="LongModuleVolume_component0Sensor0Box" />
-        <sdref ref="Tracker" />
-      </volume>
-      <volume name="LongModuleVolume_component0">
-        <materialref ref="Silicon" />
-        <solidref ref="LongModuleVolume_component0Box" />
-        <physvol>
-          <volumeref ref="LongModuleVolume_component0Sensor0" />
-          <positionref ref="LongModuleVolume_component0Sensor0Position" />
-          <rotationref ref="LongModuleVolume_component0Sensor0Rotation" />
-          <physvolid field_name="sensor" value="0" />
-        </physvol>
-      </volume>
-      <volume name="LongModuleVolume_component1">
-        <materialref ref="Carbon" />
-        <solidref ref="LongModuleVolume_component1Box" />
-      </volume>
-      <volume name="LongModuleVolume">
-        <materialref ref="Vacuum" />
-        <solidref ref="LongModuleBox" />
-        <physvol>
-          <volumeref ref="LongModuleVolume_component0" />
-          <positionref ref="LongModuleVolume_component0_position" />
-          <rotationref ref="LongModuleVolume_component0_rotation" />
-          <physvolid field_name="component" value="0" />
-        </physvol>
-        <physvol>
-          <volumeref ref="LongModuleVolume_component1" />
-          <positionref ref="LongModuleVolume_component1_position" />
-          <rotationref ref="LongModuleVolume_component1_rotation" />
-          <physvolid field_name="component" value="1" />
-        </physvol>
-      </volume>
-      <volume name="VerticalModuleVolume_component0Sensor0">
-        <materialref ref="Silicon" />
-        <solidref ref="VerticalModuleVolume_component0Sensor0Box" />
-        <sdref ref="Tracker" />
-      </volume>
-      <volume name="VerticalModuleVolume_component0">
-        <materialref ref="Silicon" />
-        <solidref ref="VerticalModuleVolume_component0Box" />
-        <physvol>
-          <volumeref ref="VerticalModuleVolume_component0Sensor0" />
-          <positionref ref="VerticalModuleVolume_component0Sensor0Position" />
-          <rotationref ref="VerticalModuleVolume_component0Sensor0Rotation" />
-          <physvolid field_name="sensor" value="0" />
-        </physvol>
-      </volume>
-      <volume name="VerticalModuleVolume_component1">
-        <materialref ref="Carbon" />
-        <solidref ref="VerticalModuleVolume_component1Box" />
-      </volume>
-      <volume name="VerticalModuleVolume">
-        <materialref ref="Vacuum" />
-        <solidref ref="VerticalModuleBox" />
-        <physvol>
-          <volumeref ref="VerticalModuleVolume_component0" />
-          <positionref ref="VerticalModuleVolume_component0_position" />
-          <rotationref ref="VerticalModuleVolume_component0_rotation" />
-          <physvolid field_name="component" value="0" />
-        </physvol>
-        <physvol>
-          <volumeref ref="VerticalModuleVolume_component1" />
-          <positionref ref="VerticalModuleVolume_component1_position" />
-          <rotationref ref="VerticalModuleVolume_component1_rotation" />
-          <physvolid field_name="component" value="1" />
-        </physvol>
-      </volume>
       <volume name="crystal_volume">
         <materialref ref="LeadTungstate" />
         <solidref ref="crystal_trap" />
@@ -4002,113 +3936,221 @@
           <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer7_module0_position" />
-          <rotationref ref="Tracker_LongModule_layer7_module0_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer7_module0_position" />
+          <rotationref ref="Tracker_TestRunModule_layer7_module0_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="7" />
           <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer7_module1_position" />
-          <rotationref ref="Tracker_LongModule_layer7_module1_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer7_module1_position" />
+          <rotationref ref="Tracker_TestRunModule_layer7_module1_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="7" />
           <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer8_module0_position" />
-          <rotationref ref="Tracker_LongModule_layer8_module0_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer7_module2_position" />
+          <rotationref ref="Tracker_TestRunModule_layer7_module2_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="7" />
+          <physvolid field_name="module" value="2" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer7_module3_position" />
+          <rotationref ref="Tracker_TestRunModule_layer7_module3_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="7" />
+          <physvolid field_name="module" value="3" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer8_module0_position" />
+          <rotationref ref="Tracker_TestRunModule_layer8_module0_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="8" />
           <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer8_module1_position" />
-          <rotationref ref="Tracker_LongModule_layer8_module1_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer8_module1_position" />
+          <rotationref ref="Tracker_TestRunModule_layer8_module1_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="8" />
           <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer9_module0_position" />
-          <rotationref ref="Tracker_LongModule_layer9_module0_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer8_module2_position" />
+          <rotationref ref="Tracker_TestRunModule_layer8_module2_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="8" />
+          <physvolid field_name="module" value="2" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer8_module3_position" />
+          <rotationref ref="Tracker_TestRunModule_layer8_module3_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="8" />
+          <physvolid field_name="module" value="3" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer9_module0_position" />
+          <rotationref ref="Tracker_TestRunModule_layer9_module0_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="9" />
           <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer9_module1_position" />
-          <rotationref ref="Tracker_LongModule_layer9_module1_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer9_module1_position" />
+          <rotationref ref="Tracker_TestRunModule_layer9_module1_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="9" />
           <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer10_module0_position" />
-          <rotationref ref="Tracker_LongModule_layer10_module0_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer9_module2_position" />
+          <rotationref ref="Tracker_TestRunModule_layer9_module2_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="9" />
+          <physvolid field_name="module" value="2" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer9_module3_position" />
+          <rotationref ref="Tracker_TestRunModule_layer9_module3_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="9" />
+          <physvolid field_name="module" value="3" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer10_module0_position" />
+          <rotationref ref="Tracker_TestRunModule_layer10_module0_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="10" />
           <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer10_module1_position" />
-          <rotationref ref="Tracker_LongModule_layer10_module1_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer10_module1_position" />
+          <rotationref ref="Tracker_TestRunModule_layer10_module1_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="10" />
           <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer11_module0_position" />
-          <rotationref ref="Tracker_LongModule_layer11_module0_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer10_module2_position" />
+          <rotationref ref="Tracker_TestRunModule_layer10_module2_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="10" />
+          <physvolid field_name="module" value="2" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer10_module3_position" />
+          <rotationref ref="Tracker_TestRunModule_layer10_module3_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="10" />
+          <physvolid field_name="module" value="3" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer11_module0_position" />
+          <rotationref ref="Tracker_TestRunModule_layer11_module0_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="11" />
           <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer11_module1_position" />
-          <rotationref ref="Tracker_LongModule_layer11_module1_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer11_module1_position" />
+          <rotationref ref="Tracker_TestRunModule_layer11_module1_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="11" />
           <physvolid field_name="module" value="1" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer12_module0_position" />
-          <rotationref ref="Tracker_LongModule_layer12_module0_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer11_module2_position" />
+          <rotationref ref="Tracker_TestRunModule_layer11_module2_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="11" />
+          <physvolid field_name="module" value="2" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer11_module3_position" />
+          <rotationref ref="Tracker_TestRunModule_layer11_module3_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="11" />
+          <physvolid field_name="module" value="3" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer12_module0_position" />
+          <rotationref ref="Tracker_TestRunModule_layer12_module0_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="12" />
           <physvolid field_name="module" value="0" />
         </physvol>
         <physvol>
-          <volumeref ref="LongModuleVolume" />
-          <positionref ref="Tracker_LongModule_layer12_module1_position" />
-          <rotationref ref="Tracker_LongModule_layer12_module1_rotation" />
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer12_module1_position" />
+          <rotationref ref="Tracker_TestRunModule_layer12_module1_rotation" />
           <physvolid field_name="system" value="1" />
           <physvolid field_name="barrel" value="0" />
           <physvolid field_name="layer" value="12" />
           <physvolid field_name="module" value="1" />
         </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer12_module2_position" />
+          <rotationref ref="Tracker_TestRunModule_layer12_module2_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="12" />
+          <physvolid field_name="module" value="2" />
+        </physvol>
+        <physvol>
+          <volumeref ref="TestRunModuleVolume" />
+          <positionref ref="Tracker_TestRunModule_layer12_module3_position" />
+          <rotationref ref="Tracker_TestRunModule_layer12_module3_rotation" />
+          <physvolid field_name="system" value="1" />
+          <physvolid field_name="barrel" value="0" />
+          <physvolid field_name="layer" value="12" />
+          <physvolid field_name="module" value="3" />
+        </physvol>
         <regionref ref="TrackingRegion" />
         <visref ref="TrackingVis" />
       </volume>
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1