hps-detectors/detectors/HPS-TestRun-v4
diff -u -r1.3 -r1.4
--- compact.xml 26 Jun 2013 22:02:09 -0000 1.3
+++ compact.xml 27 Jun 2013 00:27:33 -0000 1.4
@@ -42,16 +42,16 @@
<constant name="x_rot_bot" value="0.020943951" />
<!-- monkey with the rotations -->
- <constant name="x_rot_top_add" value="-0.002" /> <!-- -ive means further closed -->
- <constant name="x_rot_bot_add" value="0.002" /> <!-- +ive means further closed -->
+ <constant name="x_rot_top_add" value="-0.002-0.000448" /> <!-- -ive means further closed -->
+ <constant name="x_rot_bot_add" value="0.002-0.000678" /> <!-- +ive means further closed -->
<!-- distance from target to pivot...this is from an email schematic from Tim on may 12, 2012 -->
<constant name="pivot" value="791" />
<constant name="y_rot_top" value = "0.03"/>
<constant name="y_rot_bot" value = "0.03"/>
- <constant name="y_rot_top_pivot" value="0.0"/>
- <constant name="y_rot_bot_pivot" value="0.0"/>
+ <constant name="y_rot_top_pivot" value="-0.001369-0.000185"/>
+ <constant name="y_rot_bot_pivot" value="0.00336-0.000362"/>
<!-- <constant name="x_off" value = "-15.0"/> -->
@@ -340,7 +340,7 @@
<constant name="mod2_x1t" value="mod_x1t+(pivot-mod_z1t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y1t" value="mod_y1t"/>
- <constant name="mod2_z1t" value="mod_z1t-(pivot-mod_z1t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z1t" value="mod_z1t-(pivot-mod_z1t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx1t" value="mod_rx1t"/>
<constant name="mod2_ry1t" value="mod_ry1t+y_rot_top_pivot"/>
<constant name="mod2_rz1t" value="mod_rz1t"/>
@@ -354,7 +354,7 @@
<constant name="mod2_x2t" value="mod_x2t+(pivot-mod_z2t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y2t" value="mod_y2t"/>
- <constant name="mod2_z2t" value="mod_z2t-(pivot-mod_z2t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z2t" value="mod_z2t-(pivot-mod_z2t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx2t" value="mod_rx2t"/>
<constant name="mod2_ry2t" value="mod_ry2t+y_rot_top_pivot"/>
<constant name="mod2_rz2t" value="mod_rz2t"/>
@@ -368,7 +368,7 @@
<constant name="mod2_x3t" value="mod_x3t+(pivot-mod_z3t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y3t" value="mod_y3t"/>
- <constant name="mod2_z3t" value="mod_z3t-(pivot-mod_z3t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z3t" value="mod_z3t-(pivot-mod_z3t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx3t" value="mod_rx3t"/>
<constant name="mod2_ry3t" value="mod_ry3t+y_rot_top_pivot"/>
<constant name="mod2_rz3t" value="mod_rz3t"/>
@@ -382,7 +382,7 @@
<constant name="mod2_x4t" value="mod_x4t+(pivot-mod_z4t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y4t" value="mod_y4t"/>
- <constant name="mod2_z4t" value="mod_z4t-(pivot-mod_z4t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z4t" value="mod_z4t-(pivot-mod_z4t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx4t" value="mod_rx4t"/>
<constant name="mod2_ry4t" value="mod_ry4t+y_rot_top_pivot"/>
<constant name="mod2_rz4t" value="mod_rz4t"/>
@@ -396,7 +396,7 @@
<constant name="mod2_x5t" value="mod_x5t+(pivot-mod_z5t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y5t" value="mod_y5t"/>
- <constant name="mod2_z5t" value="mod_z5t-(pivot-mod_z5t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z5t" value="mod_z5t-(pivot-mod_z5t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx5t" value="mod_rx5t"/>
<constant name="mod2_ry5t" value="mod_ry5t+y_rot_top_pivot"/>
<constant name="mod2_rz5t" value="mod_rz5t"/>
@@ -410,7 +410,7 @@
<constant name="mod2_x6t" value="mod_x6t+(pivot-mod_z6t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y6t" value="mod_y6t"/>
- <constant name="mod2_z6t" value="mod_z6t-(pivot-mod_z6t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z6t" value="mod_z6t-(pivot-mod_z6t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx6t" value="mod_rx6t"/>
<constant name="mod2_ry6t" value="mod_ry6t+y_rot_top_pivot"/>
<constant name="mod2_rz6t" value="mod_rz6t"/>
@@ -424,7 +424,7 @@
<constant name="mod2_x7t" value="mod_x7t+(pivot-mod_z7t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y7t" value="mod_y7t"/>
- <constant name="mod2_z7t" value="mod_z7t-(pivot-mod_z7t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z7t" value="mod_z7t-(pivot-mod_z7t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx7t" value="mod_rx7t"/>
<constant name="mod2_ry7t" value="mod_ry7t+y_rot_top_pivot"/>
<constant name="mod2_rz7t" value="mod_rz7t"/>
@@ -438,7 +438,7 @@
<constant name="mod2_x8t" value="mod_x8t+(pivot-mod_z8t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y8t" value="mod_y8t"/>
- <constant name="mod2_z8t" value="mod_z8t-(pivot-mod_z8t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z8t" value="mod_z8t-(pivot-mod_z8t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx8t" value="mod_rx8t"/>
<constant name="mod2_ry8t" value="mod_ry8t+y_rot_top_pivot"/>
<constant name="mod2_rz8t" value="mod_rz8t"/>
@@ -452,7 +452,7 @@
<constant name="mod2_x9t" value="mod_x9t+(pivot-mod_z9t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y9t" value="mod_y9t"/>
- <constant name="mod2_z9t" value="mod_z9t-(pivot-mod_z9t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z9t" value="mod_z9t-(pivot-mod_z9t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx9t" value="mod_rx9t"/>
<constant name="mod2_ry9t" value="mod_ry9t+y_rot_top_pivot"/>
<constant name="mod2_rz9t" value="mod_rz9t"/>
@@ -466,7 +466,7 @@
<constant name="mod2_x10t" value="mod_x10t+(pivot-mod_z10t)*sin(y_rot_top_pivot)"/>
<constant name="mod2_y10t" value="mod_y10t"/>
- <constant name="mod2_z10t" value="mod_z10t-(pivot-mod_z10t)*(cos(y_rot_bot_pivot)-1)"/>
+ <constant name="mod2_z10t" value="mod_z10t-(pivot-mod_z10t)*(cos(y_rot_top_pivot)-1)"/>
<constant name="mod2_rx10t" value="mod_rx10t"/>
<constant name="mod2_ry10t" value="mod_ry10t+y_rot_top_pivot"/>
<constant name="mod2_rz10t" value="mod_rz10t"/>