Merge pull request #85 from JureBericic/fixes

Minor fixes.

CALIBRATION/hodo_calib/README.md

@@ -30,21 +30,21 @@ Running code
 * Edit the parameters in tofcal.param into either PARAM/HMS/HODO/hhodo.param or  PARAM/SHMS/HODO/phodo.param
 
 Brief decription of code
------------------------- 
+------------------------
 * The code fits tcorr = time - offset - path * velocity - adccor / sqrt(ADC)
 * Uses paddle 10 positive PMT on plane 1 as the reference PMT ( offset fixed at 0)
 * To get data file name. Reads-in the input file: tofcal.inp 
-* Opens data file 
-** "0" line separates events
-** Should have pair of neg and pos PMTs for each paddle
-** Format is : iside  ipl ipad tdcval_uncorr pathl zcor tdcval_corr adcval
-*** iside =1,2 for pos and neg PMT
-*** ipl = plane number
-*** tdcval_uncorr = raw time in ns. The program uses this in optimization.
-*** pathl = distance for focal plane to the paddle using the track 
-*** zcor = time (ns) for the particle to go from focal plane to paddle. Correction subtracted from tdcval_uncrr
-*** tdcval_corr = the corrected time in ns. Not used by program. Just gives the initial chi2.
-*** adcval = ADC value used in fit
+* Opens data file
+    * "0" line separates events
+    * Should have pair of neg and pos PMTs for each paddle
+    * Format is : iside  ipl ipad tdcval_uncorr pathl zcor tdcval_corr adcval
+        * iside = 1,2 for pos and neg PMT
+        * ipl = plane number
+        * tdcval_uncorr = raw time in ns. The program uses this in optimization.
+        * pathl = distance for focal plane to the paddle using the track
+        * zcor = time (ns) for the particle to go from focal plane to paddle. Correction subtracted from tdcval_uncrr
+        * tdcval_corr = the corrected time in ns. Not used by program. Just gives the initial chi2.
+        * adcval = ADC value used in fit
 * Loops through data determines the number of hits in each PMT. Will only include PMT if the number of hits > 100.
 * Again loops through the data filling array with time difference between all pairs PMTs, pathl and adcval.
-* Use the CERNLIB routine deqn to invert the matrix and determine the fit parameters.
+* Use the CERNLIB routine deqn to invert the matrix and determine the fit parameters.
\ No newline at end of file

PARAM/SHMS/DC/pdc.pos

@@ -35,18 +35,18 @@ pdc_wire_counting = 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
+pdc_zpos = pdc_1_zpos - 0.68701*cminch
+           pdc_1_zpos - 0.43701*cminch
+           pdc_1_zpos - 0.18701*cminch
+           pdc_1_zpos + 0.18701*cminch
+           pdc_1_zpos + 0.43701*cminch
+           pdc_1_zpos + 0.68701*cminch
+           pdc_2_zpos - 0.68701*cminch
+           pdc_2_zpos - 0.43701*cminch
+           pdc_2_zpos - 0.18701*cminch
+           pdc_2_zpos + 0.18701*cminch
+           pdc_2_zpos + 0.43701*cminch
+           pdc_2_zpos + 0.68701*cminch
 
 ; Alpha angle of wires for each plane in radians.
 ; From technical drawings.

PARAM/SHMS/DC/pdc_tracking.param

@@ -14,7 +14,7 @@ pdc_tdc_max_win = 55000, 55000, 55000, 55000, 55000, 55000  ; TODO - wide limits
 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 = 1260.0, 1260.0, 1260.0, 1260.0, 1260.0, 1260.0  ; TODO - SOS values for now
+pdc_plane_time_zero = 1260.0, 1260.0, 1260.0, 1260.0, 1260.0, 1260.0
                       1260.0, 1260.0, 1260.0, 1260.0, 1260.0, 1260.0
 
 ; For wire velocity corrections.