Merge pull request #52 from JureBericic/master

Updated SHMS DC parameters.

PARAM/SHMS/DC/pdc.pos

@@ -22,18 +22,18 @@ pdc_zpos   = pdc_1_zpos - 0.6875*cminch
 pdc_1_roll = 0.0  ; TODO: survey
 pdc_2_roll = 0.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
+pdc_alpha_angle = (150-pdc_1_roll)*raddeg
+                  (150-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
+                  (30-pdc_1_roll)*raddeg
+                  (30-pdc_1_roll)*raddeg
                   (150-pdc_2_roll)*raddeg
                   (150-pdc_2_roll)*raddeg
+                  (90-pdc_2_roll)*raddeg
+                  (90-pdc_2_roll)*raddeg
+                  (30-pdc_2_roll)*raddeg
+                  (30-pdc_2_roll)*raddeg
 
 pdc_1_beta = 0.0  ; TODO: survey
 pdc_2_beta = 0.0  ; TODO: survey
@@ -67,26 +67,27 @@ pdc_gamma_angle = pdc_1_gamma
                   pdc_2_gamma
                   pdc_2_gamma
 
+
 ; Distance between wires for each plane in cm.
 pdc_pitch = 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
             1.0, 1.0, 1.0, 1.0, 1.0, 1.0
 
 ; Number of wires in each plane.
-pdc_nrwire = 109, 109, 80, 80, 109, 109
-             109, 109, 80, 80, 109, 109
+pdc_nrwire = 107, 107, 80, 80, 107, 107
+             107, 107, 80, 80, 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
 
 ; Wire number of center of wire chamber for each plane.
-pdc_central_wire = 54.25, 53.75, 40.25, 40.75, 54.25, 53.75  ; TODO
-                   53.75, 54.25, 40.75, 40.25, 53.75, 54.25
+pdc_central_wire = 54.25, 53.75, 40.25, 39.75, 54.25, 53.75
+                   53.75, 54.25, 39.75, 40.25, 53.75, 54.25
 
 ; Number of chamber that each plane belongs to.
 pdc_chamber_planes = 1, 1, 1, 1, 1, 1
                      2, 2, 2, 2, 2, 2
 
 ; Order in which wires are counted in each plane.
-pdc_wire_counting = 0, 0, 0, 0, 0, 0  ; TODO
+pdc_wire_counting = 0, 0, 0, 0, 0, 0
                     0, 0, 0, 0, 0, 0