LISTSERV 16.5 - LCD-CVS Archives

Commit in `hps-detectors/detectors` on MAIN
`HPS-Proposal2014-v3-2pt2/compact.xml`	+36	-36	1.1 -> 1.2
`/HPS-Proposal2014-v3-2pt2.lcdd`	+37	-37	1.1 -> 1.2
`HPS-Proposal2014-v3-1pt1/HPS-Proposal2014-v3-1pt1.lcdd`	+37	-37	1.1 -> 1.2
`/compact.xml`	+37	-37	1.1 -> 1.2
`HPS-Proposal2014-v3-6pt6/compact.xml`	+36	-36	1.1 -> 1.2
`/HPS-Proposal2014-v3-6pt6.lcdd`	+37	-37	1.1 -> 1.2
	+220	-220

6 modified files

fix stereo sensors 4-6

hps-detectors/detectors/HPS-Proposal2014-v3-2pt2

compact.xml 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- compact.xml	20 Nov 2012 03:01:49 -0000	1.1
+++ compact.xml	5 Dec 2012 19:28:42 -0000	1.2
@@ -249,64 +249,64 @@

                 <module_component thickness="0.0084*cm" material = "Carbon" sensitive="false"/> 
             </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"/>

+                <module_placement name="TestRunModule" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t" 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" z="z1b*cos(y_rot)-(x1b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a1b"/>

             </layer>
             <layer id="2">

-                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t+(pivot-z2t)*sin(x_rot_top_add)" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
-                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b+(pivot-z2b)*sin(x_rot_bot_add)" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>

+                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
+                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>

             </layer>
             <layer id="3">

-                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t+(pivot-z3t)*sin(x_rot_top_add)" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
-                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b+(pivot-z3b)*sin(x_rot_bot_add)" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>

+                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
+                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>

             </layer>
             <layer id="4">

-                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t+(pivot-z4t)*sin(x_rot_top_add)" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
-                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b+(pivot-z4b)*sin(x_rot_bot_add)" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>

+                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
+                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>

             </layer>
             <layer id="5">

-                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t+(pivot-z5t)*sin(x_rot_top_add)" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
-                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b+(pivot-z5b)*sin(x_rot_bot_add)" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>

+                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
+                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>

             </layer>
             <layer id="6">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z6t*sin(y_rot)+(x6t+x_off)*cos(y_rot)" y="y6t" 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" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off-moduleLength/2)*cos(y_rot)" y="y7t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y7t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t+moduleLength/2*sin(SA2)" z="(z8t+zst)*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="TestRunModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off-moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b+zst)*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="2" x="z8t*sin(y_rot)+(x8t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t-moduleLength/2*sin(SA2)" z="(z8t-zst)*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="TestRunModule" id="3" x="z8b*sin(y_rot)+(x8b+x_off+moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b-zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>

             </layer>
             <layer id="9">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off-moduleLength/2)*cos(y_rot)" y="y9t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y9t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t+moduleLength/2*sin(SA2)" z="(z10t+zst)*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="TestRunModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off-moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b+zst)*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="2" x="z10t*sin(y_rot)+(x10t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t-moduleLength/2*sin(SA2)" z="(z10t-zst)*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="TestRunModule" id="3" x="z10b*sin(y_rot)+(x10b+x_off+moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b-zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>

             </layer>
             <layer id="11">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off-moduleLength/2)*cos(y_rot)" y="y11t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y11t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t+moduleLength/2*sin(SA2)" z="(z12t+zst)*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="TestRunModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off-moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b+zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
