Merge pull request #58 from JureBericic/pdc_param

Added preliminary alignment results for SHMS DCs.

PARAM/SHMS/DC/pdc.pos

@@ -3,8 +3,8 @@ pdc_num_planes = 12
 pdc_num_chambers = 2
 
 
-pdc_1_zpos = -40  ; TODO - survey
-pdc_2_zpos = 40  ; TODO - survey
+pdc_1_zpos = -40 - 0.656  ; TODO - final survey
+pdc_2_zpos =  40 - 0.668  ; TODO - final survey
 ; z position in cm of each plane measured from focal plane.
 pdc_zpos   = pdc_1_zpos - 0.6875*cminch
              pdc_1_zpos - 0.4375*cminch
@@ -22,50 +22,50 @@ pdc_zpos   = pdc_1_zpos - 0.6875*cminch
 pdc_1_roll = 180.0  ; TODO - survey
 pdc_2_roll = 180.0  ; TODO - survey
 ; Angle alpha of wires for each plane in radians.
-pdc_alpha_angle = (30-pdc_1_roll)*raddeg
-                  (30-pdc_1_roll)*raddeg
-                  (90-pdc_1_roll)*raddeg
-                  (90-pdc_1_roll)*raddeg
-                  (150-pdc_1_roll)*raddeg
-                  (150-pdc_1_roll)*raddeg
-                  (30-pdc_2_roll)*raddeg
-                  (30-pdc_2_roll)*raddeg
-                  (90-pdc_2_roll)*raddeg
-                  (90-pdc_2_roll)*raddeg
-                  (150-pdc_2_roll)*raddeg
-                  (150-pdc_2_roll)*raddeg
+pdc_alpha_angle = ( 30 - pdc_1_roll)*raddeg
+                  ( 30 - pdc_1_roll)*raddeg
+                  ( 90 - pdc_1_roll)*raddeg
+                  ( 90 - pdc_1_roll)*raddeg
+                  (150 - pdc_1_roll)*raddeg
+                  (150 - pdc_1_roll)*raddeg
+                  ( 30 - pdc_2_roll)*raddeg
+                  ( 30 - pdc_2_roll)*raddeg
+                  ( 90 - pdc_2_roll)*raddeg
+                  ( 90 - pdc_2_roll)*raddeg
+                  (150 - pdc_2_roll)*raddeg
+                  (150 - pdc_2_roll)*raddeg
 
-pdc_1_beta = 0.0  ; TODO - survey
-pdc_2_beta = 0.0  ; TODO - survey
+pdc_1_pitch = -0.006  ; TODO - final survey
+pdc_2_pitch =  0.001  ; TODO - final survey
 ; Angle beta of wires for each plane in radians.
-pdc_beta_angle = pdc_1_beta
-                 pdc_1_beta
-                 pdc_1_beta
-                 pdc_1_beta
-                 pdc_1_beta
-                 pdc_1_beta
-                 pdc_2_beta
-                 pdc_2_beta
-                 pdc_2_beta
-                 pdc_2_beta
-                 pdc_2_beta
-                 pdc_2_beta
+pdc_beta_angle = pdc_1_pitch*raddeg
+                 pdc_1_pitch*raddeg
+                 pdc_1_pitch*raddeg
+                 pdc_1_pitch*raddeg
+                 pdc_1_pitch*raddeg
+                 pdc_1_pitch*raddeg
+                 pdc_2_pitch*raddeg
+                 pdc_2_pitch*raddeg
+                 pdc_2_pitch*raddeg
+                 pdc_2_pitch*raddeg
+                 pdc_2_pitch*raddeg
+                 pdc_2_pitch*raddeg
 
-pdc_1_gamma = 0.0  ; TODO - survey
-pdc_2_gamma = 0.0  ; TODO - survey
+pdc_1_yaw = -0.006  ; TODO - final survey
+pdc_2_yaw = -0.035  ; TODO - final survey
 ; Angle gamma of wires for each plane in radians
-pdc_gamma_angle = pdc_1_gamma
-                  pdc_1_gamma
-                  pdc_1_gamma
-                  pdc_1_gamma
-                  pdc_1_gamma
-                  pdc_1_gamma
-                  pdc_2_gamma
-                  pdc_2_gamma
-                  pdc_2_gamma
-                  pdc_2_gamma
-                  pdc_2_gamma
-                  pdc_2_gamma
+pdc_gamma_angle = pdc_1_yaw*raddeg
+                  pdc_1_yaw*raddeg
+                  pdc_1_yaw*raddeg
+                  pdc_1_yaw*raddeg
+                  pdc_1_yaw*raddeg
+                  pdc_1_yaw*raddeg
+                  pdc_2_yaw*raddeg
+                  pdc_2_yaw*raddeg
+                  pdc_2_yaw*raddeg
+                  pdc_2_yaw*raddeg
+                  pdc_2_yaw*raddeg
+                  pdc_2_yaw*raddeg
 
 
 ; Distance between wires for each plane in cm.
@@ -77,8 +77,8 @@ pdc_nrwire = 107, 107, 79, 79, 107, 107
              107, 107, 79, 79, 107, 107
 
 ; x and y position of center of each wire chamber.
-pdc_xcenter = 0.0, 0.0  ; TODO - survey
-pdc_ycenter = 0.0, 0.0  ; TODO - survey
+pdc_xcenter = -0.036, 0.008  ; TODO - final survey
+pdc_ycenter =  0.019, 0.013  ; TODO - final survey
 
 ; Wire number of center of wire chamber for each plane.
 pdc_central_wire = 54.25, 53.75, 40.25, 39.75, 54.25, 53.75