diff --git a/PARAM/SHMS/DC/pdc.param b/PARAM/SHMS/DC/pdc.param
index fd474d314e3e192fbefce6aff24c79e545bec913..eccefe0bf0fd2b6adf7b118657573d399eba3dfa 100644
--- a/PARAM/SHMS/DC/pdc.param
+++ b/PARAM/SHMS/DC/pdc.param
@@ -2,27 +2,27 @@
pdc_plane_names = "1u1 1u2 1x1 1x2 1v1 1v2 2v2 2v1 2x2 2x1 2u2 2u1" ; TODO
; Sigma of wire chamber resolution for each plane.
-pdc_sigma = 0.02, 0.02, 0.02, 0.02, 0.02, 0.02 ; TODO
+pdc_sigma = 0.02, 0.02, 0.02, 0.02, 0.02, 0.02 ; TODO - SOS values for now
0.02, 0.02, 0.02, 0.02, 0.02, 0.02
; TDC window limits for each plane.
-pdc_tdc_min_win = -55000,-55000,-55000,-55000,-55000,-55000 ; TODO - wide limits for now
- -55000,-55000,-55000,-55000,-55000,-55000
-pdc_tdc_max_win = 55000,55000,55000,55000,55000,55000 ; TODO - wide limits for now
- 55000,55000,55000,55000,55000,55000
+pdc_tdc_min_win = -55000, -55000, -55000, -55000, -55000, -55000 ; TODO - wide limits for now
+ -55000, -55000, -55000, -55000, -55000, -55000
+pdc_tdc_max_win = 55000, 55000, 55000, 55000, 55000, 55000 ; TODO - wide limits for now
+ 55000, 55000, 55000, 55000, 55000, 55000
; Conversion factor from TDC clicks to ns.
pdc_tdc_time_per_channel = -0.10
; Zero time correction for each plane in ns that is added to TDC time.
-pdc_plane_time_zero = 120.0,120.0,120.0,120.0,120.0,120.0 ; TODO
- 120.0,120.0,120.0,120.0,120.0,120.0
+pdc_plane_time_zero = 1440.0, 1440.0, 1440.0, 1440.0, 1440.0, 1440.0 ; TODO - SOS values for now
+ 1440.0, 1440.0, 1440.0, 1440.0, 1440.0, 1440.0
; For wire velocity corrections.
pdc_wire_velocity = 13.0 ; TODO
-pdc_central_time = 1,1,1,1,1,1 ; TODO
- 1,1,1,1,1,1
-pdc_drifttime_sign = 1,-1,-1,1,1,-1 ; TODO
- 1,-1,-1,1,1,-1
+pdc_central_time = 0, 0, 0, 0, 0, 0 ; TODO - no correction for now
+ 0, 0, 0, 0, 0, 0
+pdc_drifttime_sign = 0, 0, 0, 0, 0, 0 ; TODO - no correction for now
+ 0, 0, 0, 0, 0, 0
pdc_fix_lr = 1
pdc_fix_propcorr = 1
diff --git a/PARAM/SHMS/DC/pdc.pos b/PARAM/SHMS/DC/pdc.pos
index eb5e06b05a0159ae76799d34dfe62359283192b8..206967a0993eaeb64448e67593d22b27039e10a3 100644
--- a/PARAM/SHMS/DC/pdc.pos
+++ b/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 ; TODO - survey
+pdc_2_zpos = 40 ; TODO - 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
@@ -19,24 +19,24 @@ pdc_zpos = pdc_1_zpos - 0.6875*cminch
pdc_2_zpos + 0.4375*cminch
pdc_2_zpos + 0.6875*cminch
-pdc_1_roll = 0.0 ; TODO: survey
-pdc_2_roll = 0.0 ; TODO: survey
+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 = (150-pdc_1_roll)*raddeg
- (150-pdc_1_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
- (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
+ (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_beta = 0.0 ; TODO - survey
+pdc_2_beta = 0.0 ; TODO - survey
; Angle beta of wires for each plane in radians.
pdc_beta_angle = pdc_1_beta
pdc_1_beta
@@ -51,8 +51,8 @@ pdc_beta_angle = pdc_1_beta
pdc_2_beta
pdc_2_beta
-pdc_1_gamma = 0.0 ; TODO: survey
-pdc_2_gamma = 0.0 ; TODO: survey
+pdc_1_gamma = 0.0 ; TODO - survey
+pdc_2_gamma = 0.0 ; TODO - survey
; Angle gamma of wires for each plane in radians
pdc_gamma_angle = pdc_1_gamma
pdc_1_gamma
@@ -73,12 +73,12 @@ 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 = 107, 107, 80, 80, 107, 107
- 107, 107, 80, 80, 107, 107
+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.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, 39.75, 54.25, 53.75
diff --git a/PARAM/SHMS/GEN/ptracking.param b/PARAM/SHMS/GEN/ptracking.param
index 21bdaafd37b686ccfd7146e6865c4c184b14e6cb..899347aaf568341ddd6d34c6b6fa0cc9aee074f5 100644
--- a/PARAM/SHMS/GEN/ptracking.param
+++ b/PARAM/SHMS/GEN/ptracking.param
@@ -13,7 +13,7 @@ pmin_hit = 5, 5
pmin_combos = 6, 6
; hspace_point_criterion(i) minimum separation of distinct space points
; recommended value for hspace_point_criterion ( based on meeting
-; Feb 2003)
+; Feb 2003)
pspace_point_criterion = 1.2, 1.2
; The following four criteria are applied to the stub fit results at the
@@ -30,7 +30,7 @@ pntracks_max_fp = 10
pypt_track_criterion = 1.0
; Make a track of all single stubs normally 0
- psingle_stub = 1
+ psingle_stub = 0
; No small angle approximation for cosmic ray tests
pSmallAngleApprox = 0
@@ -42,13 +42,13 @@ pntracks_max_fp = 10
psel_dedx1min = -100000
; psel_dedx1max maximum dedx to chose best track in scin 1
psel_dedx1max = 1000000.
-; psel_betamin minimum track beta to chose best track
+; psel_betamin minimum track beta to chose best track
psel_betamin = -100000
-; psel_betamax maximum track beta to chose best track
+; psel_betamax maximum track beta to chose best track
psel_betamax = 100000.
-; psel_etmin minimum track et to chose best track
+; psel_etmin minimum track et to chose best track
psel_etmin = 0.05
-; psel_etmax maximum track et to chose best track
+; psel_etmax maximum track et to chose best track
psel_etmax = 100000.
; psel_ndegreesmin minimum number of degrees of freedom for track
psel_ndegreesmin = 1
@@ -88,6 +88,6 @@ pntracks_max_fp = 10
pxhiscin = 13, 13
pyloscin = 4, 4
pyhiscin = 7, 7
-; ptrack_eff_test_scin_planes is the number of planes nec needed to
+; ptrack_eff_test_scin_planes is the number of planes nec needed to
; set sweet spot to true. 4 is extra clean, 3 is good enough for e-'s.
ptrack_eff_test_num_scin_planes = 3