+                <module_placement name="TestRunModule" id="2" x="z12t*sin(y_rot)+(x12t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t-moduleLength/2*sin(SA2)" z="(z12t-zst)*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="TestRunModule" id="3" x="z12b*sin(y_rot)+(x12b+x_off+moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b-zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>

             </layer>
         </detector>

hps-detectors/detectors/HPS-Proposal2014-v3-2pt2

HPS-Proposal2014-v3-2pt2.lcdd 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- HPS-Proposal2014-v3-2pt2.lcdd	20 Nov 2012 03:01:49 -0000	1.1
+++ HPS-Proposal2014-v3-2pt2.lcdd	5 Dec 2012 19:28:42 -0000	1.2
@@ -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-v3-2pt2" />

-    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v3-2pt2/compact.xml" checksum="296803094" />

+    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v3-2pt2/compact.xml" checksum="3513969363" />

     <author name="NONE" />
     <comment>HPS detector for 2014 proposal @ 2.2GeV</comment>
   </header>

@@ -218,54 +218,54 @@

       <rotation name="Tracker_TestRunModule_layer6_module0_rotation" x="0.0" y="3.11107265359" z="-4.812388980385" unit="radian" />
       <position name="Tracker_TestRunModule_layer6_module1_position" x="9.495891849418493" y="-23.669781251898428" z="311.0400814412576" unit="mm" />
       <rotation name="Tracker_TestRunModule_layer6_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module0_position" x="-34.22578604266249" y="26.669668753164046" z="489.58689362003173" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module0_position" x="-35.0603971839561" y="26.669668753164046" z="489.58689362003173" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module1_position" x="-33.76805711054405" y="-26.669668753164046" z="504.5799081342881" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module1_position" x="-34.540210371713286" y="-29.168627216697963" z="504.5799081342881" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module2_position" x="64.05842176979266" y="26.669668753164046" z="487.5878250181309" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module2_position" x="64.89303291108627" y="26.669668753164046" z="487.5878250181309" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module3_position" x="64.5161507019111" y="-26.669668753164046" z="502.58083953238724" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module3_position" x="65.28830396308034" y="-24.17071028963013" z="502.58083953238724" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer8_module0_position" x="-34.00088856068163" y="26.669668753164046" z="496.95346141803634" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module1_position" x="-33.54315962856319" y="-26.669668753164046" z="511.9464759322927" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module2_position" x="64.28331925177352" y="26.669668753164046" z="494.9543928161355" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module3_position" x="64.74104818389196" y="-26.669668753164046" z="509.94740733039185" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer9_module0_position" x="-28.122733614416592" y="29.669556254429665" z="689.4937538101166" unit="mm" />

+      <position name="Tracker_TestRunModule_layer8_module0_position" x="-34.77304182185087" y="29.168627216697963" z="496.95346141803634" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module1_position" x="-34.377770769856795" y="-26.669668753164046" z="511.9464759322927" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module2_position" x="65.05547251294276" y="24.17071028963013" z="494.9543928161355" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module3_position" x="65.57565932518557" y="-26.669668753164046" z="509.94740733039185" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer9_module0_position" x="-28.9573447557102" y="29.669556254429665" z="689.4937538101166" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module1_position" x="-27.66500468229815" y="-29.669556254429665" z="704.4867683243729" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module1_position" x="-28.437157943467387" y="-32.16851471796358" z="704.4867683243729" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module2_position" x="70.16147419803856" y="29.669556254429665" z="687.4946852082156" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module2_position" x="70.99608533933217" y="29.669556254429665" z="687.4946852082156" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module3_position" x="70.619203130157" y="-29.669556254429665" z="702.487699722472" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module3_position" x="71.39135639132624" y="-27.170597790895748" z="702.487699722472" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer10_module0_position" x="-27.897836132435735" y="29.669556254429665" z="696.860321608121" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module1_position" x="-27.440107200317293" y="-29.669556254429665" z="711.8533361223774" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module2_position" x="70.38637168001941" y="29.669556254429665" z="694.8612530062202" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module3_position" x="70.84410061213785" y="-29.669556254429665" z="709.8542675204766" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer11_module0_position" x="-22.0196811861707" y="32.66944375569528" z="889.4006140002012" unit="mm" />

+      <position name="Tracker_TestRunModule_layer10_module0_position" x="-28.669989393604972" y="32.16851471796358" z="696.860321608121" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module1_position" x="-28.2747183416109" y="-29.669556254429665" z="711.8533361223774" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module2_position" x="71.15852494118866" y="27.170597790895748" z="694.8612530062202" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module3_position" x="71.67871175343146" y="-29.669556254429665" z="709.8542675204766" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer11_module0_position" x="-22.854292327464307" y="32.66944375569528" z="889.4006140002012" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module1_position" x="-21.561952254052258" y="-32.66944375569528" z="904.3936285144576" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module1_position" x="-22.334105515221495" y="-35.1684022192292" z="904.3936285144576" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module2_position" x="76.26452662628445" y="32.66944375569528" z="887.4015453983004" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module2_position" x="77.09913776757806" y="32.66944375569528" z="887.4015453983004" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module3_position" x="76.72225555840289" y="-32.66944375569528" z="902.3945599125567" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module3_position" x="77.49440881957213" y="-30.170485292161366" z="902.3945599125567" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer12_module0_position" x="-21.79478370418984" y="32.66944375569528" z="896.7671817982058" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module1_position" x="-21.337054772071397" y="-32.66944375569528" z="911.7601963124621" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module2_position" x="76.48942410826531" y="32.66944375569528" z="894.7681131963049" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module3_position" x="76.94715304038375" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

+      <position name="Tracker_TestRunModule_layer12_module0_position" x="-22.566936965359076" y="35.1684022192292" z="896.7671817982058" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module1_position" x="-22.171665913365004" y="-32.66944375569528" z="911.7601963124621" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module2_position" x="77.26157736943455" y="30.170485292161366" z="894.7681131963049" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module3_position" x="77.78176418167736" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />

       <position name="crystal1-1_pos_pos_bot" x="50.052304484827026" y="-27.67473927539554" z="1473.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="35.00282593403595" y="-27.67473927539554" z="1473.1626281236922" unit="mm" />

hps-detectors/detectors/HPS-Proposal2014-v3-1pt1

HPS-Proposal2014-v3-1pt1.lcdd 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- HPS-Proposal2014-v3-1pt1.lcdd	20 Nov 2012 03:01:50 -0000	1.1
+++ HPS-Proposal2014-v3-1pt1.lcdd	5 Dec 2012 19:28:42 -0000	1.2
@@ -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-v3-1pt1" />

-    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v3-1pt1/compact.xml" checksum="1678719713" />

+    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v3-1pt1/compact.xml" checksum="1789661089" />

     <author name="NONE" />
     <comment>HPS detector for 2014 proposal @ 1.1GeV</comment>
   </header>

@@ -218,54 +218,54 @@

       <rotation name="Tracker_TestRunModule_layer6_module0_rotation" x="0.0" y="3.11107265359" z="-4.812388980385" unit="radian" />
       <position name="Tracker_TestRunModule_layer6_module1_position" x="9.495891849418493" y="-23.669781251898428" z="311.0400814412576" unit="mm" />
       <rotation name="Tracker_TestRunModule_layer6_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module0_position" x="-34.22578604266249" y="26.669668753164046" z="489.58689362003173" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module0_position" x="-35.0603971839561" y="26.669668753164046" z="489.58689362003173" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module1_position" x="-33.76805711054405" y="-26.669668753164046" z="504.5799081342881" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module1_position" x="-34.540210371713286" y="-29.168627216697963" z="504.5799081342881" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module2_position" x="64.05842176979266" y="26.669668753164046" z="487.5878250181309" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module2_position" x="64.89303291108627" y="26.669668753164046" z="487.5878250181309" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module3_position" x="64.5161507019111" y="-26.669668753164046" z="502.58083953238724" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module3_position" x="65.28830396308034" y="-24.17071028963013" z="502.58083953238724" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer8_module0_position" x="-34.00088856068163" y="26.669668753164046" z="496.95346141803634" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module1_position" x="-33.54315962856319" y="-26.669668753164046" z="511.9464759322927" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module2_position" x="64.28331925177352" y="26.669668753164046" z="494.9543928161355" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module3_position" x="64.74104818389196" y="-26.669668753164046" z="509.94740733039185" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer9_module0_position" x="-28.122733614416592" y="29.669556254429665" z="689.4937538101166" unit="mm" />

+      <position name="Tracker_TestRunModule_layer8_module0_position" x="-34.77304182185087" y="29.168627216697963" z="496.95346141803634" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module1_position" x="-34.377770769856795" y="-26.669668753164046" z="511.9464759322927" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module2_position" x="65.05547251294276" y="24.17071028963013" z="494.9543928161355" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module3_position" x="65.57565932518557" y="-26.669668753164046" z="509.94740733039185" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer9_module0_position" x="-28.9573447557102" y="29.669556254429665" z="689.4937538101166" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module1_position" x="-27.66500468229815" y="-29.669556254429665" z="704.4867683243729" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module1_position" x="-28.437157943467387" y="-32.16851471796358" z="704.4867683243729" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module2_position" x="70.16147419803856" y="29.669556254429665" z="687.4946852082156" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module2_position" x="70.99608533933217" y="29.669556254429665" z="687.4946852082156" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module3_position" x="70.619203130157" y="-29.669556254429665" z="702.487699722472" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module3_position" x="71.39135639132624" y="-27.170597790895748" z="702.487699722472" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer10_module0_position" x="-27.897836132435735" y="29.669556254429665" z="696.860321608121" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module1_position" x="-27.440107200317293" y="-29.669556254429665" z="711.8533361223774" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module2_position" x="70.38637168001941" y="29.669556254429665" z="694.8612530062202" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module3_position" x="70.84410061213785" y="-29.669556254429665" z="709.8542675204766" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer11_module0_position" x="-22.0196811861707" y="32.66944375569528" z="889.4006140002012" unit="mm" />

+      <position name="Tracker_TestRunModule_layer10_module0_position" x="-28.669989393604972" y="32.16851471796358" z="696.860321608121" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module1_position" x="-28.2747183416109" y="-29.669556254429665" z="711.8533361223774" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module2_position" x="71.15852494118866" y="27.170597790895748" z="694.8612530062202" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module3_position" x="71.67871175343146" y="-29.669556254429665" z="709.8542675204766" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer11_module0_position" x="-22.854292327464307" y="32.66944375569528" z="889.4006140002012" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module1_position" x="-21.561952254052258" y="-32.66944375569528" z="904.3936285144576" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module1_position" x="-22.334105515221495" y="-35.1684022192292" z="904.3936285144576" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module2_position" x="76.26452662628445" y="32.66944375569528" z="887.4015453983004" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module2_position" x="77.09913776757806" y="32.66944375569528" z="887.4015453983004" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module3_position" x="76.72225555840289" y="-32.66944375569528" z="902.3945599125567" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module3_position" x="77.49440881957213" y="-30.170485292161366" z="902.3945599125567" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer12_module0_position" x="-21.79478370418984" y="32.66944375569528" z="896.7671817982058" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module1_position" x="-21.337054772071397" y="-32.66944375569528" z="911.7601963124621" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module2_position" x="76.48942410826531" y="32.66944375569528" z="894.7681131963049" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module3_position" x="76.94715304038375" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

+      <position name="Tracker_TestRunModule_layer12_module0_position" x="-22.566936965359076" y="35.1684022192292" z="896.7671817982058" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module1_position" x="-22.171665913365004" y="-32.66944375569528" z="911.7601963124621" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module2_position" x="77.26157736943455" y="30.170485292161366" z="894.7681131963049" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module3_position" x="77.78176418167736" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />

       <position name="crystal1-1_pos_pos_bot" x="50.052304484827026" y="-27.67473927539554" z="1473.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="35.00282593403595" y="-27.67473927539554" z="1473.1626281236922" unit="mm" />

hps-detectors/detectors/HPS-Proposal2014-v3-1pt1

compact.xml 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- compact.xml	20 Nov 2012 03:01:50 -0000	1.1
+++ compact.xml	5 Dec 2012 19:28:42 -0000	1.2
@@ -247,66 +247,66 @@

                     <dimensions x="sensorLength" y="sensorWidth" /> 
                 </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"/>

+                <module_placement name="TestRunModule" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t" 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" z="z1b*cos(y_rot)-(x1b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a1b"/>

             </layer>
             <layer id="2">

-                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t+(pivot-z2t)*sin(x_rot_top_add)" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
-                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b+(pivot-z2b)*sin(x_rot_bot_add)" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>

+                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
+                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>

             </layer>
             <layer id="3">

-                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t+(pivot-z3t)*sin(x_rot_top_add)" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
-                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b+(pivot-z3b)*sin(x_rot_bot_add)" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>

+                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
+                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>

             </layer>
             <layer id="4">

-                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t+(pivot-z4t)*sin(x_rot_top_add)" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
-                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b+(pivot-z4b)*sin(x_rot_bot_add)" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>

+                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
+                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>

             </layer>
             <layer id="5">

-                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t+(pivot-z5t)*sin(x_rot_top_add)" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
-                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b+(pivot-z5b)*sin(x_rot_bot_add)" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>

+                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
+                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>

             </layer>
             <layer id="6">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z6t*sin(y_rot)+(x6t+x_off)*cos(y_rot)" y="y6t" 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" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off-moduleLength/2)*cos(y_rot)" y="y7t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y7t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t+moduleLength/2*sin(SA2)" z="(z8t+zst)*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="TestRunModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off-moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b+zst)*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="2" x="z8t*sin(y_rot)+(x8t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t-moduleLength/2*sin(SA2)" z="(z8t-zst)*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="TestRunModule" id="3" x="z8b*sin(y_rot)+(x8b+x_off+moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b-zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>

             </layer>
             <layer id="9">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off-moduleLength/2)*cos(y_rot)" y="y9t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y9t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t+moduleLength/2*sin(SA2)" z="(z10t+zst)*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="TestRunModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off-moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b+zst)*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="2" x="z10t*sin(y_rot)+(x10t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t-moduleLength/2*sin(SA2)" z="(z10t-zst)*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="TestRunModule" id="3" x="z10b*sin(y_rot)+(x10b+x_off+moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b-zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>

             </layer>
             <layer id="11">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off-moduleLength/2)*cos(y_rot)" y="y11t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y11t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t+moduleLength/2*sin(SA2)" z="(z12t+zst)*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="TestRunModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off-moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b+zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
