diff --git a/DBASE/general.param b/DBASE/general.param
index b3f4ede14b13afb64686e47aa327393f8a2ba8b8..b41241af82d1e370dbaf3dfc3ee93b6d3af459b5 100644
--- a/DBASE/general.param
+++ b/DBASE/general.param
@@ -21,9 +21,9 @@ cminch=2.54
#include "PARAM/HMS/CAL/hcal.pos"
#include "PARAM/HMS/CAL/hcal.param"
#include "PARAM/HMS/CER/hcer.param"
-#include "PARAM/HMS/DC/hdc_offsets.param"
-#include "PARAM/HMS/DC/hdc.pos"
#include "PARAM/HMS/DC/hdc.param"
+#include "PARAM/HMS/DC/hdc.pos"
+#include "PARAM/HMS/DC/hdc_tracking.param"
#include "PARAM/HMS/DC/hdriftmap.param"
#include "PARAM/HMS/HODO/hhodo.pos"
#include "PARAM/HMS/HODO/hhodo.param"
@@ -40,8 +40,9 @@ cminch=2.54
#include "PARAM/SHMS/CAL/pcal.param"
#include "PARAM/SHMS/HGCER/phgcer.param"
#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.pos"
#include "PARAM/SHMS/DC/pdc.param"
+#include "PARAM/SHMS/DC/pdc.pos"
+#include "PARAM/SHMS/DC/pdc_tracking.param"
#include "PARAM/SHMS/DC/pdriftmap.param"
#include "PARAM/SHMS/HODO/phodo.pos"
#include "PARAM/SHMS/HODO/phodo.param"
diff --git a/PARAM/HMS/DC/hdc.param b/PARAM/HMS/DC/hdc.param
index b15ae049108191dcd0b7ee8a49c84cf5a8b83800..da5d2704d50acc4248375841fe560d0d491ae444 100644
--- a/PARAM/HMS/DC/hdc.param
+++ b/PARAM/HMS/DC/hdc.param
@@ -1,37 +1,18 @@
-;---------------------------------------------------------------------
-; HMS_TRACKING
-; CTP parameter file containing all tracking parameters for the HMS
-;----------------------------------------------------------------------
-; sigma of wire chamber resolution for each plane
- hdc_sigma = 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- 0.020
- hdc_tdc_min_win = 2000,2000,2000,2000,2000,2000
- 2000,2000,2000,2000,2000,2000
- hdc_tdc_max_win = 5500,5000,5500,5500,5000,5500
- 5500,5000,5500,5500,5000,5500
-; hms drift chamber tdc's time per channel
- hdc_tdc_time_per_channel = -0.10
-; hms zero time for drift chambers !DECREASING this number moves the hdtime plots to LOWER time.
-; hdc_plane_time_zero = -213.0,-213.0,-213.0,-213.0,-213.0,-213.0
-; -213.0,-213.0,-213.0,-213.0,-213.0,-213.0
- hdc_plane_time_zero = 1297.19,1299.88,1309.39,1305.01,1299.32,1306.23,
- 1313.72,1310.78,1315.82,1316.98,1308.16,1316.16
+; GENERAL PARAMETERS
+; Number of drift chambers.
+hdc_num_chambers = 2
-; Dave Abbott's wire velocity correction
-hdc_wire_velocity = 12.0
-hdc_central_time = 7,9,3,4,6,5
- 7,5,3,4,6,6
+; Total number of planes.
+hdc_num_planes = 12
+; Names of planes.
+hdc_plane_names = "1x1 1y1 1u1 1v1 1y2 1x2 2x1 2y1 2u1 2v1 2y2 2x2"
+; Chamber index for each plane.
+hdc_chamber_planes = 1, 1, 1, 1, 1, 1
+ 2, 2, 2, 2, 2, 2
+; Number of wires in each plane.
+hdc_nrwire = 113, 52, 107, 107, 52, 113
+ 113, 52, 107, 107, 52, 113
diff --git a/PARAM/HMS/DC/hdc.pos b/PARAM/HMS/DC/hdc.pos
index fdbf2aed0ca8f75f5c8bd1d3d3d9fe7bb709d152..597ab6a88f13b944c0ddcd465a16db8f7aae7032 100644
--- a/PARAM/HMS/DC/hdc.pos
+++ b/PARAM/HMS/DC/hdc.pos
@@ -1,183 +1,94 @@
-; Number of planes installed in HMS detector setup
- hdc_num_planes = 12
-; Number of chambers installed in HMS detector setup
- hdc_num_chambers = 2
-; Names of each wire plane
-;
-; Z positions of various planes in HMS chambers
-; hdc_n_zpos is the surveyed Z position of the center of chamber n.
- hdc_1_zpos = (-40.611-11.312+0.003)
- hdc_2_zpos = (+40.611-11.312-0.008)
-
- hdc_zpos = hdc_1_zpos - 3.6000
- hdc_1_zpos - 1.8000
- hdc_1_zpos - 0.0000
- hdc_1_zpos + 1.8000
- hdc_1_zpos + 3.6000
- hdc_1_zpos + 5.4000
- hdc_2_zpos - 3.6000
- hdc_2_zpos - 1.8000
- hdc_2_zpos - 0.0000
- hdc_2_zpos + 1.8000
- hdc_2_zpos + 3.6000
- hdc_2_zpos + 5.4000
-; Angle alpha of wires in wire chamber planes
- hdc_alpha_angle = (90. - 0.071)*raddeg
- (0.0 - 0.071)*raddeg
- (74.925 - 0.071)*raddeg
- (105.075 - 0.071)*raddeg
- (0.0 - 0.071)*raddeg
- (90.0 - 0.071)*raddeg
- (89.90814 - 0.153)*raddeg
- (0.01611 - 0.153)*raddeg
- (74.85 - 0.153)*raddeg
- (105.05 - 0.153)*raddeg
- (0.01611 - 0.153)*raddeg
- (89.90814 - 0.153)*raddeg
-; hdc_alpha_angle = ( 90.1541 - 0.071)*raddeg
-; ( -0.0408 - 0.071)*raddeg
-; ( 75.1267 - 0.071)*raddeg
-; (105.1267 - 0.071)*raddeg
-; ( -0.0408 - 0.071)*raddeg
-; ( 90.1541 - 0.071)*raddeg
-; ( 90.1095 - 0.153)*raddeg
-; ( -0.0370 - 0.153)*raddeg
-; ( 75.0904 - 0.153)*raddeg
-; (105.0904 - 0.153)*raddeg
-; ( -0.0370 - 0.153)*raddeg
-; ( 90.1095 - 0.153)*raddeg
-;
-; Angle beta of wires in wire chamber planes
- hdc_beta_angle = -0.041*raddeg
- -0.041*raddeg
- -0.041*raddeg
- -0.041*raddeg
- -0.041*raddeg
- -0.041*raddeg
- +0.054*raddeg
- +0.054*raddeg
- +0.054*raddeg
- +0.054*raddeg
- +0.054*raddeg
- +0.054*raddeg
-; Angle gamma of wires in wire chamber planes
- hdc_gamma_angle = +0.0376*raddeg
- +0.0376*raddeg
- +0.0376*raddeg
- +0.0376*raddeg
- +0.0376*raddeg
- +0.0376*raddeg
- -0.145*raddeg
- -0.145*raddeg
- -0.145*raddeg
- -0.145*raddeg
- -0.145*raddeg
- -0.145*raddeg
-; Pitch
- hdc_pitch = 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
- 1.000252
-; Number of wires per plane
- hdc_nrwire = 113
- 52
- 107
- 107
- 52
- 113
- 113
- 52
- 107
- 107
- 52
- 113
-; X,Y position of center of wire chamber
-; increasing dc2 coordinates decreases dpos histograms.
-; new values according to henk and rolf
- hdc_xcenter = (1.670 - 0.0155 - 0.020)
- (2.758 - 0.0155 + 0.040)
-; hdc_xcenter = (1.670 - 0.0155)
-; (2.758 - 0.0155)
-; hdc_xcenter = 1.670 + 0.15 + 0.0155
-; 2.758 + 0.16 + 0.0155
-; Y CENTER CHANGED TO MATCH OPTICS DATA(offset of 1.1 cm in y)
-; new values included according to henk and rolf
- hdc_ycenter = (1.443 - 0.1699 - 0.0279 - 0.04)
- (2.753 - 0.1699 + 0.0279 + 0.04)
-; hdc_ycenter = (1.443 - 0.1699 - 0.0279 - 0.035)
-; (2.753 - 0.1699 + 0.0279 + 0.035)
-; hdc_ycenter = (1.443 - 0.1699 - 0.0279)
-; (2.753 - 0.1699 + 0.0279)
+; CHAMBER POSITION PARAMETERS
-; hdc_ycenter = 0.343 + 1.1 - 0.12 + 0.1699 + 0.0279
-; 1.653 + 1.1 - 0.22 + 0.1699 - 0.0279
-; hdc_ycenter = 0.343 THESE ARE THE ORIGINAL Y CENTERS FROM SURVEY DATA
-; 1.653
-; hdc_xcenter = 0.0
-; 1.22
-; hdc_ycenter = 0.0
-; 1.24
+; x, y and z position of center for each wire chamber in cm.
+; From SANE with correction from C1768 using 2007 controls.
+hdc_xcenter = 1.6345 - 0.37 ; TODO - final survey
+ 2.7825 - 0.40
+hdc_ycenter = 1.2052 - 0.11 ; TODO - final survey
+ 2.6510 - 0.06
+hdc_1_zpos = -51.920 - 0.44 ; TODO - final survey
+hdc_2_zpos = 29.291 - 1.76 ; TODO - final survey
-; Wire number of center of wire chamber
-; assume 1st wire of 1st dc of a set is closest to edge where counting starts
- hdc_central_wire = 57.257, 26.240, 54.001, 53.999, 26.760 , 56.743
- 57.244, 26.242, 53.998, 54.002, 26.758 , 56.756
+; Roll, pitch and yaw for each wire chamber in degrees.
+; From C1768 using 2007 controls.
+pdc_1_roll = 0.155 ; TODO - final survey
+pdc_2_roll = 0.186 ; TODO - final survey
+pdc_1_pitch = 0.080 ; TODO - final survey
+pdc_2_pitch = 0.077 ; TODO - final survey
+pdc_1_yaw = 0.324 ; TODO - final survey
+pdc_2_yaw = 0.118 ; TODO - final survey
-; hdc_central_wire = 57.25, 26.245, 54.0, 54.0, 26.755 , 56.75
-; 57.24, 26.245, 54.0, 54.0, 26.755 , 56.76
-; hdc_central_wire = 57.25, 26.25, 54.0, 54.0, 26.75 , 56.75
-; 57.24, 26.25, 54.0, 54.0, 26.75 , 56.76
-; hdc_chamber_planes array giving the chamber number for each plane
- hdc_chamber_planes = 1
- 1
- 1
- 1
- 1
- 1
- 2
- 2
- 2
- 2
- 2
- 2
-; The hms readout numbers some planes in reverse order.
-; The following array is a flag on the order number.
-; If hdc_wire_counting(plane) = 0
-; the wire center is at (wire - hdc_central_wire) * pitch
-; If hdc_wire_counting(plane) = 1
-; the wire center is at ( hdc_nrwire + 1 - wire - hdc_central_wire) * pitch
- hdc_wire_counting = 1
- 1
- 0
- 1
- 0
- 0
- 1
- 1
- 0
- 1
- 0
- 0
-; The velocity correction is the distance from the center of the wire divided
-; by the velocity of propagation times hdc_drifttime_sign(pln). +/-1
-; for disc. card at +/- coord. (i.e. top = -x direction, so top readout is +1)
- hdc_drifttime_sign = -1
- -1
- -1
- -1
- -1
- -1
- -1
- -1
- -1
- -1
- -1
- -1
+
+; PLANE POSITION PARAMETERS
+
+; Wire number of center of wire chamber for each plane.
+; From SANE.
+hdc_central_wire = 57.257, 26.240, 54.001, 53.999, 26.760 , 56.743
+ 57.244, 26.242, 53.998, 54.002, 26.758 , 56.756
+
+; Distance between wires for each plane in cm.
+; From SANE.
+hdc_pitch = 1.000252, 1.000252, 1.000252, 1.000252, 1.000252, 1.000252
+ 1.000252, 1.000252, 1.000252, 1.000252, 1.000252, 1.000252
+
+; Order in which wires are counted in each plane.
+hdc_wire_counting = 1, 1, 0, 1, 0, 0
+ 1, 1, 0, 1, 0, 0
+
+; z position in cm of each plane measured from focal plane.
+; From SANE.
+hdc_zpos = hdc_1_zpos - 3.6
+ hdc_1_zpos - 1.8
+ hdc_1_zpos - 0.0
+ hdc_1_zpos + 1.8
+ hdc_1_zpos + 3.6
+ hdc_1_zpos + 5.4
+ hdc_2_zpos - 3.6
+ hdc_2_zpos - 1.8
+ hdc_2_zpos - 0.0
+ hdc_2_zpos + 1.8
+ hdc_2_zpos + 3.6
+ hdc_2_zpos + 5.4
+
+; Alpha angle of wires for each plane in radians.
+; From SANE.
+hdc_alpha_angle = ( 90.00000 + pdc_1_roll)*raddeg
+ ( 0.00000 + pdc_1_roll)*raddeg
+ ( 74.92500 + pdc_1_roll)*raddeg
+ (105.07500 + pdc_1_roll)*raddeg
+ ( 0.00000 + pdc_1_roll)*raddeg
+ ( 90.00000 + pdc_1_roll)*raddeg
+ ( 89.90814 + pdc_2_roll)*raddeg
+ ( 0.01611 + pdc_2_roll)*raddeg
+ ( 74.85000 + pdc_2_roll)*raddeg
+ (105.05000 + pdc_2_roll)*raddeg
+ ( 0.01611 + pdc_2_roll)*raddeg
+ ( 89.90814 + pdc_2_roll)*raddeg
+
+; Beta angle of wires for each plane in radians.
+hdc_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
+
+; Gamma angle of wires for each plane in radians
+hdc_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
diff --git a/PARAM/HMS/DC/hdc_offsets.param b/PARAM/HMS/DC/hdc_offsets.param
index a5561b2786ad3925d00ea1545b5f213828b8cf4f..759fed95ea802981a31f023613e00c95d3aa6aa2 100644
--- a/PARAM/HMS/DC/hdc_offsets.param
+++ b/PARAM/HMS/DC/hdc_offsets.param
@@ -1,3 +1,5 @@
+; deprecated parameters
+
; cable id's for HMS Drift Chambers
; array is 113,12 (wires,planes) but most planes have less than 113 wires)
@@ -122,4 +124,3 @@ hdc_card_delay = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
0, 0
-
diff --git a/PARAM/HMS/DC/hdc_test_stand.param b/PARAM/HMS/DC/hdc_test_stand.param
index 73a7e92d012c3ca35f7b79fed681dded47a0b8a9..53fd44455af1a5afbda816d97201a7383c19f124 100644
--- a/PARAM/HMS/DC/hdc_test_stand.param
+++ b/PARAM/HMS/DC/hdc_test_stand.param
@@ -1,17 +1,17 @@
-; Custom parameter file which should loaded when aiming to
-; analyze HMS drift chamber data with no tracking.
+; TEST-STAND PARAMETERS
+; Custom parameter file which should be loaded when aiming to analyze HMS DC
+; data with no tracking.
+; Increase HMS TDC window size.
+hdc_tdc_min_win = -50000, -50000, -50000, -50000, -50000, -50000
+ -50000, -50000, -50000, -50000, -50000, -50000
+hdc_tdc_max_win = 50000, 50000, 50000, 50000, 50000, 50000
+ 50000, 50000, 50000, 50000, 50000, 50000
-; Increase HMS TDC window size
- hdc_tdc_min_win = -50000,-50000,-50000,-50000,-50000,-50000
- -50000,-50000,-50000,-50000,-50000,-50000
- hdc_tdc_max_win = 50000,50000,50000,50000,50000,50000
- 50000,50000,50000,50000,50000,50000
-; Remove hodoscope dependence on tracking
- hsel_using_scin = 0
-; hsel_using_prune = 0
-
-; Adjust HMS DC plane t = 0
-; hdc_plane_time_zero = 1500.0,1500.0,1500.0,1500.0,1500.0,1500.0
-; 1500.0,1500.0,1500.0,1500.0,1500.0,1500.0
+; Remove hodoscope dependence on tracking.
+hsel_using_scin = 0
+; hsel_using_prune = 0
+; Adjust HMS DC plane t = 0
+; hdc_plane_time_zero = 1500.0, 1500.0, 1500.0, 1500.0, 1500.0, 1500.0
+; 1500.0, 1500.0, 1500.0, 1500.0, 1500.0, 1500.0
diff --git a/PARAM/HMS/DC/hdc_tracking.param b/PARAM/HMS/DC/hdc_tracking.param
new file mode 100644
index 0000000000000000000000000000000000000000..3977dddccb211d6bd48abeca110a5e7d636b829a
--- /dev/null
+++ b/PARAM/HMS/DC/hdc_tracking.param
@@ -0,0 +1,31 @@
+; TRACKING PARAMETERS
+
+; Sigma of wire chamber resolution for each plane.
+; From SANE.
+hdc_sigma = 0.020, 0.020, 0.020, 0.020, 0.020, 0.020
+ 0.020, 0.020, 0.020, 0.020, 0.020, 0.020
+
+; TDC window limits for each plane.
+; From SANE.
+hdc_tdc_min_win = 2000, 2000, 2000, 2000, 2000, 2000
+ 2000, 2000, 2000, 2000, 2000, 2000
+hdc_tdc_max_win = 5500, 5000, 5500, 5500, 5000, 5500
+ 5500, 5000, 5500, 5500, 5000, 5500
+
+; Conversion factor from TDC clicks to ns.
+hdc_tdc_time_per_channel = -0.10
+
+; Zero time correction for each plane in ns that is added to TDC time.
+; From SANE.
+hdc_plane_time_zero = 1297.19, 1299.88, 1309.39, 1305.01, 1299.32, 1306.23
+ 1313.72, 1310.78, 1315.82, 1316.98, 1308.16, 1316.16
+
+; For wire velocity corrections.
+; From SANE.
+hdc_wire_velocity = 12.0
+hdc_central_time = 7, 9, 3, 4, 6, 5
+ 7, 5, 3, 4, 6, 6
+hdc_drifttime_sign = -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1
+hdc_fix_lr = 0
+hdc_fix_propcorr = 0
diff --git a/PARAM/HMS/DC/hdeadwires.param b/PARAM/HMS/DC/hdeadwires.param
index 9d8b527ef661f2c2921224d140fea49d2d53927c..fc20ebfadcdf116b64a511b1d7c238dbd512e197 100644
--- a/PARAM/HMS/DC/hdeadwires.param
+++ b/PARAM/HMS/DC/hdeadwires.param
@@ -1,3 +1,5 @@
+; deprecated parameters
+
; list of dead wires in the HMS (plane,wire). Dead means <20% efficiency.
hdc_num_deadwires = 6
diff --git a/PARAM/HMS/DC/hdriftmap.param b/PARAM/HMS/DC/hdriftmap.param
index 32f4a965d5f2f9f2a0a72521e1c8858927dd6297..76b2da46215841b5ae771887406fb24525cfb158 100644
--- a/PARAM/HMS/DC/hdriftmap.param
+++ b/PARAM/HMS/DC/hdriftmap.param
@@ -1,10 +1,14 @@
-; Lookup Table
-; number of bins in Carlos's time to distance lookup table
+; Contains lookup tables for drift time.
+
+; Number of bins in table.
hdriftbins = 138
-; number of 1st bin in Carlos's table in ns
-hdrift1stbin=0
-; bin size in ns
+
+; Time of first bin in ns.
+hdrift1stbin = 0
+
+; Bin size in ns.
hdriftbinsz=2
+
hwc1x1fract=0.010023,0.02089,0.03447,0.04935,0.06575,0.08402,0.10200,0.12423,0.14634
0.16998,0.19415,0.21953,0.24499,0.27093,0.29692,0.32473,0.35047,0.37690,0.40394
0.42992,0.45336,0.47963,0.50230,0.52635,0.54813,0.56996,0.59016,0.61065,0.62920
@@ -19,6 +23,7 @@ hwc1x1fract=0.010023,0.02089,0.03447,0.04935,0.06575,0.08402,0.10200,0.12423,0.1
0.99402,0.99454,0.99503,0.99527,0.99531,0.99568,0.99584,0.99628,0.99652,0.99677
0.99701,0.99725,0.99737,0.99762,0.99790,0.99822,0.99838,0.99855,0.99867,0.99891
0.99907,0.99923,0.99931,0.99947,0.99956,0.99960,0.99968,0.99980,1.00000
+
hwc1y1fract=0.00162,0.00410,0.00874,0.01608,0.02777,0.04416,0.06347,0.08629,0.11324
0.14260,0.17061,0.20166,0.23171,0.26391,0.29387,0.32348,0.35131,0.37870,0.40658
0.43190,0.45648,0.48171,0.50458,0.52625,0.54752,0.56734,0.58701,0.60511,0.62250
@@ -33,6 +38,7 @@ hwc1y1fract=0.00162,0.00410,0.00874,0.01608,0.02777,0.04416,0.06347,0.08629,0.11
0.99583,0.99607,0.99663,0.99718,0.99747,0.99763,0.99776,0.99800,0.99820,0.99829
0.99836,0.99871,0.99887,0.99894,0.99907,0.99916,0.99931,0.99936,0.99942,0.99949
0.99949,0.99962,0.99962,0.99965,0.99971,0.99978,0.99987,0.99991,1.00000
+
hwc1u1fract=0.00398,0.00892,0.01588,0.02362,0.03275,0.04395,0.05640,0.07043,0.08642
0.10347,0.12247,0.14388,0.16656,0.18915,0.21351,0.23952,0.26565,0.29077,0.31672
0.34270,0.36939,0.39584,0.42072,0.44496,0.47035,0.49415,0.51666,0.53922,0.55969
@@ -47,6 +53,7 @@ hwc1u1fract=0.00398,0.00892,0.01588,0.02362,0.03275,0.04395,0.05640,0.07043,0.08
0.99443,0.99455,0.99473,0.99485,0.99508,0.99526,0.99576,0.99608,0.99655,0.99697
0.99735,0.99756,0.99773,0.99782,0.99800,0.99835,0.99853,0.99873,0.99888,0.99903
0.99906,0.99909,0.99912,0.99915,0.99935,0.99953,0.99973,0.99988,1.00000
+
hwc1v1fract=0.00580,0.01330,0.02203,0.03243,0.04381,0.05702,0.07421,0.09286,0.11261
0.13579,0.16045,0.18710,0.21364,0.24161,0.27088,0.30018,0.32624,0.35515,0.38228
0.40902,0.43640,0.46161,0.48598,0.50878,0.53129,0.55264,0.57352,0.59338,0.61242
@@ -61,6 +68,7 @@ hwc1v1fract=0.00580,0.01330,0.02203,0.03243,0.04381,0.05702,0.07421,0.09286,0.11
0.99180,0.99217,0.99256,0.99273,0.99307,0.99355,0.99380,0.99414,0.99445,0.99459
0.99501,0.99524,0.99563,0.99577,0.99594,0.99617,0.99648,0.99665,0.99696,0.99715
0.99732,0.99755,0.99777,0.99828,0.99870,0.99899,0.99935,0.99961,1.00000
+
hwc1y2fract=0.00133,0.00393,0.00838,0.01486,0.02499,0.03933,0.05745,0.08036,0.10760
0.13765,0.16835,0.20049,0.23275,0.26415,0.29454,0.32368,0.35300,0.38126,0.40584
0.43187,0.45559,0.48100,0.50321,0.52668,0.54773,0.56822,0.58772,0.60622,0.62490
@@ -75,6 +83,7 @@ hwc1y2fract=0.00133,0.00393,0.00838,0.01486,0.02499,0.03933,0.05745,0.08036,0.10
0.99697,0.99715,0.99724,0.99742,0.99747,0.99756,0.99776,0.99794,0.99815,0.99824
0.99835,0.99844,0.99849,0.99867,0.99887,0.99905,0.99921,0.99934,0.99937,0.99944
0.99959,0.99971,0.99973,0.99982,0.99982,0.99989,0.99989,0.99993,1.00000
+
hwc1x2fract=0.00841,0.01726,0.02881,0.04040,0.05336,0.06825,0.08367,0.10129,0.12053
0.14234,0.16343,0.18757,0.21164,0.23530,0.26214,0.28874,0.31559,0.34235,0.36887
0.39386,0.41990,0.44565,0.47161,0.49406,0.51773,0.54067,0.56264,0.58417,0.60578
@@ -89,6 +98,7 @@ hwc1x2fract=0.00841,0.01726,0.02881,0.04040,0.05336,0.06825,0.08367,0.10129,0.12
0.99344,0.99364,0.99372,0.99388,0.99408,0.99433,0.99441,0.99457,0.99497,0.99533
0.99545,0.99561,0.99585,0.99618,0.99634,0.99658,0.99690,0.99722,0.99759,0.99779
0.99827,0.99839,0.99851,0.99875,0.99891,0.99907,0.99928,0.99936,1.00000
+
hwc2x1fract=0.00489,0.01088,0.01743,0.02515,0.03469,0.04551,0.05803,0.07238,0.08804
0.10482,0.12312,0.14230,0.16288,0.18402,0.20636,0.22862,0.25139,0.27465,0.29794
0.32047,0.34303,0.36674,0.38892,0.41062,0.43218,0.45276,0.47297,0.49268,0.51171
@@ -103,6 +113,7 @@ hwc2x1fract=0.00489,0.01088,0.01743,0.02515,0.03469,0.04551,0.05803,0.07238,0.08
0.99366,0.99404,0.99429,0.99464,0.99489,0.99521,0.99543,0.99571,0.99591,0.99620
0.99650,0.99678,0.99699,0.99718,0.99743,0.99756,0.99776,0.99795,0.99809,0.99834
0.99851,0.99872,0.99889,0.99902,0.99921,0.99934,0.99957,0.99979,1.00000
+
hwc2y1fract=0.00221,0.00495,0.00877,0.01359,0.01918,0.02666,0.03473,0.04453,0.05562
0.06888,0.08430,0.10080,0.11868,0.13789,0.15831,0.17942,0.20056,0.22237,0.24468
0.26619,0.28820,0.31000,0.33257,0.35403,0.37524,0.39523,0.41537,0.43443,0.45304
@@ -117,6 +128,7 @@ hwc2y1fract=0.00221,0.00495,0.00877,0.01359,0.01918,0.02666,0.03473,0.04453,0.05
0.99152,0.99212,0.99272,0.99307,0.99355,0.99399,0.99438,0.99471,0.99520,0.99560
0.99588,0.99628,0.99659,0.99681,0.99707,0.99725,0.99758,0.99785,0.99817,0.99837
0.99860,0.99886,0.99904,0.99922,0.99943,0.99960,0.99972,0.99985,1.00000
+
hwc2u1fract=0.00379,0.00830,0.01338,0.01995,0.02761,0.03638,0.04694,0.05922,0.07375
0.08955,0.10704,0.12618,0.14574,0.16695,0.18863,0.21090,0.23311,0.25590,0.27876
0.30145,0.32359,0.34586,0.36832,0.38955,0.41039,0.43098,0.45070,0.46956,0.48793
@@ -131,6 +143,7 @@ hwc2u1fract=0.00379,0.00830,0.01338,0.01995,0.02761,0.03638,0.04694,0.05922,0.07
0.99009,0.99065,0.99102,0.99155,0.99217,0.99258,0.99300,0.99337,0.99373,0.99411
0.99441,0.99464,0.99498,0.99543,0.99594,0.99647,0.99691,0.99719,0.99749,0.99779
0.99816,0.99837,0.99859,0.99886,0.99907,0.99933,0.99951,0.99971,1.00000
+
hwc2v1fract=0.00288,0.00650,0.01128,0.01757,0.02438,0.03290,0.04248,0.05390,0.06736
0.08262,0.09958,0.11796,0.13723,0.15713,0.17782,0.19995,0.22219,0.24485,0.26757
0.29009,0.31224,0.33420,0.35570,0.37722,0.39805,0.41826,0.43765,0.45671,0.47523
@@ -145,6 +158,7 @@ hwc2v1fract=0.00288,0.00650,0.01128,0.01757,0.02438,0.03290,0.04248,0.05390,0.06
0.98723,0.98788,0.98863,0.98916,0.98978,0.99023,0.99081,0.99155,0.99224,0.99273
0.99325,0.99367,0.99411,0.99448,0.99484,0.99533,0.99590,0.99621,0.99652,0.99691
0.99741,0.99780,0.99827,0.99853,0.99882,0.99908,0.99943,0.99975,1.00000
+
hwc2y2fract=0.00160,0.00444,0.01062,0.02252,0.04178,0.06667,0.09457,0.12185,0.14828
0.17321,0.19657,0.21935,0.24123,0.26183,0.28100,0.29932,0.31591,0.33280,0.34835
0.36309,0.37696,0.39136,0.40499,0.41801,0.43102,0.44397,0.45626,0.46859,0.48057
@@ -159,6 +173,7 @@ hwc2y2fract=0.00160,0.00444,0.01062,0.02252,0.04178,0.06667,0.09457,0.12185,0.14
0.98661,0.98723,0.98782,0.98860,0.98924,0.98985,0.99050,0.99123,0.99176,0.99228
0.99283,0.99333,0.99383,0.99424,0.99473,0.99521,0.99569,0.99610,0.99650,0.99682
0.99725,0.99755,0.99788,0.99824,0.99860,0.99896,0.99931,0.99969,1.00000
+
hwc2x2fract=0.00395,0.00888,0.01485,0.02199,0.03022,0.04000,0.05108,0.06378,0.07859
0.09479,0.11265,0.13127,0.15138,0.17208,0.19378,0.21665,0.24001,0.26354,0.28690
0.30961,0.33310,0.35610,0.37755,0.39974,0.42105,0.44105,0.46108,0.48066,0.49966
@@ -172,4 +187,4 @@ hwc2x2fract=0.00395,0.00888,0.01485,0.02199,0.03022,0.04000,0.05108,0.06378,0.07
0.98593,0.98657,0.98725,0.98788,0.98845,0.98911,0.98961,0.99009,0.99048,0.99097
0.99139,0.99190,0.99219,0.99251,0.99288,0.99319,0.99365,0.99404,0.99445,0.99482
0.99518,0.99556,0.99586,0.99612,0.99637,0.99667,0.99709,0.99737,0.99761,0.99781
-0.99796,0.99810,0.99829,0.99861,0.99895,0.99915,0.99949,0.99973,1.00000
\ No newline at end of file
+0.99796,0.99810,0.99829,0.99861,0.99895,0.99915,0.99949,0.99973,1.00000
diff --git a/PARAM/HMS/GEN/hcana.param b/PARAM/HMS/GEN/hcana.param
index 30732df6e86e576432fe679a02b9997fb393d9ee..da2f2c65d81cd54c7b397c87430162061088cde3 100644
--- a/PARAM/HMS/GEN/hcana.param
+++ b/PARAM/HMS/GEN/hcana.param
@@ -25,20 +25,5 @@ hcal_layer_names = "1pr 2ta 3ta 4ta"
haero_num_pairs = 8
-# Names of planes so that parameter names can be constructed
-hdc_plane_names = "1x1 1y1 1u1 1v1 1y2 1x2 2x1 2y1 2u1 2v1 2y2 2x2"
-
# The following were defined in REPLAY.PARAM
h_recon_coeff_filename = 'DATFILES/hms_recon_coeff.dat' ;hms optics matrix
-
-# The following are set to zero to replicate historical ENGINE behavior
-# For new analyses they should be set to 1. If not defined here,
-# hcana will default 1, the new and correct behaviour.
-
-# If 1, Let a hit have different L/R assignment for different space points
-# instead of L/R assignment from first sp it appears in.
-hdc_fix_lr = 0
-# If 1, don't do the the propagation along the wire each time the hit
-# appears in a space point. (Which means the correction accumulates)
-hdc_fix_propcorr = 0
-
diff --git a/PARAM/README.md b/PARAM/README.md
index e86ed17d0b34b68e05304bd425bcb222a730a809..397425b825a1ea4126ecf9b9c3847739ed9ded56 100644
--- a/PARAM/README.md
+++ b/PARAM/README.md
@@ -32,25 +32,111 @@
## `Xdc.param`
+* `Xdc_num_chambers`
+ * Number of drift chambers in detector.
+ * int
+ * `THcDC::fNChambers`
+* `Xdc_num_planes`
+ * Total number of drift chamber planes in detector.
+ * int
+ * `THcDC::fNPlanes`
* `Xdc_plane_names`
* Names of planes.
* string
* `THcDC::Setup::planenamelist`
+* `Xdc_chamber_planes`
+ * Index of chamber that each plane belongs to. Chamber number starts with 1.
+ * [int]
+ * `THcDC::fNChamber`
+* `Xdc_nrwire`
+ * Number of wires in each plane.
+ * [int]
+ * `THcDC::fNWires`
+
+## `Xdc.pos`
+
+* `Xdc_xcenter`
+ * x position in cm of center for each wire chamber.
+ * [double]
+ * `THcDC::fXCenter`
+* `Xdc_ycenter`
+ * y position in cm of center for each wire chamber.
+ * [double]
+ * `THcDC::fYCenter`
+* `Xdc_N_zpos`
+ * z position in cm of center for each wire chamber.
+ * double
+ * internal only
+* `Xdc_N_roll`
+ * Roll in degrees for each wire chamber. Added to `Xdc_alpha_angle`.
+ * double
+ * internal only
+* `Xdc_N_pitch`
+ * Pitch in degrees for each wire chamber. Added to `Xdc_beta_angle`.
+ * double
+ * internal only
+* `Xdc_N_yaw`
+ * Yaw in degrees for each wire chamber. Added to `Xdc_gamma_angle`.
+ * double
+ * internal only
+
+
+* `Xdc_central_wire`
+ * Wire number of center of wire chamber for each plane. Basically, this is
+ number of imaginary wire, that would cross center of plane. Wire numbers
+ start with 1.
+ * [double]
+ * `THcDC::fCentralWire`
+* `Xdc_pitch`
+ * Distance between wires for each plane in cm.
+ * [double]
+ * `THcDC::fPitch`
+* `Xdc_wire_counting`
+ * Order in which wires are counted in each plane.
+ * `Xdc_wire_counting == 0` : `center = (wire - Xdc_central_wire) * pitch`
+ * `Xdc_wire_counting == 1` : `center = (Xdc_nrwire + 1 - wire -
+ Xdc_central_wire) * pitch`
+ * [{0, 1}]
+ * `THcDC::fWireOrder`
+* `Xdc_zpos`
+ * Position along z in cm of each plane measured from focal plane.
+ * [double]
+ * `THcDC::fZPos`
+* `Xdc_alpha_angle`
+ * Angle $\alpha$ of wires for each plane in radians. Basically the angle of
+ the wires. See also [link][SOS_tracking].
+ * [double]
+ * `THcDC::fAlphaAngle`
+* `Xdc_beta_angle`
+ * Angle $\beta$ of wires for each plane in radians. See also
+ [link][SOS_tracking].
+ * [double]
+ * `THcDC::fBetaAngle`
+* `Xdc_gamma_angle`
+ * Angle $\gamma$ of wires for each plane in radians. See also
+ [link][SOS_tracking].
+ * [double]
+ * `THcDC::fGammaAngle`
+
+[SOS_tracking]: https://hallcweb.jlab.org/DocDB/0008/000812/001/SOS_Tracking.pdf (Tracking in the SOS Spectrometer)
+
+## `Xdc_tracking.param`
+
* `Xdc_sigma`
* Sigma of wire chamber resolution for each plane.
* [double]
* `THcDC::fSigma`
* `Xdc_tdc_min_win`
- * TDC window lower limit for each plane.
+* TDC window lower limit for each plane.
* [int]
* `THcDC::fTdcWinMin`
-* `Xdc_tdc_max_win`
- * TDC window higher limit for each plane.
+ * `Xdc_tdc_max_win`
+* TDC window higher limit for each plane.
* [int]
* `THcDC::fTdcWinMax`
-* `Xdc_tdc_time_per_channel`
- * Conversion factor from TDC clicks to ns.
- * CAEN 1190 : 100 ps/click
+ * `Xdc_tdc_time_per_channel`
+* Conversion factor from TDC clicks to ns.
+ * CAEN 1190 : 100 ps/click
* double
* `THcDC::fNSperChan`
* `Xdc_plane_time_zero`
@@ -87,72 +173,7 @@ The velocity correction is the distance from the center of the wire divided by
the velocity of propagation times Xdc_drifttime_sign(plane). +/-1 for disc. card
at +/- coord. (i.e. top = -x direction, so top readout is +1)
-## `Xdc.pos`
-
-* `Xdc_num_planes`
- * Total number of drift chamber planes in detector.
- * int
- * `THcDC::fNPlanes`
-* `Xdc_num_chambers`
- * Number of drift chambers in detector.
- * int
- * `THcDC::fNChambers`
-* `Xdc_zpos`
- * Position along z in cm of each plane measured from focal plane.
- * [double]
- * `THcDC::fZPos`
-* `Xdc_alpha_angle`
- * Angle $\alpha$ of wires for each plane in radians. Basically the angle of
- the wires. See also [link][SOS_tracking].
- * [double]
- * `THcDC::fAlphaAngle`
-* `Xdc_beta_angle`
- * Angle $\beta$ of wires for each plane in radians. See also
- [link][SOS_tracking].
- * [double]
- * `THcDC::fBetaAngle`
-* `Xdc_gamma_angle`
- * Angle $\gamma$ of wires for each plane in radians. See also
- [link][SOS_tracking].
- * [double]
- * `THcDC::fGammaAngle`
-* `Xdc_pitch`
- * Distance between wires for each plane in cm.
- * [double]
- * `THcDC::fPitch`
-* `Xdc_nrwire`
- * Number of wires in each plane.
- * [int]
- * `THcDC::fNWires`
-* `Xdc_xcenter`
- * x position of center of each wire chamber.
- * [double]
- * `THcDC::fXCenter`
-* `Xdc_ycenter`
- * y position of center of each wire chamber.
- * [double]
- * `THcDC::fYCenter`
-* `Xdc_central_wire`
- * Wire number of center of wire chamber for each plane. Basically, this is
- number of imaginary wire, that would cross center of plane. Wire numbers
- start with 1.
- * [double]
- * `THcDC::fCentralWire`
-* `Xdc_chamber_planes`
- * Number of chamber that each plane belongs to. Chamber number starts with 1.
- * [int]
- * `THcDC::fNChamber`
-* `Xdc_wire_counting`
- * Order in which wires are counted in each plane.
- * `Xdc_wire_counting == 0` : `center = (wire - Xdc_central_wire) * pitch`
- * `Xdc_wire_counting == 1` : `center = (Xdc_nrwire + 1 - wire -
- Xdc_central_wire) * pitch`
- * [{0, 1}]
- * `THcDC::fWireOrder`
-
-[SOS_tracking]: https://hallcweb.jlab.org/DocDB/0008/000812/001/SOS_Tracking.pdf (Tracking in the SOS Spectrometer)
-
-## `driftmap.param`
+## `Xdriftmap.param`
Contains lookup table for drift time.
@@ -172,3 +193,26 @@ Contains lookup table for drift time.
* Drift time lookup table entries for plane Y.
* [double]
* `THcDriftChamberPlane::ReadDatabase::DriftMap`
+
+## Deprecated
+
+* `Xdc_num_deadwires`
+ * Number of dead wires in drift chambers (< 20 % efficiency)
+ * int
+* `Xdc_deadwire_plane`
+ * Plane number for each dead wire.
+ * [int]
+* `Xdc_deadwire_num`
+ * Wire number for each dead wire.
+ * [int]
+
+
+* `Xdc_card_no`
+ * Index of connector card for each wire.
+ * Single array for all planes.
+ * Wires start with plane 1, wire 1.
+ * For each plane there must be 'max number of wires' entries.
+ * [int]
+* `Xdc_card_delay`
+ * Cable delays for each connector card.
+ * [int]
diff --git a/PARAM/SHMS/DC/pdc.param b/PARAM/SHMS/DC/pdc.param
index eccefe0bf0fd2b6adf7b118657573d399eba3dfa..767a8946b06aff3166851b0373d7e2b58fae8775 100644
--- a/PARAM/SHMS/DC/pdc.param
+++ b/PARAM/SHMS/DC/pdc.param
@@ -1,28 +1,19 @@
-; Names of planes.
-pdc_plane_names = "1u1 1u2 1x1 1x2 1v1 1v2 2v2 2v1 2x2 2x1 2u2 2u1" ; TODO
+; GENERAL PARAMETERS
-; Sigma of wire chamber resolution for each plane.
-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
+; Number of drift chambers.
+pdc_num_chambers = 2
-; 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
+; Total number of planes.
+pdc_num_planes = 12
-; Conversion factor from TDC clicks to ns.
-pdc_tdc_time_per_channel = -0.10
+; Names of planes.
+pdc_plane_names = "1u1 1u2 1x1 1x2 1v1 1v2 2v2 2v1 2x2 2x1 2u2 2u1" ; TODO
-; Zero time correction for each plane in ns that is added to TDC time.
-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
+; Chamber index for each plane.
+pdc_chamber_planes = 1, 1, 1, 1, 1, 1
+ 2, 2, 2, 2, 2, 2
-; For wire velocity corrections.
-pdc_wire_velocity = 13.0 ; TODO
-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
+; Number of wires in each plane.
+; Should be 109 and 80, but edge sense wire were not strung.
+pdc_nrwire = 107, 107, 79, 79, 107, 107
+ 107, 107, 79, 79, 107, 107
diff --git a/PARAM/SHMS/DC/pdc.pos b/PARAM/SHMS/DC/pdc.pos
index f4abd195459d1537159338f62e5d6cc36c935af2..3d20b38b00a91541e7cf8f8f1760155b4d93737d 100644
--- a/PARAM/SHMS/DC/pdc.pos
+++ b/PARAM/SHMS/DC/pdc.pos
@@ -1,43 +1,69 @@
-; Total number of DC planes and chambers.
-pdc_num_planes = 12
-pdc_num_chambers = 2
-
+; CHAMBER POSITION PARAMETERS
+; x, y and z position of center for each wire chamber in cm.
+; From survey C1771.
+pdc_xcenter = -0.036, 0.008 ; TODO - final survey
+pdc_ycenter = 0.019, 0.013 ; TODO - final 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
- pdc_1_zpos - 0.1875*cminch
- pdc_1_zpos + 0.1875*cminch
- pdc_1_zpos + 0.4375*cminch
- pdc_1_zpos + 0.6875*cminch
- pdc_2_zpos - 0.6875*cminch
- pdc_2_zpos - 0.4375*cminch
- pdc_2_zpos - 0.1875*cminch
- pdc_2_zpos + 0.1875*cminch
- pdc_2_zpos + 0.4375*cminch
- pdc_2_zpos + 0.6875*cminch
+; Roll, pitch and yaw for each wire chamber in degrees.
+; From survey C1771.
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_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_1_yaw = -0.006 ; TODO - final survey
+pdc_2_yaw = -0.035 ; TODO - final survey
+
+
+; PLANE POSITION PARAMETERS
+
+; Wire number of center of wire chamber for each plane.
+; From technical drawings.
+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
+
+; Distance between wires for each plane in cm.
+; From technical drawings.
+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
+
+; Order in which wires are counted in each plane.
+pdc_wire_counting = 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0
+
+; z position in cm of each plane measured from focal plane.
+; From technical drawings.
+pdc_zpos = pdc_1_zpos - 0.6875*cminch
+ pdc_1_zpos - 0.4375*cminch
+ pdc_1_zpos - 0.1875*cminch
+ pdc_1_zpos + 0.1875*cminch
+ pdc_1_zpos + 0.4375*cminch
+ pdc_1_zpos + 0.6875*cminch
+ pdc_2_zpos - 0.6875*cminch
+ pdc_2_zpos - 0.4375*cminch
+ pdc_2_zpos - 0.1875*cminch
+ pdc_2_zpos + 0.1875*cminch
+ pdc_2_zpos + 0.4375*cminch
+ pdc_2_zpos + 0.6875*cminch
+
+; Alpha angle of wires for each plane in radians.
+; From technical drawings.
+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
+
+; Beta angle of wires for each plane in radians.
pdc_beta_angle = pdc_1_pitch*raddeg
pdc_1_pitch*raddeg
pdc_1_pitch*raddeg
@@ -51,9 +77,7 @@ pdc_beta_angle = pdc_1_pitch*raddeg
pdc_2_pitch*raddeg
pdc_2_pitch*raddeg
-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
+; Gamma angle of wires for each plane in radians
pdc_gamma_angle = pdc_1_yaw*raddeg
pdc_1_yaw*raddeg
pdc_1_yaw*raddeg
@@ -66,28 +90,3 @@ pdc_gamma_angle = pdc_1_yaw*raddeg
pdc_2_yaw*raddeg
pdc_2_yaw*raddeg
pdc_2_yaw*raddeg
-
-
-; 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 = 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.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
- 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
- 0, 0, 0, 0, 0, 0
diff --git a/PARAM/SHMS/DC/pdc_test_stand.param b/PARAM/SHMS/DC/pdc_test_stand.param
index 842f6f366f198c1c20c2190b7543b16ac1fde99e..be39f3af8de4d00f3f2e4d38e03e8d3a7d0ee240 100644
--- a/PARAM/SHMS/DC/pdc_test_stand.param
+++ b/PARAM/SHMS/DC/pdc_test_stand.param
@@ -1 +1,5 @@
-psel_using_scin = 0
\ No newline at end of file
+; TEST-STAND PARAMETERS
+; Custom parameter file which should be loaded when aiming to analyze HMS DC
+; data with no tracking.
+
+psel_using_scin = 0
diff --git a/PARAM/SHMS/DC/pdc_tracking.param b/PARAM/SHMS/DC/pdc_tracking.param
new file mode 100644
index 0000000000000000000000000000000000000000..3b9520b158683a63dde027e58e4862e2f37d0d4d
--- /dev/null
+++ b/PARAM/SHMS/DC/pdc_tracking.param
@@ -0,0 +1,27 @@
+; TRACKING PARAMETERS
+
+; Sigma of wire chamber resolution for each plane.
+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
+
+; 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 = 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 = 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