+                <module_placement name="TestRunModule" id="2" x="z12t*sin(y_rot)+(x12t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t-moduleLength/2*sin(SA2)" z="(z12t-zst)*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="TestRunModule" id="3" x="z12b*sin(y_rot)+(x12b+x_off+moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b-zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>

             </layer>
         </detector>

hps-detectors/detectors/HPS-Proposal2014-v3-6pt6

compact.xml 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- compact.xml	20 Nov 2012 03:01:50 -0000	1.1
+++ compact.xml	5 Dec 2012 19:28:42 -0000	1.2
@@ -249,64 +249,64 @@

                 <module_component thickness="0.0084*cm" material = "Carbon" sensitive="false"/> 
             </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"/>

+                <module_placement name="TestRunModule" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t" 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" z="z1b*cos(y_rot)-(x1b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a1b"/>

             </layer>
             <layer id="2">

-                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t+(pivot-z2t)*sin(x_rot_top_add)" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
-                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b+(pivot-z2b)*sin(x_rot_bot_add)" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>

+                <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/>
+                <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/>

             </layer>
             <layer id="3">

-                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t+(pivot-z3t)*sin(x_rot_top_add)" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
-                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b+(pivot-z3b)*sin(x_rot_bot_add)" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>

+                <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/>
+                <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/>

             </layer>
             <layer id="4">

-                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t+(pivot-z4t)*sin(x_rot_top_add)" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
-                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b+(pivot-z4b)*sin(x_rot_bot_add)" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>

+                <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/>
+                <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/>

             </layer>
             <layer id="5">

-                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t+(pivot-z5t)*sin(x_rot_top_add)" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
-                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b+(pivot-z5b)*sin(x_rot_bot_add)" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>

+                <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/>
+                <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/>

             </layer>
             <layer id="6">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z6t*sin(y_rot)+(x6t+x_off)*cos(y_rot)" y="y6t" 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" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off-moduleLength/2)*cos(y_rot)" y="y7t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y7t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t+moduleLength/2*sin(SA2)" z="(z8t+zst)*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="TestRunModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off-moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b+zst)*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="2" x="z8t*sin(y_rot)+(x8t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t-moduleLength/2*sin(SA2)" z="(z8t-zst)*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="TestRunModule" id="3" x="z8b*sin(y_rot)+(x8b+x_off+moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b-zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/>

             </layer>
             <layer id="9">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off-moduleLength/2)*cos(y_rot)" y="y9t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y9t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t+moduleLength/2*sin(SA2)" z="(z10t+zst)*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="TestRunModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off-moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b+zst)*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="2" x="z10t*sin(y_rot)+(x10t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t-moduleLength/2*sin(SA2)" z="(z10t-zst)*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="TestRunModule" id="3" x="z10b*sin(y_rot)+(x10b+x_off+moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b-zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/>

             </layer>
             <layer id="11">

-                <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"/>

+                <module_placement name="TestRunModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off-moduleLength/2)*cos(y_rot)" y="y11t" 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-moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b-moduleLength/2*sin(SA2)" 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+moduleLength/2)*cos(y_rot)" y="y11t" 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+moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b+moduleLength/2*sin(SA2)" 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="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"/>

+                <module_placement name="TestRunModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t+moduleLength/2*sin(SA2)" z="(z12t+zst)*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="TestRunModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off-moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b+zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>
+                <module_placement name="TestRunModule" id="2" x="z12t*sin(y_rot)+(x12t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t-moduleLength/2*sin(SA2)" z="(z12t-zst)*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="TestRunModule" id="3" x="z12b*sin(y_rot)+(x12b+x_off+moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b-zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/>

             </layer>
         </detector>

hps-detectors/detectors/HPS-Proposal2014-v3-6pt6

HPS-Proposal2014-v3-6pt6.lcdd 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- HPS-Proposal2014-v3-6pt6.lcdd	20 Nov 2012 03:01:50 -0000	1.1
+++ HPS-Proposal2014-v3-6pt6.lcdd	5 Dec 2012 19:28:42 -0000	1.2
@@ -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-v3-6pt6" />

-    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v3-6pt6/compact.xml" checksum="3259445901" />

+    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Proposal2014-v3-6pt6/compact.xml" checksum="3482320346" />

     <author name="NONE" />
     <comment>HPS detector for 2014 proposal @ 6.6GeV</comment>
   </header>

@@ -218,54 +218,54 @@

       <rotation name="Tracker_TestRunModule_layer6_module0_rotation" x="0.0" y="3.11107265359" z="-4.812388980385" unit="radian" />
       <position name="Tracker_TestRunModule_layer6_module1_position" x="9.495891849418493" y="-23.669781251898428" z="311.0400814412576" unit="mm" />
       <rotation name="Tracker_TestRunModule_layer6_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module0_position" x="-34.22578604266249" y="26.669668753164046" z="489.58689362003173" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module0_position" x="-35.0603971839561" y="26.669668753164046" z="489.58689362003173" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module1_position" x="-33.76805711054405" y="-26.669668753164046" z="504.5799081342881" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module1_position" x="-34.540210371713286" y="-29.168627216697963" z="504.5799081342881" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module2_position" x="64.05842176979266" y="26.669668753164046" z="487.5878250181309" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module2_position" x="64.89303291108627" y="26.669668753164046" z="487.5878250181309" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer7_module3_position" x="64.5161507019111" y="-26.669668753164046" z="502.58083953238724" unit="mm" />

+      <position name="Tracker_TestRunModule_layer7_module3_position" x="65.28830396308034" y="-24.17071028963013" z="502.58083953238724" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer7_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer8_module0_position" x="-34.00088856068163" y="26.669668753164046" z="496.95346141803634" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module1_position" x="-33.54315962856319" y="-26.669668753164046" z="511.9464759322927" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module2_position" x="64.28331925177352" y="26.669668753164046" z="494.9543928161355" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer8_module3_position" x="64.74104818389196" y="-26.669668753164046" z="509.94740733039185" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer8_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer9_module0_position" x="-28.122733614416592" y="29.669556254429665" z="689.4937538101166" unit="mm" />

+      <position name="Tracker_TestRunModule_layer8_module0_position" x="-34.77304182185087" y="29.168627216697963" z="496.95346141803634" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module1_position" x="-34.377770769856795" y="-26.669668753164046" z="511.9464759322927" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module2_position" x="65.05547251294276" y="24.17071028963013" z="494.9543928161355" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer8_module3_position" x="65.57565932518557" y="-26.669668753164046" z="509.94740733039185" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer8_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer9_module0_position" x="-28.9573447557102" y="29.669556254429665" z="689.4937538101166" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module1_position" x="-27.66500468229815" y="-29.669556254429665" z="704.4867683243729" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module1_position" x="-28.437157943467387" y="-32.16851471796358" z="704.4867683243729" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module2_position" x="70.16147419803856" y="29.669556254429665" z="687.4946852082156" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module2_position" x="70.99608533933217" y="29.669556254429665" z="687.4946852082156" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer9_module3_position" x="70.619203130157" y="-29.669556254429665" z="702.487699722472" unit="mm" />

+      <position name="Tracker_TestRunModule_layer9_module3_position" x="71.39135639132624" y="-27.170597790895748" z="702.487699722472" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer9_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer10_module0_position" x="-27.897836132435735" y="29.669556254429665" z="696.860321608121" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module1_position" x="-27.440107200317293" y="-29.669556254429665" z="711.8533361223774" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module2_position" x="70.38637168001941" y="29.669556254429665" z="694.8612530062202" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer10_module3_position" x="70.84410061213785" y="-29.669556254429665" z="709.8542675204766" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer10_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer11_module0_position" x="-22.0196811861707" y="32.66944375569528" z="889.4006140002012" unit="mm" />

+      <position name="Tracker_TestRunModule_layer10_module0_position" x="-28.669989393604972" y="32.16851471796358" z="696.860321608121" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module1_position" x="-28.2747183416109" y="-29.669556254429665" z="711.8533361223774" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module2_position" x="71.15852494118866" y="27.170597790895748" z="694.8612530062202" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer10_module3_position" x="71.67871175343146" y="-29.669556254429665" z="709.8542675204766" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer10_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer11_module0_position" x="-22.854292327464307" y="32.66944375569528" z="889.4006140002012" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module0_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module1_position" x="-21.561952254052258" y="-32.66944375569528" z="904.3936285144576" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module1_position" x="-22.334105515221495" y="-35.1684022192292" z="904.3936285144576" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module1_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module2_position" x="76.26452662628445" y="32.66944375569528" z="887.4015453983004" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module2_position" x="77.09913776757806" y="32.66944375569528" z="887.4015453983004" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module2_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer11_module3_position" x="76.72225555840289" y="-32.66944375569528" z="902.3945599125567" unit="mm" />

+      <position name="Tracker_TestRunModule_layer11_module3_position" x="77.49440881957213" y="-30.170485292161366" z="902.3945599125567" unit="mm" />

       <rotation name="Tracker_TestRunModule_layer11_module3_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />

-      <position name="Tracker_TestRunModule_layer12_module0_position" x="-21.79478370418984" y="32.66944375569528" z="896.7671817982058" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module0_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module1_position" x="-21.337054772071397" y="-32.66944375569528" z="911.7601963124621" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module1_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module2_position" x="76.48942410826531" y="32.66944375569528" z="894.7681131963049" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="-0.03052" z="-1.620796326795" unit="radian" />
-      <position name="Tracker_TestRunModule_layer12_module3_position" x="76.94715304038375" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
-      <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="-0.03052" z="-1.570796326795" unit="radian" />

+      <position name="Tracker_TestRunModule_layer12_module0_position" x="-22.566936965359076" y="35.1684022192292" z="896.7671817982058" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module0_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module1_position" x="-22.171665913365004" y="-32.66944375569528" z="911.7601963124621" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module1_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module2_position" x="77.26157736943455" y="30.170485292161366" z="894.7681131963049" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
+      <position name="Tracker_TestRunModule_layer12_module3_position" x="77.78176418167736" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
+      <rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />

       <position name="crystal1-1_pos_pos_bot" x="50.052304484827026" y="-27.67473927539554" z="1473.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="35.00282593403595" y="-27.67473927539554" z="1473.1626281236922" unit="mm" />

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