diff --git a/DBASE/GEN/KPP_Spring_2017/calib_464.param b/DBASE/GEN/KPP_Spring_2017/calib_464.param
new file mode 100644
index 0000000000000000000000000000000000000000..c9d571e79fc141bbfa371402ea91b1e7fdf55fa9
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_464.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 464
+#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param"
\ No newline at end of file
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_469.param b/DBASE/GEN/KPP_Spring_2017/calib_469.param
new file mode 100644
index 0000000000000000000000000000000000000000..97ec87390edf8c339ed717727fa3dae8a300d15a
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_469.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 469
+#include "PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_469.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_475.param b/DBASE/GEN/KPP_Spring_2017/calib_475.param
new file mode 100644
index 0000000000000000000000000000000000000000..25666a9d1135d7cde63a4c9453198f6b34a13760
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_475.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 475
+#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_478.param b/DBASE/GEN/KPP_Spring_2017/calib_478.param
new file mode 100644
index 0000000000000000000000000000000000000000..7605b7b85434ac12e3d4fb878a0dd88a19be1f83
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_478.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 478
+#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_479.param b/DBASE/GEN/KPP_Spring_2017/calib_479.param
new file mode 100644
index 0000000000000000000000000000000000000000..659cd6045a84997656bebb36501fb5aed575312a
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_479.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 479
+#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_480.param b/DBASE/GEN/KPP_Spring_2017/calib_480.param
new file mode 100644
index 0000000000000000000000000000000000000000..89bdeb226d9da2183e920ee86905d6fc3ecd5536
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_480.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 480
+#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param"
\ No newline at end of file
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_481.param b/DBASE/GEN/KPP_Spring_2017/calib_481.param
new file mode 100644
index 0000000000000000000000000000000000000000..b8b0e9aa51f99f41ffd82fe000a1c26369e92256
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_481.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 481
+#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_483.param b/DBASE/GEN/KPP_Spring_2017/calib_483.param
new file mode 100644
index 0000000000000000000000000000000000000000..701ba9f1d3df55751b4baae296fcfa8203d0b1d2
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_483.param
@@ -0,0 +1,3 @@
+; SHMS calibration files for run 483
+#include "PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param"
+#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_484.param b/DBASE/GEN/KPP_Spring_2017/calib_484.param
new file mode 100644
index 0000000000000000000000000000000000000000..332dd8be3fc1b46c284ec54bdbe1683610781f47
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_484.param
@@ -0,0 +1,3 @@
+; SHMS calibration files for run 484
+#include "PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_484.param"
+#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_486.param b/DBASE/GEN/KPP_Spring_2017/calib_486.param
new file mode 100644
index 0000000000000000000000000000000000000000..6d069e0434f3581fe8f3573041d3fd6dfc9b2f36
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_486.param
@@ -0,0 +1,2 @@
+; SHMS calibration files for run 486
+#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_487.param b/DBASE/GEN/KPP_Spring_2017/calib_487.param
new file mode 100644
index 0000000000000000000000000000000000000000..e93fa8ed3266d1207c55bb8051e13a4eb881f296
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_487.param
@@ -0,0 +1,3 @@
+; SHMS calibration files for run 487
+#include "PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param"
+#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_488.param b/DBASE/GEN/KPP_Spring_2017/calib_488.param
new file mode 100644
index 0000000000000000000000000000000000000000..204b61dcb7e8a4aa9e0224285656f032f1593e1d
--- /dev/null
+++ b/DBASE/GEN/KPP_Spring_2017/calib_488.param
@@ -0,0 +1,5 @@
+; SHMS calibration files for run 488
+#include "PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param"
+#include "PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_488.param"
+#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param"
+#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param"
diff --git a/DBASE/GEN/KPP_Spring_2017/general_464.param b/DBASE/GEN/KPP_Spring_2017/general_464.param
deleted file mode 100644
index 1c0cdbb0db9a990f5f396e6d1fc0baa656330463..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_464.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/KPP_Spring_2017/pcal_464.param"
-#include "PARAM/SHMS/HGCER/phgcer.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_475.param b/DBASE/GEN/KPP_Spring_2017/general_475.param
deleted file mode 100644
index 1e93f621091c439b0ea536da9250074fd30cdf5f..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_475.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/KPP_Spring_2017/pcal_475.param"
-#include "PARAM/SHMS/HGCER/phgcer.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_478.param b/DBASE/GEN/KPP_Spring_2017/general_478.param
deleted file mode 100644
index 73ecb330b30ffff5b7e1a5f350279935558c7c5c..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_478.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/KPP_Spring_2017/pcal_478.param"
-#include "PARAM/SHMS/HGCER/phgcer.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_479.param b/DBASE/GEN/KPP_Spring_2017/general_479.param
deleted file mode 100644
index 5b2b75e3de0680d0cae2b160954e1f5836e43199..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_479.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/KPP_Spring_2017/pcal_479.param"
-#include "PARAM/SHMS/HGCER/phgcer.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_480.param b/DBASE/GEN/KPP_Spring_2017/general_480.param
deleted file mode 100644
index 5c57f41a020915008f5c7843d958027078721cf3..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_480.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/KPP_Spring_2017/pcal_480.param"
-#include "PARAM/SHMS/HGCER/phgcer.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_481.param b/DBASE/GEN/KPP_Spring_2017/general_481.param
deleted file mode 100644
index b81bd8440a8de3a240346e0e48407786534e6ec9..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_481.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/KPP_Spring_2017/pcal_481.param"
-#include "PARAM/SHMS/HGCER/phgcer.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_483.param b/DBASE/GEN/KPP_Spring_2017/general_483.param
deleted file mode 100644
index 59aac4133c91b56c71de223a58a496c42a018e9f..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_483.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/pcal.param"
-#include "PARAM/SHMS/HGCER/KPP_Spring_2017/phgcer_483.param"
-#include "PARAM/SHMS/NGCER/KPP_Spring_2017/pngcer_483.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_484.param b/DBASE/GEN/KPP_Spring_2017/general_484.param
deleted file mode 100644
index 96c83f11bd94161ab82ac24fc452c29c98186e58..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_484.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/pcal.param"
-#include "PARAM/SHMS/HGCER/KPP_Spring_2017/phgcer_484.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_486.param b/DBASE/GEN/KPP_Spring_2017/general_486.param
deleted file mode 100644
index c798c2b878b7ec87bd276a3f5256d700b3279f9d..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_486.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/pcal.param"
-#include "PARAM/SHMS/HGCER/KPP_Spring_2017/phgcer_486.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_487.param b/DBASE/GEN/KPP_Spring_2017/general_487.param
deleted file mode 100644
index 20f2967addfe0c838d86a1926d17fbe21cce10b7..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_487.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/pcal.param"
-#include "PARAM/SHMS/HGCER/KPP_Spring_2017/phgcer_487.param"
-#include "PARAM/SHMS/NGCER/KPP_Spring_2017/pngcer_487.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/KPP_Spring_2017/general_488.param b/DBASE/GEN/KPP_Spring_2017/general_488.param
deleted file mode 100644
index 0f58c8e30b8142ecc6fe919508f50307b803d17d..0000000000000000000000000000000000000000
--- a/DBASE/GEN/KPP_Spring_2017/general_488.param
+++ /dev/null
@@ -1,49 +0,0 @@
-#real raddeg
-raddeg=3.14159265/180
-#real cminch
-cminch=2.54
-
-; General Hall-C parameter files
-#include "PARAM/GEN/genflags.param"
-#include "PARAM/GEN/gdebug.param"
-#include "PARAM/GEN/gtarget.param"
-#include "PARAM/GEN/gbeam.param"
-
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS detector specific paramter files
-#include "PARAM/HMS/AERO/haero.param"
-#include "PARAM/HMS/CAL/hcal.pos"
-#include "PARAM/HMS/CAL/hcal.param"
-#include "PARAM/HMS/CER/hcer.param"
-#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"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/KPP_Spring_2017/pcal_488.param"
-#include "PARAM/SHMS/HGCER/KPP_Spring_2017/phgcer_488.param"
-#include "PARAM/SHMS/NGCER/KPP_Spring_2017/pngcer_488.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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/DBASE/GEN/general.param b/DBASE/GEN/general.param
index b9b3a3552b918c49ba76e805395a1487d9f2c4f8..6e2ac4bf9f11bb0e63dab7d7cec4a8efa6f75472 100644
--- a/DBASE/GEN/general.param
+++ b/DBASE/GEN/general.param
@@ -35,15 +35,26 @@ cminch=2.54
#include "PARAM/SHMS/GEN/shmsflags.param"
#include "PARAM/SHMS/GEN/ptracking.param"
-; SHMS detector specific paramter files
-#include "PARAM/SHMS/AERO/paero.param"
-#include "PARAM/SHMS/CAL/pcal.param"
-#include "PARAM/SHMS/HGCER/phgcer.param"
-#include "PARAM/SHMS/NGCER/pngcer.param"
-#include "PARAM/SHMS/DC/pdc.param"
-#include "PARAM/SHMS/DC/pdc.pos"
-#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
-#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"
+; SHMS default geometry parameter files
+#include "PARAM/SHMS/NGCER/GEOM/pngcer_geom.param"
+#include "PARAM/SHMS/DC/GEOM/pdc_geom.param"
+#include "PARAM/SHMS/HODO/GEOM/phodo_geom.param"
+#include "PARAM/SHMS/HGCER/GEOM/phgcer_geom.param"
+#include "PARAM/SHMS/AERO/GEOM/paero_geom.param"
+#include "PARAM/SHMS/CAL/GEOM/pcal_geom.param"
+
+; SHMS default cut parameter files
+#include "PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param"
+#include "PARAM/SHMS/DC/CUTS/pdc_cuts.param"
+#include "PARAM/SHMS/HODO/CUTS/phodo_cuts.param"
+#include "PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param"
+#include "PARAM/SHMS/AERO/CUTS/paero_cuts.param"
+#include "PARAM/SHMS/CAL/CUTS/pcal_cuts.param"
+
+; SHMS default calibration parameter files
+#include "PARAM/SHMS/NGCER/CALIB/pngcer_calib.param"
+#include "PARAM/SHMS/DC/CALIB/pdc_calib.param"
+#include "PARAM/SHMS/HODO/CALIB/phodo_calib.param"
+#include "PARAM/SHMS/HGCER/CALIB/phgcer_calib.param"
+#include "PARAM/SHMS/AERO/CALIB/paero_calib.param"
+#include "PARAM/SHMS/CAL/CALIB/pcal_calib.param"
\ No newline at end of file
diff --git a/DBASE/STD/standard.database b/DBASE/STD/standard.database
index b81521b9cc8b6f4a0360df9d08284f0c8a9cac4e..2f0cd4d30d4b5236374ac4f59a391cf22df413b9 100644
--- a/DBASE/STD/standard.database
+++ b/DBASE/STD/standard.database
@@ -3,34 +3,37 @@ g_ctp_parm_filename ="DBASE/GEN/general.param"
g_ctp_kinematics_filename ="DBASE/STD/standard.kinematics"
464-464
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_464.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_464.param"
+
+469-469
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_469.param"
475-475
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_475.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_475.param"
478-478
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_478.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_478.param"
479-479
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_479.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_479.param"
480-480
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_480.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_480.param"
481-481
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_481.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_481.param"
483-483
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_483.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_483.param"
484-484
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_484.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_484.param"
486-486
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_486.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_486.param"
487-487
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_487.param"
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_487.param"
488-488
-g_ctp_parm_filename ="DBASE/GEN/KPP_Spring_2017/general_488.param"
\ No newline at end of file
+g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_488.param"
\ No newline at end of file
diff --git a/PARAM/SHMS/AERO/CALIB/paero_calib.param b/PARAM/SHMS/AERO/CALIB/paero_calib.param
new file mode 100644
index 0000000000000000000000000000000000000000..ab5ec0947e845ec6e6adbf3c8e6d9b99cb5b2aaf
--- /dev/null
+++ b/PARAM/SHMS/AERO/CALIB/paero_calib.param
@@ -0,0 +1,5 @@
+; Positive aerogel gain factors
+paero_pos_gain = 1./496.7, 1./467.5, 1./554.3, 1./766.1, 1./412.1, 1./517.9, 1./435.6
+
+; Negative aerogel gain factors
+paero_neg_gain = 1./586.8, 1./536.5, 1./690.5, 1./563.1, 1./574.4, 1./432.7, 1./601.5
\ No newline at end of file
diff --git a/PARAM/SHMS/AERO/CUTS/paero_cuts.param b/PARAM/SHMS/AERO/CUTS/paero_cuts.param
new file mode 100644
index 0000000000000000000000000000000000000000..6bb669581c33615dcdfe3e09f8714015fd19c667
--- /dev/null
+++ b/PARAM/SHMS/AERO/CUTS/paero_cuts.param
@@ -0,0 +1,18 @@
+; Track matching reduced chi2 cut values
+paero_red_chi2_min = 0.0
+paero_red_chi2_max = 25.0
+
+; Track matching beta cut values
+paero_beta_min = 0.0
+paero_beta_max = 1.2
+
+; Track matching normailized energy (E/p) cut values
+paero_enorm_min = 0.0
+paero_enorm_max = 1.5
+
+; ADC time window cut values used to select "good" ADC events
+paero_adcTimeWindowMin = 500.
+paero_adcTimeWindowMax = 2500.
+
+; NPE Threshold for "good" hit (for measureing effic.)
+paero_npe_thresh = 0.5
diff --git a/PARAM/SHMS/AERO/GEOM/paero_geom.param b/PARAM/SHMS/AERO/GEOM/paero_geom.param
new file mode 100644
index 0000000000000000000000000000000000000000..f62255fabc0f7fd09032f0c7a6d347ebb0eb955e
--- /dev/null
+++ b/PARAM/SHMS/AERO/GEOM/paero_geom.param
@@ -0,0 +1,21 @@
+; Number of aerogel pairs of pmt's
+paero_num_pairs = 7
+
+; Value of zpos for diffusion box cited by Hamlet M. 03/29/2017
+paero_diff_box_zpos = 231.0
+
+; Number of regions in which tracks can be matched to
+paero_num_regions = 1;
+
+; phgcer_region: 8 values for each region
+; central x,y,dx,dy values and x,y,dx,dy half widths.
+; Defined in clomuns, region 1, region 2, region 3, region 4...
+; Assumes rectangular volume with x = 103.0 cm and y = 113.0 cm
+paero_region = 0.0,
+ 0.0,
+ 0.0,
+ 0.0,
+ 51.5,
+ 56.5,
+ 0.15,
+ 0.1
\ No newline at end of file
diff --git a/PARAM/SHMS/AERO/paero.param b/PARAM/SHMS/AERO/paero.param
deleted file mode 100644
index 84412bb33fa1aa118d45c0f9a7c4526efd3e4122..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/AERO/paero.param
+++ /dev/null
@@ -1,46 +0,0 @@
-; Number of aerogel pairs of pmt's
-paero_num_pairs = 7
-
-; Positive aerogel gain factors
-paero_pos_gain = 1./496.7, 1./467.5, 1./554.3, 1./766.1, 1./412.1, 1./517.9, 1./435.6
-
-; Negative aerogel gain factors
-paero_neg_gain = 1./586.8, 1./536.5, 1./690.5, 1./563.1, 1./574.4, 1./432.7, 1./601.5
-
-; Track matching reduced chi2 cut values
-paero_red_chi2_min = 0.0
-paero_red_chi2_max = 25.0
-
-; Track matching beta cut values
-paero_beta_min = 0.0
-paero_beta_max = 1.2
-
-; Track matching normailized energy (E/p) cut values
-paero_enorm_min = 0.0
-paero_enorm_max = 1.5
-
-; ADC time window cut values used to select "good" ADC events
-paero_adcTimeWindowMin = 500.
-paero_adcTimeWindowMax = 2500.
-
-; NPE Threshold for "good" hit (for measureing effic.)
-paero_npe_thresh = 0.5
-
-; Value of zpos for diffusion box cited by Hamlet M. 03/29/2017
-paero_diff_box_zpos = 231.0
-
-; Number of regions in which tracks can be matched to
-paero_num_regions = 1;
-
-; phgcer_region: 8 values for each region
-; central x,y,dx,dy values and x,y,dx,dy half widths.
-; Defined in clomuns, region 1, region 2, region 3, region 4...
-; Assumes rectangular volume with x = 103.0 cm and y = 113.0 cm
-paero_region = 0.0,
- 0.0,
- 0.0,
- 0.0,
- 51.5,
- 56.5,
- 0.15,
- 0.1
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param
new file mode 100644
index 0000000000000000000000000000000000000000..da17a867eab0076f97057bcf3559b62d0a9f7e4a
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param
@@ -0,0 +1,18 @@
+; Calibration constants for run report_464, 66161 events processed
+
+pcal_neg_gain_cor = 0.3, 0.281, 0.242, 0.295, 0.218, 0.370, 0.474, 0.379, 0.249, 0.316, 0.339, 0.215, 0.490, 0.3,
+pcal_pos_gain_cor = 0.307, 0.216, 0.211, 0.282, 0.238, 0.228, 0.287, 0.228, 0.472, 0.194, 0.377, 0.360, 0.633, 0.3,
+pcal_arr_gain_cor = 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 0.750, 0.890, 0.805, 0.591, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 0.651, 0.586, 0.559, 1.262, 1.123, 0.940, 0.598, 1.000, 1.000, 1.000, 0.772, 0.752, 1.446, 1.000, 1.000,
+ 1.000, 0.719, 0.623, 1.394, 0.366, 0.826, 0.892, 1.124, 1.468, 0.669, 0.947, 1.030, 1.429, 0.353, 1.000, 1.000,
+ 1.000, 0.571, 1.019, 0.888, 0.508, 0.832, 1.136, 0.885, 0.819, 0.791, 0.670, 0.456, 0.817, 0.752, 1.000, 1.000,
+ 1.000, 0.198, 0.311, 0.270, 0.363, 0.262, 0.362, 0.439, 0.229, 0.365, 0.529, 0.418, 0.568, 0.341, 0.231, 1.000,
+ 1.000, 1.000, 0.614, 0.664, 0.945, 0.897, 0.520, 0.922, 1.258, 1.413, 0.550, 1.286, 0.563, 0.546, 1.000, 1.000,
+ 1.000, 1.000, 0.389, 0.826, 0.508, 1.221, 0.966, 1.000, 1.000, 1.000, 0.821, 0.782, 1.091, 0.683, 0.489, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 0.713, 0.742, 0.541, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param
new file mode 100644
index 0000000000000000000000000000000000000000..a39865f900e6db0165ddd873df3e26f892a475a0
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param
@@ -0,0 +1,18 @@
+; Calibration constants for run 475_-1, 283000 events processed
+
+pcal_neg_gain_cor = 0.191, 0.273, 0.231, 0.281, 0.209, 0.354, 0.467, 0.373, 0.246, 0.312, 0.333, 0.214, 0.305, 1.480,
+pcal_pos_gain_cor = 0.966, 0.206, 0.206, 0.278, 0.234, 0.224, 0.284, 0.227, 0.468, 0.190, 0.375, 0.359, 0.445, 2.266,
+pcal_arr_gain_cor = 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ 0.000, 0.542, 1.126, 0.922, 0.734, 0.782, 0.000, 3.196, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ 0.000, 1.134, 0.644, 0.788, 1.130, 1.296, 0.978, 0.000, 1.145, 0.000, 7.212, 0.000, 2.063, 0.000, 0.000, 0.000,
+ 0.000, 0.939, 0.785, 0.895, 0.777, 0.579, 1.616, 1.389, 0.999, 3.832, 4.220, 0.528, 0.964, 0.468, 3.595, 0.000,
+ -0.227, 0.585, 0.595, 0.557, 1.276, 1.120, 0.925, 0.614, 0.605, 0.852, 0.745, 0.741, 0.756, 1.402, 1.004, 0.465,
+ 0.000, 0.657, 0.631, 1.401, 0.368, 0.828, 0.896, 1.129, 1.472, 0.677, 0.956, 1.033, 1.439, 0.356, 0.462, 2.643,
+ 0.060, 0.691, 1.024, 0.898, 0.509, 0.839, 1.144, 0.889, 0.816, 0.790, 0.675, 0.458, 0.821, 0.742, 0.826, 0.000,
+ 0.623, 0.086, 0.331, 0.275, 0.368, 0.265, 0.365, 0.442, 0.231, 0.365, 0.531, 0.419, 0.572, 0.341, 0.263, 0.324,
+ 5.728,-0.410, 0.650, 0.673, 0.953, 0.895, 0.521, 0.927, 1.299, 1.417, 0.547, 1.288, 0.564, 0.548, 0.381, 0.000,
+ 0.000, 0.375, 0.396, 0.817, 0.511, 1.214, 0.937, 1.398, 0.592, 0.722, 0.809, 0.781, 1.094, 0.686, 0.432, 2.337,
+ 1.343, 0.103, 3.296, 1.010, 0.722, 0.780, 0.514, 0.772, 2.186, 0.985, 0.724, 0.846, 0.739, 0.533, 0.589, 3.208,
+ -0.532, 2.021, 0.137,-3.405, 0.807, 0.784, 1.370,-0.242, 0.000, 1.989, 0.654, 0.700, 0.952, 0.584, 0.000, 0.000,
+ 0.059,-0.518, 1.216, 0.000, 0.000, 0.000,-0.040, 0.000, 0.000, 9.954,-0.309, 0.000, 0.000, 3.539, 0.000, 0.000,
+ 0.135,-0.479,-0.128,-0.065,-0.072, 0.122, 0.748, 0.000, 1.168, 0.000, 0.091, 0.000, 0.613, 0.000, 0.000, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param
new file mode 100644
index 0000000000000000000000000000000000000000..fe0023cf3eb07accfa8b615f164bc83727553622
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param
@@ -0,0 +1,18 @@
+; Calibration constants for run 478_-1, 282423 events processed
+
+pcal_neg_gain_cor = 0.304, 0.208, 0.227, 0.280, 0.208, 0.352, 0.468, 0.373, 0.243, 0.310, 0.333, 0.214, 0.295, 0.734,
+pcal_pos_gain_cor = 1.257, 0.219, 0.207, 0.280, 0.235, 0.225, 0.282, 0.227, 0.470, 0.190, 0.375, 0.359, 0.457, 4.229,
+pcal_arr_gain_cor = 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ 0.000, 1.541, 1.256, 0.757, 3.973, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ 0.000, 0.585, 0.601, 0.632, 0.930, 1.148, 0.946, 0.000, 2.458, 0.000, 4.041, 0.000, 0.032, 0.000, 0.000, 0.000,
+ 0.000, 1.191, 0.482, 0.955, 0.784, 0.607, 1.493, 1.282, 0.000, 0.000, 1.919, 0.543, 0.932, 0.534,-1.355, 0.000,
+ -0.131, 0.597, 0.599, 0.555, 1.276, 1.115, 0.926, 0.610, 0.822, 0.887, 0.640, 0.729, 0.759, 1.383, 1.760, 2.086,
+ -0.892, 0.478, 0.624, 1.387, 0.366, 0.827, 0.895, 1.132, 1.459, 0.675, 0.956, 1.034, 1.435, 0.357, 0.456, 0.000,
+ 0.000, 0.575, 1.032, 0.887, 0.508, 0.835, 1.140, 0.892, 0.815, 0.791, 0.673, 0.458, 0.820, 0.739, 0.610, 0.000,
+ 0.406, 0.159, 0.332, 0.274, 0.367, 0.265, 0.366, 0.441, 0.231, 0.366, 0.532, 0.420, 0.572, 0.343, 0.180, 0.659,
+ -0.027, 0.852, 0.642, 0.676, 0.954, 0.895, 0.522, 0.922, 1.219, 1.410, 0.548, 1.293, 0.563, 0.549, 0.913, 0.000,
+ 1.548, 0.018, 0.414, 0.847, 0.513, 1.218, 0.943, 1.041, 0.912, 0.822, 0.805, 0.780, 1.097, 0.686, 0.380, 3.226,
+ -1.747, 2.302, 0.744, 0.831, 0.686, 0.884, 0.372, 0.658, 0.000, 1.157, 0.803, 0.842, 0.739, 0.534, 0.580, 0.000,
+ 0.464, 1.631, 2.294, 0.602, 1.149, 0.531, 0.799, 0.510, 0.000, 1.311, 0.470, 0.744, 0.971, 0.816, 0.000, 0.000,
+ 0.013, 0.199, 0.627, 0.000, 0.000, 0.000, 2.157, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 3.832, 0.000, 0.000,
+ 0.161, 0.924,-0.236, 0.067, 0.000, 0.124,-0.332, 0.000, 0.862, 0.000, 0.000, 0.000, 0.881, 0.000, 0.000, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param
new file mode 100644
index 0000000000000000000000000000000000000000..edd21143de357a73670f35063c51e11a63d1863d
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param
@@ -0,0 +1,25 @@
+; for now manually set hte FADC mode
+; 1 == Use the pulse int - pulse ped
+; 2 == Use the sample integral - known ped
+; 3 == Use the sample integral - sample ped
+; if not set then defaults to use the raw pulse integral
+pcal_ADCmode=1
+pcal_AdcTimeWindowMin=1300.
+; Calibration constants for run 479_-1, 278685 events processed
+
+pcal_neg_gain_cor = 0.226, 0.312, 0.229, 0.281, 0.209, 0.351, 0.467, 0.372, 0.244, 0.310, 0.333, 0.214, 0.282, 0.879,
+pcal_pos_gain_cor = 1.012, 0.237, 0.204, 0.278, 0.234, 0.224, 0.282, 0.226, 0.470, 0.191, 0.374, 0.359, 0.418, 1.238,
+pcal_arr_gain_cor = 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ -0.724, 0.482, 1.062, 0.714, 1.032, 0.000, 0.000, 0.000, 1.218, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ 0.000, 0.875, 0.765, 0.733, 0.803, 1.149, 0.861, 0.000, 3.282, 0.000, 3.856, 0.000, 0.814, 0.000, 0.000, 0.000,
+ 0.000, 0.782, 0.644, 0.932, 0.790, 0.599, 1.557, 1.240, 0.000, 0.000, 0.947, 0.679, 0.462, 0.551, 1.957, 0.000,
+ 0.964, 0.360, 0.601, 0.560, 1.278, 1.119, 0.932, 0.613, 0.772, 1.108, 0.707, 0.737, 0.760, 1.407, 0.820, 3.763,
+ 0.000,-0.034, 0.639, 1.391, 0.369, 0.830, 0.898, 1.131, 1.449, 0.682, 0.952, 1.035, 1.437, 0.357, 0.356, 1.327,
+ -3.506, 0.111, 1.059, 0.896, 0.507, 0.838, 1.145, 0.894, 0.819, 0.790, 0.674, 0.459, 0.820, 0.742, 0.532, 2.701,
+ 1.179, 0.142, 0.329, 0.274, 0.366, 0.263, 0.366, 0.442, 0.231, 0.365, 0.532, 0.419, 0.573, 0.339, 0.228,-0.411,
+ 0.370, 0.138, 0.644, 0.671, 0.948, 0.894, 0.526, 0.931, 1.262, 1.412, 0.547, 1.292, 0.563, 0.548, 1.027, 0.000,
+ 1.332, 1.186, 0.391, 0.829, 0.524, 1.229, 0.943, 1.230, 0.589, 0.906, 0.811, 0.781, 1.098, 0.687, 0.414, 0.806,
+ 2.454, 1.831, 0.000, 0.915, 0.547, 0.716, 0.336, 0.704, 2.243, 5.368, 0.540, 0.784, 0.737, 0.529, 0.994, 0.636,
+ 1.871, 0.414, 0.600, 0.384, 0.839, 0.890, 0.396, 1.352, 0.000, 0.996, 1.358,-0.914, 1.065, 1.114, 0.000, 5.720,
+ 0.284, 0.169, 0.751,-1.613, 0.000, 0.000, 0.311, 0.587, 0.000, 0.000, 3.068, 0.000, 0.000, 0.170, 0.000, 0.000,
+ 0.089, 0.000, 0.443, 1.049, 0.000, 0.047,-1.034, 0.000, 0.362, 0.000, 0.000, 1.360, 7.498, 0.000, 0.000, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param
new file mode 100644
index 0000000000000000000000000000000000000000..fd4367315d6862e119a34cef9e62859fea6bf659
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param
@@ -0,0 +1,18 @@
+; Calibration constants for run 480_-1, 282142 events processed
+
+pcal_neg_gain_cor = 0.164, 0.257, 0.230, 0.279, 0.206, 0.349, 0.467, 0.371, 0.242, 0.309, 0.331, 0.213, 0.321, 2.724,
+pcal_pos_gain_cor = 1.187, 0.235, 0.206, 0.278, 0.233, 0.224, 0.281, 0.226, 0.469, 0.190, 0.374, 0.358, 0.538, 1.814,
+pcal_arr_gain_cor = 0.000, 0.000, 0.000, 2.200, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ -0.201, 0.441, 1.261, 0.766, 0.464, 0.886, 0.670, 1.079, 2.181, 0.000, 0.000,10.649, 0.000, 0.000, 0.000, 0.000,
+ 0.000, 1.791, 0.723, 0.698, 1.117, 1.202, 0.788, 0.895, 0.687, 0.000, 0.000, 0.000, 1.925, 0.000, 0.000, 0.000,
+ 0.635, 0.855, 0.747, 0.870, 0.785, 0.617, 1.548, 1.302, 0.958, 0.000,-1.934, 0.377, 0.763, 0.512,-5.008, 0.000,
+ 1.087, 0.312, 0.595, 0.559, 1.274, 1.116, 0.930, 0.609, 0.621, 1.929, 0.785, 0.747, 0.760, 1.406, 0.512,-5.311,
+ 0.293, 0.517, 0.623, 1.389, 0.367, 0.829, 0.896, 1.133, 1.453, 0.673, 0.954, 1.033, 1.436, 0.357, 0.776,-1.928,
+ 2.840, 0.502, 1.035, 0.891, 0.506, 0.839, 1.142, 0.893, 0.817, 0.792, 0.674, 0.459, 0.820, 0.742, 0.364, 0.000,
+ 0.298,-0.060, 0.334, 0.274, 0.367, 0.265, 0.366, 0.442, 0.231, 0.366, 0.532, 0.420, 0.572, 0.340, 0.226, 1.261,
+ 3.062, 0.500, 0.634, 0.672, 0.954, 0.898, 0.523, 0.933, 1.285, 1.420, 0.547, 1.293, 0.564, 0.551, 0.927, 0.000,
+ 1.503, 1.418, 0.367, 0.852, 0.517, 1.202, 0.947, 1.145, 0.653, 0.817, 0.805, 0.781, 1.098, 0.684, 0.706,-1.969,
+ -0.189, 1.592, 0.000, 0.834, 0.680, 0.823, 0.222, 0.643, 1.669, 0.993, 0.641, 0.841, 0.736, 0.532, 0.648, 2.064,
+ -0.012, 2.522, 0.427, 0.617, 0.711, 0.824, 0.858, 1.583, 0.474, 1.898, 1.613, 0.794, 0.832, 0.978, 0.320,-5.513,
+ -0.044, 2.564, 1.350,-1.409, 1.190, 0.000,-0.138, 0.000, 0.000, 2.478, 1.496, 0.000, 0.000, 0.066, 0.000, 0.000,
+ 0.071, 0.000,-0.021, 0.409, 0.000, 0.130, 0.000, 0.000, 0.124, 0.000, 0.000, 0.000, 0.118, 0.000, 0.302, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param
new file mode 100644
index 0000000000000000000000000000000000000000..a4c8a5c8d08955a6b8233fe140a0cda3d9468326
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param
@@ -0,0 +1,18 @@
+; Calibration constants for run 481_-1, 273901 events processed
+
+pcal_neg_gain_cor = 0.193, 0.204, 0.225, 0.274, 0.200, 0.342, 0.461, 0.352, 0.238, 0.307, 0.332, 0.211, 0.273, 0.946,
+pcal_pos_gain_cor = 1.158, 0.215, 0.203, 0.274, 0.230, 0.221, 0.278, 0.243, 0.467, 0.188, 0.367, 0.355, 0.436, 1.753,
+pcal_arr_gain_cor = 0.000, 1.450, 0.000,12.046,-0.762, 7.309, 0.000, 0.000, 0.000, 0.000, 0.000,-1.849, 0.000, 0.000, 0.000, 0.000,
+ -1.525, 0.198, 1.760, 0.734, 0.574, 0.279, 0.000, 4.672, 1.347, 0.000, 0.000, 3.856, 0.000, 0.000, 0.000, 0.000,
+ 0.685, 0.304, 0.494, 0.477, 0.776, 1.037, 0.568, 0.000, 0.000, 0.576, 0.182, 0.000, 0.136, 0.000, 3.319, 2.186,
+ -0.291, 0.406, 0.459, 0.599, 0.540, 0.391, 1.114, 0.696, 0.699, 0.000, 0.844, 0.264, 0.753, 0.274, 1.143, 0.000,
+ 0.125, 0.182, 0.408, 0.373, 0.875, 0.760, 0.622, 0.398, 0.602, 0.000, 0.564, 0.529, 0.510, 0.958, 0.721,-0.116,
+ 0.308, 0.342, 0.420, 0.952, 0.244, 0.554, 0.596, 0.799, 0.000, 0.480, 0.644, 0.693, 0.980, 0.237, 0.469, 0.289,
+ 0.407, 0.400, 0.711, 0.601, 0.346, 0.559, 0.772, 0.599, 0.527, 0.535, 0.455, 0.309, 0.556, 0.511, 0.347, 0.000,
+ 0.246, 0.056, 0.324, 0.185, 0.249, 0.180, 0.246, 0.299, 0.163, 0.246, 0.356, 0.283, 0.392, 0.233, 0.169,-0.707,
+ 1.176, 1.029, 0.424, 0.453, 0.654, 0.612, 0.348, 0.627, 0.863, 0.979, 0.363, 0.887, 0.378, 0.369, 0.716, 2.447,
+ 2.712, 0.233, 0.264, 0.566, 0.345, 0.823, 0.655, 0.766, 0.476, 0.548, 0.558, 0.524, 0.737, 0.471, 0.263, 1.255,
+ 0.994, 0.410, 1.141, 0.489, 0.464, 0.608, 0.252, 0.678, 2.341, 0.577, 0.498, 0.578, 0.495, 0.359, 0.362, 3.317,
+ 0.204,-0.126, 0.393, 0.607, 0.512, 0.627, 0.296, 1.025, 0.224, 0.233, 0.217, 0.476, 0.687, 0.399, 0.000, 1.362,
+ -0.378, 1.637, 0.059,-0.895, 0.327, 0.512, 0.878, 0.266, 0.000,-0.035,-0.524,-0.446, 5.124, 1.312, 2.956, 0.898,
+ 0.025, 0.117, 0.058, 0.095, 0.022,-0.037, 1.242, 0.000,-0.123, 0.000,-0.728,-1.078, 0.152, 0.000, 0.027,-0.035,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param
new file mode 100644
index 0000000000000000000000000000000000000000..55c78b978e2361e164dd737f4245cb3acfe12036
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param
@@ -0,0 +1,18 @@
+; Calibration constants for run report_488, 174025 events processed
+
+pcal_neg_gain_cor = 0.423, 0.302, 0.231, 0.277, 0.200, 0.320, 0.359, 0.603, 0.475, 0.329, 0.333, 0.213, 0.342, 3.817,
+pcal_pos_gain_cor = 1.674, 0.228, 0.205, 0.273, 0.228, 0.185, 0.174, 0.153, 0.458, 0.188, 0.371, 0.357, 0.724, 4.376,
+pcal_arr_gain_cor = 0.000, 0.461, 0.000,-0.592, 1.140, 7.592, 0.000, 0.000, 0.000, 8.970, 0.000, 0.000, 0.000, 0.287, 0.000, 0.000,
+ 1.207,-1.024, 1.406, 0.552, 0.566, 0.352, 0.810, 0.868, 4.021, 3.374, 0.000,18.313, 0.000, 0.000, 0.000, 0.000,
+ -14.494, 1.336, 0.441, 0.529, 0.912, 0.848, 0.596, 1.069, 0.237, 1.229, 0.478, 0.000, 1.995, 0.000, 0.000, 0.000,
+ 2.308, 1.207, 0.505, 0.623, 0.558, 0.433, 1.152, 1.747, 2.441, 0.000, 2.967, 0.862, 0.858, 0.376, 2.133,12.337,
+ 1.026, 0.334, 0.408, 0.381, 0.891, 0.785, 0.657, 0.474, 1.059, 0.819, 0.353, 0.522, 0.514, 0.950, 1.068, 2.800,
+ 2.712, 0.402, 0.419, 0.964, 0.249, 0.555, 0.089, 0.115,-0.732, 0.000, 0.674, 0.701, 0.988, 0.240, 0.500, 1.659,
+ 2.477, 0.342, 0.715, 0.612, 0.353, 0.558, 0.107, 0.100, 0.100, 0.582, 0.466, 0.313, 0.562, 0.516, 0.106, 0.000,
+ 0.230, 0.035, 0.329, 0.185, 0.250, 0.175, 0.037, 0.073, 0.058, 0.000, 0.338, 0.283, 0.395, 0.234, 0.148, 1.184,
+ 0.908, 0.365, 0.434, 0.457, 0.655, 0.619, 0.351, 0.576, 0.651, 0.616, 0.339, 0.889, 0.381, 0.373, 0.456, 2.022,
+ 1.779,-0.199, 0.251, 0.575, 0.345, 0.850, 0.717, 0.953, 0.230, 0.265, 0.543, 0.524, 0.744, 0.478, 0.190, 5.730,
+ 1.655,-0.296, 0.000, 2.742, 0.310, 0.601, 0.221, 1.570, 0.396, 1.475, 0.309, 0.586, 0.496, 0.364, 0.108, 2.170,
+ 2.342, 1.485,-0.429, 1.523, 0.343, 0.791, 0.610,-1.725, 7.065, 1.522, 2.526,-0.132, 1.166, 0.601, 4.295, 6.234,
+ 2.451, 0.863, 1.189, 0.000, 0.000,-0.959,-1.476, 5.174, 0.000,-0.869, 0.994, 0.000, 0.000, 3.806, 0.000, 1.982,
+ 0.254, 2.304, 0.487, 0.641,-0.473,-0.373, 1.547, 3.782, 1.382, 0.000, 1.592,-3.079, 2.468, 0.000, 0.000,-0.275,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/pcal_calib.param b/PARAM/SHMS/CAL/CALIB/pcal_calib.param
new file mode 100644
index 0000000000000000000000000000000000000000..da17a867eab0076f97057bcf3559b62d0a9f7e4a
--- /dev/null
+++ b/PARAM/SHMS/CAL/CALIB/pcal_calib.param
@@ -0,0 +1,18 @@
+; Calibration constants for run report_464, 66161 events processed
+
+pcal_neg_gain_cor = 0.3, 0.281, 0.242, 0.295, 0.218, 0.370, 0.474, 0.379, 0.249, 0.316, 0.339, 0.215, 0.490, 0.3,
+pcal_pos_gain_cor = 0.307, 0.216, 0.211, 0.282, 0.238, 0.228, 0.287, 0.228, 0.472, 0.194, 0.377, 0.360, 0.633, 0.3,
+pcal_arr_gain_cor = 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 0.750, 0.890, 0.805, 0.591, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 0.651, 0.586, 0.559, 1.262, 1.123, 0.940, 0.598, 1.000, 1.000, 1.000, 0.772, 0.752, 1.446, 1.000, 1.000,
+ 1.000, 0.719, 0.623, 1.394, 0.366, 0.826, 0.892, 1.124, 1.468, 0.669, 0.947, 1.030, 1.429, 0.353, 1.000, 1.000,
+ 1.000, 0.571, 1.019, 0.888, 0.508, 0.832, 1.136, 0.885, 0.819, 0.791, 0.670, 0.456, 0.817, 0.752, 1.000, 1.000,
+ 1.000, 0.198, 0.311, 0.270, 0.363, 0.262, 0.362, 0.439, 0.229, 0.365, 0.529, 0.418, 0.568, 0.341, 0.231, 1.000,
+ 1.000, 1.000, 0.614, 0.664, 0.945, 0.897, 0.520, 0.922, 1.258, 1.413, 0.550, 1.286, 0.563, 0.546, 1.000, 1.000,
+ 1.000, 1.000, 0.389, 0.826, 0.508, 1.221, 0.966, 1.000, 1.000, 1.000, 0.821, 0.782, 1.091, 0.683, 0.489, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 0.713, 0.742, 0.541, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
diff --git a/PARAM/SHMS/CAL/CUTS/pcal_cuts.param b/PARAM/SHMS/CAL/CUTS/pcal_cuts.param
new file mode 100644
index 0000000000000000000000000000000000000000..964fdc8e8a85519e97960b161101fe1c873f8b9a
--- /dev/null
+++ b/PARAM/SHMS/CAL/CUTS/pcal_cuts.param
@@ -0,0 +1,35 @@
+; SHMS calorimeter cut parameters
+
+; for now manually set the FADC mode
+; 1 == Use the pulse int - pulse ped
+; 2 == Use the sample integral - known ped
+; 3 == Use the sample integral - sample ped
+; if not set then defaults to use the raw pulse integral
+pcal_ADCmode = 1
+
+; FADC pulse time window cuts
+pcal_AdcTimeWindowMin = 1300.
+pcal_AdcTimeWindowMax = 2300.
+
+; Threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
+pcal_AdcNegThreshold = 0.
+pcal_AdcPosThreshold = 0.
+
+; Threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
+pcal_arr_ADCmode = 1
+
+; FADC pulse time window cuts
+pcal_arr_AdcTimeWindowMin = 1200.
+pcal_arr_AdcTimeWindowMax = 1800.
+
+; Threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
+pcal_arr_AdcThreshold = 0.
+
+; Debug parameters
+pdbg_init_cal = 0
+pdbg_decoded_cal = 0
+pdbg_clusters_cal = 0
+pdbg_tracks_cal = 0
+
+; Exclusion bandwidth for calorimeter fiducial volume.
+pcal_fv_delta = 5
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/GEOM/pcal_geom.param b/PARAM/SHMS/CAL/GEOM/pcal_geom.param
new file mode 100644
index 0000000000000000000000000000000000000000..3ac39558e96b969b72a7ba725143fe1779b762a9
--- /dev/null
+++ b/PARAM/SHMS/CAL/GEOM/pcal_geom.param
@@ -0,0 +1,67 @@
+; SHMS calorimeter geometry parameters
+
+pcal_array = 1
+pcal_layer_names = "pr fly"
+pcal_pr_nr = 14 # Num of rows in preshower
+pcal_num_layers = 1
+pcal_arr_nrows = 16
+pcal_arr_ncolumns = 14
+
+pcal_arr_front_x = 1.4
+pcal_arr_front_y = 0.
+pcal_arr_front_z = 306.44
+pcal_arr_xstep = 9.
+pcal_arr_ystep = 9.
+pcal_arr_zsize = 70.0
+
+# Constants for the coordiante correction of the calorimeter energy depositions
+pcal_a_cor = 200.
+pcal_b_cor = 8000.
+pcal_c_cor = 64.36, 64.36 # for positive and negative sides
+pcal_d_cor = 1.66, 1.66
+
+; Parameters copied from HMS
+; Slop in x possitino. Allowed distance between track and edge of block
+pcal_slop = 7.5
+
+pcal_pr_thick = 10.0
+
+; Z Position of from of preshower
+pcal_pr_zpos = 292.64
+
+pcal_pr_left = 35.0
+pcal_pr_right = -35.0
+pcal_pr_top = (-69.0-1.4)
+ (-59.0-1.4)
+ (-49.0-1.4)
+ (-39.0-1.4)
+ (-29.0-1.4)
+ (-19.0-1.4)
+ ( -9.0-1.4)
+ ( 1.0-1.4)
+ ( 11.0-1.4)
+ ( 21.0-1.4)
+ ( 31.0-1.4)
+ ( 41.0-1.4)
+ ( 51.0-1.4)
+ ( 61.0-1.4)
+
+pcal_pos_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001
+pcal_neg_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001
+
+pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
+ 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_464.param b/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_464.param
deleted file mode 100644
index dd9fc209851b4ad74ab92e0d66a10d11463d78f7..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_464.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run report_464, 66161 events processed
-
-pcal_neg_gain_cor = 0.3, 0.281, 0.242, 0.295, 0.218, 0.370, 0.474, 0.379, 0.249, 0.316, 0.339, 0.215, 0.490, 0.3,
-pcal_pos_gain_cor = 0.307, 0.216, 0.211, 0.282, 0.238, 0.228, 0.287, 0.228, 0.472, 0.194, 0.377, 0.360, 0.633, 0.3,
-pcal_arr_gain_cor = 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 0.750, 0.890, 0.805, 0.591, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 0.651, 0.586, 0.559, 1.262, 1.123, 0.940, 0.598, 1.000, 1.000, 1.000, 0.772, 0.752, 1.446, 1.000, 1.000,
- 1.000, 0.719, 0.623, 1.394, 0.366, 0.826, 0.892, 1.124, 1.468, 0.669, 0.947, 1.030, 1.429, 0.353, 1.000, 1.000,
- 1.000, 0.571, 1.019, 0.888, 0.508, 0.832, 1.136, 0.885, 0.819, 0.791, 0.670, 0.456, 0.817, 0.752, 1.000, 1.000,
- 1.000, 0.198, 0.311, 0.270, 0.363, 0.262, 0.362, 0.439, 0.229, 0.365, 0.529, 0.418, 0.568, 0.341, 0.231, 1.000,
- 1.000, 1.000, 0.614, 0.664, 0.945, 0.897, 0.520, 0.922, 1.258, 1.413, 0.550, 1.286, 0.563, 0.546, 1.000, 1.000,
- 1.000, 1.000, 0.389, 0.826, 0.508, 1.221, 0.966, 1.000, 1.000, 1.000, 0.821, 0.782, 1.091, 0.683, 0.489, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 0.713, 0.742, 0.541, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
diff --git a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_475.param b/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_475.param
deleted file mode 100644
index 6f497675f24f1c2dc4d7ef9617f401916d5c2bac..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_475.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run 475_-1, 283000 events processed
-
-pcal_neg_gain_cor = 0.191, 0.273, 0.231, 0.281, 0.209, 0.354, 0.467, 0.373, 0.246, 0.312, 0.333, 0.214, 0.305, 1.480,
-pcal_pos_gain_cor = 0.966, 0.206, 0.206, 0.278, 0.234, 0.224, 0.284, 0.227, 0.468, 0.190, 0.375, 0.359, 0.445, 2.266,
-pcal_arr_gain_cor = 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
- 0.000, 0.542, 1.126, 0.922, 0.734, 0.782, 0.000, 3.196, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
- 0.000, 1.134, 0.644, 0.788, 1.130, 1.296, 0.978, 0.000, 1.145, 0.000, 7.212, 0.000, 2.063, 0.000, 0.000, 0.000,
- 0.000, 0.939, 0.785, 0.895, 0.777, 0.579, 1.616, 1.389, 0.999, 3.832, 4.220, 0.528, 0.964, 0.468, 3.595, 0.000,
- -0.227, 0.585, 0.595, 0.557, 1.276, 1.120, 0.925, 0.614, 0.605, 0.852, 0.745, 0.741, 0.756, 1.402, 1.004, 0.465,
- 0.000, 0.657, 0.631, 1.401, 0.368, 0.828, 0.896, 1.129, 1.472, 0.677, 0.956, 1.033, 1.439, 0.356, 0.462, 2.643,
- 0.060, 0.691, 1.024, 0.898, 0.509, 0.839, 1.144, 0.889, 0.816, 0.790, 0.675, 0.458, 0.821, 0.742, 0.826, 0.000,
- 0.623, 0.086, 0.331, 0.275, 0.368, 0.265, 0.365, 0.442, 0.231, 0.365, 0.531, 0.419, 0.572, 0.341, 0.263, 0.324,
- 5.728,-0.410, 0.650, 0.673, 0.953, 0.895, 0.521, 0.927, 1.299, 1.417, 0.547, 1.288, 0.564, 0.548, 0.381, 0.000,
- 0.000, 0.375, 0.396, 0.817, 0.511, 1.214, 0.937, 1.398, 0.592, 0.722, 0.809, 0.781, 1.094, 0.686, 0.432, 2.337,
- 1.343, 0.103, 3.296, 1.010, 0.722, 0.780, 0.514, 0.772, 2.186, 0.985, 0.724, 0.846, 0.739, 0.533, 0.589, 3.208,
- -0.532, 2.021, 0.137,-3.405, 0.807, 0.784, 1.370,-0.242, 0.000, 1.989, 0.654, 0.700, 0.952, 0.584, 0.000, 0.000,
- 0.059,-0.518, 1.216, 0.000, 0.000, 0.000,-0.040, 0.000, 0.000, 9.954,-0.309, 0.000, 0.000, 3.539, 0.000, 0.000,
- 0.135,-0.479,-0.128,-0.065,-0.072, 0.122, 0.748, 0.000, 1.168, 0.000, 0.091, 0.000, 0.613, 0.000, 0.000, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_478.param b/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_478.param
deleted file mode 100644
index 9c9f037401fbe74baee2110efa4bc36f85cf3fb4..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_478.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run 478_-1, 282423 events processed
-
-pcal_neg_gain_cor = 0.304, 0.208, 0.227, 0.280, 0.208, 0.352, 0.468, 0.373, 0.243, 0.310, 0.333, 0.214, 0.295, 0.734,
-pcal_pos_gain_cor = 1.257, 0.219, 0.207, 0.280, 0.235, 0.225, 0.282, 0.227, 0.470, 0.190, 0.375, 0.359, 0.457, 4.229,
-pcal_arr_gain_cor = 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
- 0.000, 1.541, 1.256, 0.757, 3.973, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
- 0.000, 0.585, 0.601, 0.632, 0.930, 1.148, 0.946, 0.000, 2.458, 0.000, 4.041, 0.000, 0.032, 0.000, 0.000, 0.000,
- 0.000, 1.191, 0.482, 0.955, 0.784, 0.607, 1.493, 1.282, 0.000, 0.000, 1.919, 0.543, 0.932, 0.534,-1.355, 0.000,
- -0.131, 0.597, 0.599, 0.555, 1.276, 1.115, 0.926, 0.610, 0.822, 0.887, 0.640, 0.729, 0.759, 1.383, 1.760, 2.086,
- -0.892, 0.478, 0.624, 1.387, 0.366, 0.827, 0.895, 1.132, 1.459, 0.675, 0.956, 1.034, 1.435, 0.357, 0.456, 0.000,
- 0.000, 0.575, 1.032, 0.887, 0.508, 0.835, 1.140, 0.892, 0.815, 0.791, 0.673, 0.458, 0.820, 0.739, 0.610, 0.000,
- 0.406, 0.159, 0.332, 0.274, 0.367, 0.265, 0.366, 0.441, 0.231, 0.366, 0.532, 0.420, 0.572, 0.343, 0.180, 0.659,
- -0.027, 0.852, 0.642, 0.676, 0.954, 0.895, 0.522, 0.922, 1.219, 1.410, 0.548, 1.293, 0.563, 0.549, 0.913, 0.000,
- 1.548, 0.018, 0.414, 0.847, 0.513, 1.218, 0.943, 1.041, 0.912, 0.822, 0.805, 0.780, 1.097, 0.686, 0.380, 3.226,
- -1.747, 2.302, 0.744, 0.831, 0.686, 0.884, 0.372, 0.658, 0.000, 1.157, 0.803, 0.842, 0.739, 0.534, 0.580, 0.000,
- 0.464, 1.631, 2.294, 0.602, 1.149, 0.531, 0.799, 0.510, 0.000, 1.311, 0.470, 0.744, 0.971, 0.816, 0.000, 0.000,
- 0.013, 0.199, 0.627, 0.000, 0.000, 0.000, 2.157, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 3.832, 0.000, 0.000,
- 0.161, 0.924,-0.236, 0.067, 0.000, 0.124,-0.332, 0.000, 0.862, 0.000, 0.000, 0.000, 0.881, 0.000, 0.000, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_479.param b/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_479.param
deleted file mode 100644
index fc4f7b4312df4b4316f7dcb552b7aaa67fb72864..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_479.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run 479_-1, 278685 events processed
-
-pcal_neg_gain_cor = 0.226, 0.312, 0.229, 0.281, 0.209, 0.351, 0.467, 0.372, 0.244, 0.310, 0.333, 0.214, 0.282, 0.879,
-pcal_pos_gain_cor = 1.012, 0.237, 0.204, 0.278, 0.234, 0.224, 0.282, 0.226, 0.470, 0.191, 0.374, 0.359, 0.418, 1.238,
-pcal_arr_gain_cor = 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
- -0.724, 0.482, 1.062, 0.714, 1.032, 0.000, 0.000, 0.000, 1.218, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
- 0.000, 0.875, 0.765, 0.733, 0.803, 1.149, 0.861, 0.000, 3.282, 0.000, 3.856, 0.000, 0.814, 0.000, 0.000, 0.000,
- 0.000, 0.782, 0.644, 0.932, 0.790, 0.599, 1.557, 1.240, 0.000, 0.000, 0.947, 0.679, 0.462, 0.551, 1.957, 0.000,
- 0.964, 0.360, 0.601, 0.560, 1.278, 1.119, 0.932, 0.613, 0.772, 1.108, 0.707, 0.737, 0.760, 1.407, 0.820, 3.763,
- 0.000,-0.034, 0.639, 1.391, 0.369, 0.830, 0.898, 1.131, 1.449, 0.682, 0.952, 1.035, 1.437, 0.357, 0.356, 1.327,
- -3.506, 0.111, 1.059, 0.896, 0.507, 0.838, 1.145, 0.894, 0.819, 0.790, 0.674, 0.459, 0.820, 0.742, 0.532, 2.701,
- 1.179, 0.142, 0.329, 0.274, 0.366, 0.263, 0.366, 0.442, 0.231, 0.365, 0.532, 0.419, 0.573, 0.339, 0.228,-0.411,
- 0.370, 0.138, 0.644, 0.671, 0.948, 0.894, 0.526, 0.931, 1.262, 1.412, 0.547, 1.292, 0.563, 0.548, 1.027, 0.000,
- 1.332, 1.186, 0.391, 0.829, 0.524, 1.229, 0.943, 1.230, 0.589, 0.906, 0.811, 0.781, 1.098, 0.687, 0.414, 0.806,
- 2.454, 1.831, 0.000, 0.915, 0.547, 0.716, 0.336, 0.704, 2.243, 5.368, 0.540, 0.784, 0.737, 0.529, 0.994, 0.636,
- 1.871, 0.414, 0.600, 0.384, 0.839, 0.890, 0.396, 1.352, 0.000, 0.996, 1.358,-0.914, 1.065, 1.114, 0.000, 5.720,
- 0.284, 0.169, 0.751,-1.613, 0.000, 0.000, 0.311, 0.587, 0.000, 0.000, 3.068, 0.000, 0.000, 0.170, 0.000, 0.000,
- 0.089, 0.000, 0.443, 1.049, 0.000, 0.047,-1.034, 0.000, 0.362, 0.000, 0.000, 1.360, 7.498, 0.000, 0.000, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_480.param b/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_480.param
deleted file mode 100644
index 5f1ab8c068c93cf2b96b810e4c7bb10f291196d8..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_480.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run 480_-1, 282142 events processed
-
-pcal_neg_gain_cor = 0.164, 0.257, 0.230, 0.279, 0.206, 0.349, 0.467, 0.371, 0.242, 0.309, 0.331, 0.213, 0.321, 2.724,
-pcal_pos_gain_cor = 1.187, 0.235, 0.206, 0.278, 0.233, 0.224, 0.281, 0.226, 0.469, 0.190, 0.374, 0.358, 0.538, 1.814,
-pcal_arr_gain_cor = 0.000, 0.000, 0.000, 2.200, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
- -0.201, 0.441, 1.261, 0.766, 0.464, 0.886, 0.670, 1.079, 2.181, 0.000, 0.000,10.649, 0.000, 0.000, 0.000, 0.000,
- 0.000, 1.791, 0.723, 0.698, 1.117, 1.202, 0.788, 0.895, 0.687, 0.000, 0.000, 0.000, 1.925, 0.000, 0.000, 0.000,
- 0.635, 0.855, 0.747, 0.870, 0.785, 0.617, 1.548, 1.302, 0.958, 0.000,-1.934, 0.377, 0.763, 0.512,-5.008, 0.000,
- 1.087, 0.312, 0.595, 0.559, 1.274, 1.116, 0.930, 0.609, 0.621, 1.929, 0.785, 0.747, 0.760, 1.406, 0.512,-5.311,
- 0.293, 0.517, 0.623, 1.389, 0.367, 0.829, 0.896, 1.133, 1.453, 0.673, 0.954, 1.033, 1.436, 0.357, 0.776,-1.928,
- 2.840, 0.502, 1.035, 0.891, 0.506, 0.839, 1.142, 0.893, 0.817, 0.792, 0.674, 0.459, 0.820, 0.742, 0.364, 0.000,
- 0.298,-0.060, 0.334, 0.274, 0.367, 0.265, 0.366, 0.442, 0.231, 0.366, 0.532, 0.420, 0.572, 0.340, 0.226, 1.261,
- 3.062, 0.500, 0.634, 0.672, 0.954, 0.898, 0.523, 0.933, 1.285, 1.420, 0.547, 1.293, 0.564, 0.551, 0.927, 0.000,
- 1.503, 1.418, 0.367, 0.852, 0.517, 1.202, 0.947, 1.145, 0.653, 0.817, 0.805, 0.781, 1.098, 0.684, 0.706,-1.969,
- -0.189, 1.592, 0.000, 0.834, 0.680, 0.823, 0.222, 0.643, 1.669, 0.993, 0.641, 0.841, 0.736, 0.532, 0.648, 2.064,
- -0.012, 2.522, 0.427, 0.617, 0.711, 0.824, 0.858, 1.583, 0.474, 1.898, 1.613, 0.794, 0.832, 0.978, 0.320,-5.513,
- -0.044, 2.564, 1.350,-1.409, 1.190, 0.000,-0.138, 0.000, 0.000, 2.478, 1.496, 0.000, 0.000, 0.066, 0.000, 0.000,
- 0.071, 0.000,-0.021, 0.409, 0.000, 0.130, 0.000, 0.000, 0.124, 0.000, 0.000, 0.000, 0.118, 0.000, 0.302, 0.000,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_481.param b/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_481.param
deleted file mode 100644
index bac4667f658975318c84e38ec12125252b0a1806..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_481.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run 481_-1, 273901 events processed
-
-pcal_neg_gain_cor = 0.193, 0.204, 0.225, 0.274, 0.200, 0.342, 0.461, 0.352, 0.238, 0.307, 0.332, 0.211, 0.273, 0.946,
-pcal_pos_gain_cor = 1.158, 0.215, 0.203, 0.274, 0.230, 0.221, 0.278, 0.243, 0.467, 0.188, 0.367, 0.355, 0.436, 1.753,
-pcal_arr_gain_cor = 0.000, 1.450, 0.000,12.046,-0.762, 7.309, 0.000, 0.000, 0.000, 0.000, 0.000,-1.849, 0.000, 0.000, 0.000, 0.000,
- -1.525, 0.198, 1.760, 0.734, 0.574, 0.279, 0.000, 4.672, 1.347, 0.000, 0.000, 3.856, 0.000, 0.000, 0.000, 0.000,
- 0.685, 0.304, 0.494, 0.477, 0.776, 1.037, 0.568, 0.000, 0.000, 0.576, 0.182, 0.000, 0.136, 0.000, 3.319, 2.186,
- -0.291, 0.406, 0.459, 0.599, 0.540, 0.391, 1.114, 0.696, 0.699, 0.000, 0.844, 0.264, 0.753, 0.274, 1.143, 0.000,
- 0.125, 0.182, 0.408, 0.373, 0.875, 0.760, 0.622, 0.398, 0.602, 0.000, 0.564, 0.529, 0.510, 0.958, 0.721,-0.116,
- 0.308, 0.342, 0.420, 0.952, 0.244, 0.554, 0.596, 0.799, 0.000, 0.480, 0.644, 0.693, 0.980, 0.237, 0.469, 0.289,
- 0.407, 0.400, 0.711, 0.601, 0.346, 0.559, 0.772, 0.599, 0.527, 0.535, 0.455, 0.309, 0.556, 0.511, 0.347, 0.000,
- 0.246, 0.056, 0.324, 0.185, 0.249, 0.180, 0.246, 0.299, 0.163, 0.246, 0.356, 0.283, 0.392, 0.233, 0.169,-0.707,
- 1.176, 1.029, 0.424, 0.453, 0.654, 0.612, 0.348, 0.627, 0.863, 0.979, 0.363, 0.887, 0.378, 0.369, 0.716, 2.447,
- 2.712, 0.233, 0.264, 0.566, 0.345, 0.823, 0.655, 0.766, 0.476, 0.548, 0.558, 0.524, 0.737, 0.471, 0.263, 1.255,
- 0.994, 0.410, 1.141, 0.489, 0.464, 0.608, 0.252, 0.678, 2.341, 0.577, 0.498, 0.578, 0.495, 0.359, 0.362, 3.317,
- 0.204,-0.126, 0.393, 0.607, 0.512, 0.627, 0.296, 1.025, 0.224, 0.233, 0.217, 0.476, 0.687, 0.399, 0.000, 1.362,
- -0.378, 1.637, 0.059,-0.895, 0.327, 0.512, 0.878, 0.266, 0.000,-0.035,-0.524,-0.446, 5.124, 1.312, 2.956, 0.898,
- 0.025, 0.117, 0.058, 0.095, 0.022,-0.037, 1.242, 0.000,-0.123, 0.000,-0.728,-1.078, 0.152, 0.000, 0.027,-0.035,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_488.param b/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_488.param
deleted file mode 100644
index 4844760c508c26b20602fdc766950d1628e36473..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/KPP_Spring_2017/pcal_488.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run report_488, 174025 events processed
-
-pcal_neg_gain_cor = 0.423, 0.302, 0.231, 0.277, 0.200, 0.320, 0.359, 0.603, 0.475, 0.329, 0.333, 0.213, 0.342, 3.817,
-pcal_pos_gain_cor = 1.674, 0.228, 0.205, 0.273, 0.228, 0.185, 0.174, 0.153, 0.458, 0.188, 0.371, 0.357, 0.724, 4.376,
-pcal_arr_gain_cor = 0.000, 0.461, 0.000,-0.592, 1.140, 7.592, 0.000, 0.000, 0.000, 8.970, 0.000, 0.000, 0.000, 0.287, 0.000, 0.000,
- 1.207,-1.024, 1.406, 0.552, 0.566, 0.352, 0.810, 0.868, 4.021, 3.374, 0.000,18.313, 0.000, 0.000, 0.000, 0.000,
- -14.494, 1.336, 0.441, 0.529, 0.912, 0.848, 0.596, 1.069, 0.237, 1.229, 0.478, 0.000, 1.995, 0.000, 0.000, 0.000,
- 2.308, 1.207, 0.505, 0.623, 0.558, 0.433, 1.152, 1.747, 2.441, 0.000, 2.967, 0.862, 0.858, 0.376, 2.133,12.337,
- 1.026, 0.334, 0.408, 0.381, 0.891, 0.785, 0.657, 0.474, 1.059, 0.819, 0.353, 0.522, 0.514, 0.950, 1.068, 2.800,
- 2.712, 0.402, 0.419, 0.964, 0.249, 0.555, 0.089, 0.115,-0.732, 0.000, 0.674, 0.701, 0.988, 0.240, 0.500, 1.659,
- 2.477, 0.342, 0.715, 0.612, 0.353, 0.558, 0.107, 0.100, 0.100, 0.582, 0.466, 0.313, 0.562, 0.516, 0.106, 0.000,
- 0.230, 0.035, 0.329, 0.185, 0.250, 0.175, 0.037, 0.073, 0.058, 0.000, 0.338, 0.283, 0.395, 0.234, 0.148, 1.184,
- 0.908, 0.365, 0.434, 0.457, 0.655, 0.619, 0.351, 0.576, 0.651, 0.616, 0.339, 0.889, 0.381, 0.373, 0.456, 2.022,
- 1.779,-0.199, 0.251, 0.575, 0.345, 0.850, 0.717, 0.953, 0.230, 0.265, 0.543, 0.524, 0.744, 0.478, 0.190, 5.730,
- 1.655,-0.296, 0.000, 2.742, 0.310, 0.601, 0.221, 1.570, 0.396, 1.475, 0.309, 0.586, 0.496, 0.364, 0.108, 2.170,
- 2.342, 1.485,-0.429, 1.523, 0.343, 0.791, 0.610,-1.725, 7.065, 1.522, 2.526,-0.132, 1.166, 0.601, 4.295, 6.234,
- 2.451, 0.863, 1.189, 0.000, 0.000,-0.959,-1.476, 5.174, 0.000,-0.869, 0.994, 0.000, 0.000, 3.806, 0.000, 1.982,
- 0.254, 2.304, 0.487, 0.641,-0.473,-0.373, 1.547, 3.782, 1.382, 0.000, 1.592,-3.079, 2.468, 0.000, 0.000,-0.275,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/pcal.param b/PARAM/SHMS/CAL/pcal.param
deleted file mode 100644
index dd9fc209851b4ad74ab92e0d66a10d11463d78f7..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/CAL/pcal.param
+++ /dev/null
@@ -1,106 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin=1300.
-pcal_AdcTimeWindowMax=2300.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
-pcal_AdcNegThreshold=0.
-; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
-pcal_AdcPosThreshold=0.
-pcal_arr_ADCmode=1
-pcal_arr_AdcTimeWindowMin=1200.
-pcal_arr_AdcTimeWindowMax=1800.
-; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
-pcal_arr_AdcThreshold=0.0
-
-pcal_array = 1
-pcal_layer_names = "pr fly"
-pcal_pr_nr = 14 # Num of rows in preshower
-pcal_num_layers = 1
-pcal_arr_nrows = 16
-pcal_arr_ncolumns = 14
-
-pcal_arr_front_x = 1.4
-pcal_arr_front_y = 0.
-pcal_arr_front_z = 306.44
-pcal_arr_xstep = 9.
-pcal_arr_ystep = 9.
-pcal_arr_zsize = 70.0
-
-pdbg_init_cal=0
-pdbg_decoded_cal=0
-pdbg_clusters_cal=0
-pdbg_tracks_cal=0
-; Exclusion bandwidth for calorimeter fiducial volume.
-pcal_fv_delta = 5
-# Constants for the coordiante correction of the calorimeter energy depositions
-pcal_a_cor = 200.
-pcal_b_cor = 8000.
-pcal_c_cor = 64.36, 64.36 # for positive and negative sides
-pcal_d_cor = 1.66, 1.66
-
-; Parameters copied from HMS
-; Slop in x possitino. Allowed distance between track and edge of block
-pcal_slop = 7.5
-
-pcal_pr_thick = 10.0
-; Z Position of from of preshower
-pcal_pr_zpos = 292.64
-
-pcal_pr_left = 35.0
-pcal_pr_right = -35.0
-pcal_pr_top = (-69.0-1.4)
- (-59.0-1.4)
- (-49.0-1.4)
- (-39.0-1.4)
- (-29.0-1.4)
- (-19.0-1.4)
- ( -9.0-1.4)
- ( 1.0-1.4)
- ( 11.0-1.4)
- ( 21.0-1.4)
- ( 31.0-1.4)
- ( 41.0-1.4)
- ( 51.0-1.4)
- ( 61.0-1.4)
-pcal_pos_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_cal_const =0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001
-
-pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
- 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-
-; Calibration constants for run report_464, 66161 events processed
-
-pcal_neg_gain_cor = 0.3, 0.281, 0.242, 0.295, 0.218, 0.370, 0.474, 0.379, 0.249, 0.316, 0.339, 0.215, 0.490, 0.3,
-pcal_pos_gain_cor = 0.307, 0.216, 0.211, 0.282, 0.238, 0.228, 0.287, 0.228, 0.472, 0.194, 0.377, 0.360, 0.633, 0.3,
-pcal_arr_gain_cor = 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 0.750, 0.890, 0.805, 0.591, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 0.651, 0.586, 0.559, 1.262, 1.123, 0.940, 0.598, 1.000, 1.000, 1.000, 0.772, 0.752, 1.446, 1.000, 1.000,
- 1.000, 0.719, 0.623, 1.394, 0.366, 0.826, 0.892, 1.124, 1.468, 0.669, 0.947, 1.030, 1.429, 0.353, 1.000, 1.000,
- 1.000, 0.571, 1.019, 0.888, 0.508, 0.832, 1.136, 0.885, 0.819, 0.791, 0.670, 0.456, 0.817, 0.752, 1.000, 1.000,
- 1.000, 0.198, 0.311, 0.270, 0.363, 0.262, 0.362, 0.439, 0.229, 0.365, 0.529, 0.418, 0.568, 0.341, 0.231, 1.000,
- 1.000, 1.000, 0.614, 0.664, 0.945, 0.897, 0.520, 0.922, 1.258, 1.413, 0.550, 1.286, 0.563, 0.546, 1.000, 1.000,
- 1.000, 1.000, 0.389, 0.826, 0.508, 1.221, 0.966, 1.000, 1.000, 1.000, 0.821, 0.782, 1.091, 0.683, 0.489, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 0.713, 0.742, 0.541, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
diff --git a/PARAM/SHMS/DC/pdriftmap_plane.param b/PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_469.param
similarity index 99%
rename from PARAM/SHMS/DC/pdriftmap_plane.param
rename to PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_469.param
index c17ad52fc86b4d1c1085443c8a94047e84e43863..a165cf1c55388e9dbaec83d8fda7e505e1c92e4b 100644
--- a/PARAM/SHMS/DC/pdriftmap_plane.param
+++ b/PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_469.param
@@ -1,10 +1,13 @@
; Lookup Table: RUN 469
; number of bins in Carlos's time to distance lookup table
pdriftbins = 138
-; number of 1st bin in Carlos's table in ns
-pdrift1stbin=0
-; bin size in ns
-pdriftbinsz=2
+
+; Number of 1st bin in Carlos's table in ns
+pdrift1stbin = 0
+
+; Bin size in ns
+pdriftbinsz = 2
+
pwc1u1fract=0.0016762,0.00401,0.00764,0.01247,0.01931,0.02801,0.03904,0.05207,0.06654
0.08279,0.10015,0.11923,0.13909,0.15943,0.18040,0.20203,0.22394,0.24639,0.26853
0.29103,0.31298,0.33531,0.35759,0.37996,0.40216,0.42410,0.44580,0.46773,0.48968
diff --git a/PARAM/SHMS/DC/pdriftmap.param b/PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_484.param
similarity index 99%
rename from PARAM/SHMS/DC/pdriftmap.param
rename to PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_484.param
index 0faf7ac0a7b6108d44c36ff3bdfccccb8acba56e..a0d7f2938c59bca7404ad6a864e8d9f3e6a25a94 100644
--- a/PARAM/SHMS/DC/pdriftmap.param
+++ b/PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_484.param
@@ -1,10 +1,13 @@
; Lookup Table: RUN 484
; number of bins in time to distance lookup table
pdriftbins = 275
-; number of 1st bin in table in ns
-pdrift1stbin=0
-; bin size in ns
-pdriftbinsz=1
+
+; Number of 1st bin in table in ns
+pdrift1stbin = 0
+
+; Bin size in ns
+pdriftbinsz = 1
+
pwc1u1fract=0.00084747,0.00192,0.00330,0.00472,0.00646,0.00857,0.01100,0.01391,0.01743,0.02149,0.02598,0.03095,0.03631,0.04230,0.04876,0.05601,0.06347,0.07117,0.07944
0.08802,0.09670,0.10590,0.11521,0.12466,0.13447,0.14471,0.15507,0.16538,0.17608,0.18670,0.19741,0.20827,0.21902,0.23021,0.24107,0.25188,0.26284,0.27418,0.28522
0.29645,0.30774,0.31918,0.33046,0.34158,0.35255,0.36392,0.37461,0.38553,0.39623,0.40721,0.41772,0.42872,0.43969,0.45081,0.46192,0.47271,0.48349,0.49410,0.50509
diff --git a/PARAM/SHMS/DC/pdriftmap_tzero_per_wire.param b/PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_488.param
similarity index 99%
rename from PARAM/SHMS/DC/pdriftmap_tzero_per_wire.param
rename to PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_488.param
index 7799e9108837632655137f8cc7cd02ffb0082d38..c9892bffad016162ae5b49a20541959386c74ce8 100644
--- a/PARAM/SHMS/DC/pdriftmap_tzero_per_wire.param
+++ b/PARAM/SHMS/DC/CALIB/KPP_Spring_2017/pdc_calib_488.param
@@ -1,10 +1,13 @@
; Lookup Table: RUN 488
; number of bins in time to distance lookup table
pdriftbins = 138
-; number of 1st bin in table in ns
-pdrift1stbin=0
-; bin size in ns
-pdriftbinsz=2
+
+; Number of 1st bin in table in ns
+pdrift1stbin = 0
+
+; Bin size in ns
+pdriftbinsz = 2
+
pwc1u1fract=0.0012918,0.00393,0.00820,0.01502,0.02425,0.03662,0.05029,0.06599,0.08300
0.10141,0.12121,0.14156,0.16225,0.18309,0.20438,0.22640,0.24785,0.26943,0.29094
0.31248,0.33413,0.35621,0.37791,0.39938,0.42126,0.44260,0.46433,0.48604,0.50716
diff --git a/PARAM/SHMS/DC/CALIB/pdc_calib.param b/PARAM/SHMS/DC/CALIB/pdc_calib.param
new file mode 100644
index 0000000000000000000000000000000000000000..d412a66ed792de55b8df388c00c582e92eb90a72
--- /dev/null
+++ b/PARAM/SHMS/DC/CALIB/pdc_calib.param
@@ -0,0 +1,190 @@
+; Lookup Table: RUN 484
+; number of bins in time to distance lookup table
+pdriftbins = 275
+
+; Number of 1st bin in table in ns
+pdrift1stbin = 0
+
+; Bin size in ns
+pdriftbinsz = 1
+
+pwc1u1fract=0.00084747,0.00192,0.00330,0.00472,0.00646,0.00857,0.01100,0.01391,0.01743,0.02149,0.02598,0.03095,0.03631,0.04230,0.04876,0.05601,0.06347,0.07117,0.07944
+0.08802,0.09670,0.10590,0.11521,0.12466,0.13447,0.14471,0.15507,0.16538,0.17608,0.18670,0.19741,0.20827,0.21902,0.23021,0.24107,0.25188,0.26284,0.27418,0.28522
+0.29645,0.30774,0.31918,0.33046,0.34158,0.35255,0.36392,0.37461,0.38553,0.39623,0.40721,0.41772,0.42872,0.43969,0.45081,0.46192,0.47271,0.48349,0.49410,0.50509
+0.51559,0.52636,0.53686,0.54735,0.55756,0.56768,0.57806,0.58856,0.59906,0.60960,0.61951,0.62952,0.63947,0.64913,0.65896,0.66898,0.67873,0.68858,0.69813,0.70791
+0.71750,0.72665,0.73545,0.74460,0.75371,0.76250,0.77145,0.77972,0.78860,0.79693,0.80521,0.81327,0.82122,0.82895,0.83691,0.84442,0.85167,0.85878,0.86544,0.87197
+0.87804,0.88408,0.88968,0.89514,0.90064,0.90572,0.91048,0.91481,0.91898,0.92282,0.92625,0.92968,0.93275,0.93565,0.93838,0.94081,0.94327,0.94545,0.94740,0.94930
+0.95108,0.95282,0.95449,0.95611,0.95758,0.95892,0.96048,0.96186,0.96303,0.96429,0.96539,0.96653,0.96758,0.96859,0.96973,0.97071,0.97164,0.97250,0.97334,0.97422
+0.97496,0.97570,0.97637,0.97704,0.97771,0.97849,0.97912,0.97981,0.98034,0.98089,0.98140,0.98188,0.98235,0.98287,0.98335,0.98375,0.98422,0.98461,0.98504,0.98539
+0.98581,0.98617,0.98649,0.98680,0.98717,0.98745,0.98771,0.98797,0.98822,0.98850,0.98872,0.98895,0.98916,0.98932,0.98954,0.98976,0.98997,0.99019,0.99038,0.99053
+0.99073,0.99089,0.99106,0.99121,0.99137,0.99152,0.99166,0.99176,0.99194,0.99206,0.99216,0.99228,0.99241,0.99252,0.99265,0.99272,0.99284,0.99296,0.99304,0.99315
+0.99330,0.99342,0.99351,0.99362,0.99373,0.99382,0.99398,0.99408,0.99418,0.99425,0.99439,0.99453,0.99462,0.99477,0.99490,0.99501,0.99509,0.99520,0.99533,0.99542
+0.99554,0.99566,0.99577,0.99589,0.99600,0.99610,0.99620,0.99632,0.99648,0.99661,0.99676,0.99690,0.99698,0.99710,0.99721,0.99731,0.99745,0.99758,0.99770,0.99780
+0.99793,0.99802,0.99810,0.99820,0.99827,0.99840,0.99848,0.99858,0.99867,0.99877,0.99883,0.99894,0.99903,0.99912,0.99921,0.99930,0.99939,0.99947,0.99954,0.99960
+0.99970,0.99979,0.99983,0.99987,0.99989,0.99992,0.99995,0.99996,0.99997,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999
+1.00000
+pwc1u2fract=0.00097,0.00200,0.00323,0.00482,0.00661,0.00888,0.01126,0.01418,0.01783,0.02174,0.02643,0.03169,0.03735,0.04334,0.04963,0.05690,0.06423,0.07250,0.08107
+0.08998,0.09916,0.10861,0.11835,0.12831,0.13820,0.14877,0.15888,0.16923,0.18018,0.19103,0.20195,0.21304,0.22404,0.23516,0.24628,0.25737,0.26863,0.27962,0.29057
+0.30150,0.31226,0.32360,0.33472,0.34561,0.35641,0.36709,0.37821,0.38930,0.39999,0.41086,0.42116,0.43196,0.44263,0.45332,0.46433,0.47469,0.48524,0.49573,0.50621
+0.51697,0.52737,0.53771,0.54786,0.55813,0.56828,0.57842,0.58866,0.59873,0.60877,0.61880,0.62908,0.63895,0.64866,0.65846,0.66811,0.67776,0.68756,0.69687,0.70611
+0.71501,0.72406,0.73294,0.74197,0.75126,0.76021,0.76891,0.77764,0.78641,0.79493,0.80305,0.81100,0.81907,0.82653,0.83419,0.84160,0.84896,0.85600,0.86273,0.86953
+0.87564,0.88198,0.88790,0.89358,0.89882,0.90400,0.90850,0.91294,0.91731,0.92099,0.92477,0.92839,0.93164,0.93446,0.93718,0.93985,0.94225,0.94460,0.94671,0.94852
+0.95039,0.95224,0.95376,0.95540,0.95684,0.95842,0.95975,0.96115,0.96240,0.96366,0.96480,0.96590,0.96705,0.96812,0.96904,0.97000,0.97099,0.97188,0.97268,0.97349
+0.97415,0.97482,0.97560,0.97625,0.97696,0.97768,0.97826,0.97890,0.97950,0.98008,0.98069,0.98129,0.98187,0.98233,0.98281,0.98320,0.98369,0.98411,0.98449,0.98487
+0.98521,0.98559,0.98598,0.98633,0.98667,0.98702,0.98732,0.98763,0.98790,0.98815,0.98842,0.98867,0.98887,0.98907,0.98924,0.98950,0.98973,0.98990,0.99008,0.99025
+0.99046,0.99059,0.99079,0.99094,0.99109,0.99121,0.99138,0.99151,0.99161,0.99175,0.99185,0.99202,0.99215,0.99230,0.99249,0.99262,0.99273,0.99288,0.99298,0.99309
+0.99321,0.99333,0.99347,0.99365,0.99378,0.99392,0.99403,0.99410,0.99418,0.99430,0.99444,0.99456,0.99465,0.99478,0.99489,0.99500,0.99512,0.99524,0.99534,0.99544
+0.99554,0.99566,0.99577,0.99588,0.99597,0.99610,0.99625,0.99635,0.99647,0.99663,0.99680,0.99694,0.99706,0.99719,0.99728,0.99740,0.99750,0.99762,0.99775,0.99783
+0.99794,0.99805,0.99819,0.99829,0.99838,0.99850,0.99863,0.99875,0.99885,0.99896,0.99908,0.99917,0.99927,0.99936,0.99946,0.99953,0.99959,0.99967,0.99973,0.99977
+0.99981,0.99986,0.99992,0.99993,0.99995,0.99997,0.99998,0.99998,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc1x1fract=0.00106,0.00216,0.00363,0.00544,0.00756,0.01018,0.01323,0.01671,0.02078,0.02519,0.02997,0.03535,0.04143,0.04824,0.05533,0.06275,0.07073,0.07906,0.08762
+0.09657,0.10571,0.11537,0.12499,0.13475,0.14484,0.15530,0.16581,0.17670,0.18739,0.19827,0.20936,0.22033,0.23118,0.24178,0.25252,0.26307,0.27455,0.28525,0.29622
+0.30723,0.31811,0.32911,0.33992,0.35112,0.36199,0.37285,0.38362,0.39427,0.40516,0.41577,0.42655,0.43717,0.44762,0.45836,0.46901,0.47961,0.49030,0.50048,0.51101
+0.52132,0.53147,0.54142,0.55139,0.56153,0.57167,0.58169,0.59206,0.60201,0.61200,0.62175,0.63159,0.64143,0.65162,0.66107,0.67076,0.68011,0.68962,0.69885,0.70818
+0.71699,0.72587,0.73476,0.74383,0.75255,0.76127,0.76959,0.77792,0.78640,0.79448,0.80273,0.81048,0.81862,0.82621,0.83359,0.84073,0.84789,0.85503,0.86194,0.86826
+0.87458,0.88085,0.88659,0.89218,0.89727,0.90180,0.90661,0.91100,0.91486,0.91877,0.92234,0.92578,0.92887,0.93176,0.93455,0.93727,0.93981,0.94212,0.94427,0.94629
+0.94815,0.94992,0.95174,0.95338,0.95501,0.95650,0.95806,0.95938,0.96057,0.96172,0.96299,0.96417,0.96534,0.96646,0.96743,0.96858,0.96975,0.97075,0.97177,0.97265
+0.97347,0.97431,0.97519,0.97602,0.97670,0.97746,0.97808,0.97884,0.97951,0.98012,0.98074,0.98130,0.98178,0.98228,0.98278,0.98325,0.98379,0.98419,0.98468,0.98514
+0.98557,0.98594,0.98625,0.98661,0.98690,0.98722,0.98754,0.98780,0.98807,0.98835,0.98862,0.98887,0.98909,0.98931,0.98952,0.98976,0.98992,0.99012,0.99031,0.99050
+0.99071,0.99091,0.99105,0.99119,0.99131,0.99139,0.99153,0.99168,0.99184,0.99197,0.99214,0.99227,0.99234,0.99249,0.99264,0.99282,0.99291,0.99305,0.99316,0.99327
+0.99337,0.99348,0.99361,0.99373,0.99389,0.99405,0.99419,0.99430,0.99446,0.99453,0.99466,0.99479,0.99493,0.99502,0.99513,0.99521,0.99529,0.99542,0.99550,0.99562
+0.99574,0.99579,0.99591,0.99599,0.99610,0.99622,0.99636,0.99651,0.99664,0.99676,0.99688,0.99699,0.99709,0.99718,0.99728,0.99739,0.99752,0.99763,0.99771,0.99788
+0.99796,0.99805,0.99816,0.99827,0.99839,0.99850,0.99860,0.99870,0.99880,0.99891,0.99902,0.99910,0.99922,0.99934,0.99943,0.99948,0.99955,0.99961,0.99970,0.99977
+0.99984,0.99988,0.99993,0.99996,0.99996,0.99998,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc1x2fract=0.00108,0.00246,0.00406,0.00602,0.00809,0.01090,0.01415,0.01801,0.02225,0.02741,0.03285,0.03880,0.04501,0.05201,0.05963,0.06791,0.07670,0.08546,0.09474
+0.10415,0.11398,0.12378,0.13426,0.14467,0.15519,0.16561,0.17616,0.18661,0.19729,0.20781,0.21887,0.22951,0.24036,0.25114,0.26182,0.27239,0.28317,0.29394,0.30492
+0.31589,0.32677,0.33759,0.34840,0.35904,0.36949,0.38027,0.39088,0.40142,0.41200,0.42258,0.43300,0.44376,0.45430,0.46502,0.47544,0.48606,0.49654,0.50688,0.51686
+0.52705,0.53694,0.54701,0.55739,0.56751,0.57739,0.58765,0.59748,0.60735,0.61706,0.62673,0.63622,0.64543,0.65517,0.66449,0.67405,0.68334,0.69296,0.70211,0.71134
+0.72054,0.72965,0.73856,0.74715,0.75594,0.76461,0.77294,0.78117,0.78930,0.79750,0.80551,0.81365,0.82133,0.82926,0.83677,0.84389,0.85112,0.85798,0.86479,0.87136
+0.87753,0.88312,0.88880,0.89422,0.89931,0.90419,0.90873,0.91291,0.91687,0.92064,0.92405,0.92755,0.93054,0.93331,0.93587,0.93832,0.94057,0.94280,0.94493,0.94687
+0.94865,0.95044,0.95211,0.95368,0.95518,0.95664,0.95787,0.95909,0.96036,0.96152,0.96277,0.96396,0.96495,0.96592,0.96704,0.96803,0.96902,0.96994,0.97084,0.97176
+0.97266,0.97346,0.97426,0.97501,0.97578,0.97651,0.97723,0.97786,0.97842,0.97906,0.97972,0.98035,0.98092,0.98138,0.98190,0.98232,0.98275,0.98321,0.98363,0.98397
+0.98441,0.98487,0.98523,0.98556,0.98593,0.98633,0.98667,0.98692,0.98720,0.98751,0.98779,0.98800,0.98822,0.98844,0.98868,0.98889,0.98920,0.98943,0.98960,0.98975
+0.98991,0.99003,0.99022,0.99039,0.99054,0.99071,0.99085,0.99100,0.99115,0.99131,0.99146,0.99161,0.99173,0.99185,0.99195,0.99207,0.99225,0.99235,0.99247,0.99267
+0.99279,0.99291,0.99302,0.99311,0.99323,0.99335,0.99349,0.99364,0.99381,0.99393,0.99409,0.99420,0.99430,0.99443,0.99457,0.99468,0.99481,0.99493,0.99503,0.99515
+0.99529,0.99539,0.99550,0.99558,0.99568,0.99580,0.99591,0.99602,0.99614,0.99630,0.99640,0.99652,0.99665,0.99677,0.99689,0.99697,0.99712,0.99723,0.99739,0.99746
+0.99756,0.99770,0.99782,0.99794,0.99804,0.99815,0.99826,0.99838,0.99849,0.99859,0.99875,0.99891,0.99906,0.99916,0.99926,0.99934,0.99943,0.99951,0.99960,0.99968
+0.99976,0.99982,0.99986,0.99990,0.99993,0.99995,0.99998,0.99998,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc1v1fract=0.00083,0.00191,0.00303,0.00451,0.00607,0.00811,0.01037,0.01321,0.01643,0.02027,0.02459,0.02937,0.03458,0.04053,0.04658,0.05301,0.06025,0.06756,0.07540
+0.08368,0.09233,0.10132,0.11082,0.12035,0.13071,0.14121,0.15171,0.16214,0.17322,0.18374,0.19460,0.20591,0.21641,0.22743,0.23879,0.24981,0.26068,0.27196,0.28313
+0.29406,0.30534,0.31620,0.32742,0.33869,0.34962,0.36100,0.37198,0.38282,0.39334,0.40405,0.41517,0.42565,0.43662,0.44698,0.45789,0.46888,0.47956,0.49026,0.50078
+0.51139,0.52221,0.53291,0.54392,0.55433,0.56459,0.57492,0.58531,0.59563,0.60571,0.61543,0.62513,0.63455,0.64400,0.65370,0.66312,0.67267,0.68202,0.69143,0.70071
+0.71029,0.71921,0.72856,0.73780,0.74663,0.75577,0.76478,0.77359,0.78205,0.79057,0.79885,0.80698,0.81483,0.82281,0.83050,0.83825,0.84547,0.85260,0.85913,0.86546
+0.87190,0.87821,0.88448,0.89018,0.89555,0.90076,0.90563,0.91031,0.91469,0.91861,0.92233,0.92580,0.92907,0.93231,0.93532,0.93802,0.94052,0.94292,0.94499,0.94700
+0.94903,0.95080,0.95256,0.95431,0.95578,0.95723,0.95868,0.96002,0.96135,0.96262,0.96388,0.96514,0.96629,0.96738,0.96847,0.96952,0.97055,0.97156,0.97248,0.97338
+0.97425,0.97509,0.97594,0.97663,0.97728,0.97794,0.97861,0.97935,0.97994,0.98046,0.98107,0.98161,0.98217,0.98268,0.98315,0.98367,0.98418,0.98457,0.98495,0.98543
+0.98580,0.98618,0.98655,0.98688,0.98718,0.98747,0.98777,0.98806,0.98832,0.98857,0.98885,0.98912,0.98932,0.98952,0.98969,0.98991,0.99015,0.99037,0.99055,0.99073
+0.99088,0.99104,0.99122,0.99139,0.99155,0.99171,0.99184,0.99200,0.99212,0.99227,0.99244,0.99258,0.99272,0.99283,0.99300,0.99310,0.99318,0.99330,0.99340,0.99352
+0.99365,0.99376,0.99391,0.99405,0.99414,0.99426,0.99437,0.99447,0.99457,0.99468,0.99482,0.99498,0.99510,0.99516,0.99527,0.99537,0.99544,0.99556,0.99567,0.99578
+0.99589,0.99605,0.99615,0.99626,0.99636,0.99646,0.99656,0.99669,0.99679,0.99687,0.99697,0.99708,0.99721,0.99730,0.99742,0.99752,0.99762,0.99771,0.99781,0.99791
+0.99803,0.99812,0.99824,0.99832,0.99842,0.99854,0.99865,0.99873,0.99884,0.99892,0.99900,0.99910,0.99921,0.99929,0.99937,0.99947,0.99954,0.99961,0.99967,0.99972
+0.99977,0.99984,0.99989,0.99994,0.99995,0.99997,0.99998,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc1v2fract=0.00114,0.00251,0.00414,0.00607,0.00813,0.01090,0.01406,0.01767,0.02175,0.02626,0.03131,0.03710,0.04285,0.04927,0.05649,0.06421,0.07246,0.08115,0.08995
+0.09960,0.10913,0.11905,0.12907,0.13945,0.14985,0.16027,0.17106,0.18181,0.19257,0.20316,0.21381,0.22453,0.23545,0.24684,0.25790,0.26918,0.28024,0.29101,0.30234
+0.31325,0.32422,0.33532,0.34571,0.35641,0.36697,0.37797,0.38862,0.39960,0.41049,0.42117,0.43176,0.44245,0.45291,0.46396,0.47464,0.48533,0.49593,0.50617,0.51658
+0.52684,0.53743,0.54808,0.55805,0.56830,0.57834,0.58868,0.59861,0.60908,0.61927,0.62914,0.63929,0.64924,0.65906,0.66867,0.67858,0.68801,0.69733,0.70646,0.71569
+0.72508,0.73414,0.74275,0.75203,0.76084,0.76975,0.77844,0.78687,0.79496,0.80325,0.81139,0.81949,0.82713,0.83469,0.84211,0.84937,0.85628,0.86304,0.86958,0.87575
+0.88174,0.88763,0.89310,0.89820,0.90337,0.90792,0.91252,0.91673,0.92059,0.92444,0.92787,0.93108,0.93416,0.93696,0.93938,0.94190,0.94413,0.94632,0.94849,0.95047
+0.95227,0.95380,0.95553,0.95691,0.95830,0.95958,0.96085,0.96187,0.96305,0.96412,0.96522,0.96622,0.96727,0.96820,0.96919,0.97008,0.97094,0.97183,0.97261,0.97334
+0.97418,0.97488,0.97563,0.97633,0.97696,0.97761,0.97828,0.97884,0.97944,0.98008,0.98060,0.98116,0.98175,0.98225,0.98267,0.98314,0.98359,0.98402,0.98443,0.98480
+0.98517,0.98551,0.98580,0.98611,0.98640,0.98669,0.98692,0.98723,0.98749,0.98779,0.98805,0.98826,0.98844,0.98871,0.98895,0.98913,0.98933,0.98951,0.98971,0.98986
+0.99001,0.99019,0.99036,0.99056,0.99072,0.99087,0.99102,0.99120,0.99136,0.99148,0.99158,0.99172,0.99185,0.99199,0.99216,0.99231,0.99246,0.99257,0.99268,0.99282
+0.99296,0.99308,0.99320,0.99328,0.99340,0.99353,0.99363,0.99376,0.99392,0.99403,0.99416,0.99428,0.99439,0.99452,0.99462,0.99475,0.99486,0.99496,0.99506,0.99520
+0.99534,0.99546,0.99558,0.99568,0.99578,0.99592,0.99603,0.99615,0.99626,0.99638,0.99653,0.99670,0.99684,0.99693,0.99702,0.99714,0.99727,0.99740,0.99754,0.99768
+0.99775,0.99789,0.99796,0.99810,0.99827,0.99836,0.99845,0.99857,0.99868,0.99876,0.99888,0.99896,0.99903,0.99911,0.99923,0.99934,0.99944,0.99951,0.99959,0.99965
+0.99970,0.99978,0.99983,0.99987,0.99991,0.99995,0.99996,0.99997,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc2v2fract=0.00085,0.00187,0.00292,0.00412,0.00567,0.00753,0.00976,0.01228,0.01534,0.01862,0.02269,0.02716,0.03198,0.03756,0.04369,0.05044,0.05750,0.06518,0.07313
+0.08136,0.09022,0.09939,0.10902,0.11925,0.12920,0.13942,0.15003,0.16062,0.17181,0.18277,0.19366,0.20456,0.21559,0.22707,0.23826,0.24944,0.26078,0.27168,0.28250
+0.29344,0.30450,0.31572,0.32646,0.33705,0.34793,0.35854,0.36946,0.38038,0.39127,0.40233,0.41270,0.42325,0.43384,0.44415,0.45479,0.46501,0.47534,0.48559,0.49585
+0.50619,0.51629,0.52636,0.53643,0.54613,0.55617,0.56611,0.57584,0.58553,0.59510,0.60485,0.61433,0.62373,0.63294,0.64218,0.65103,0.66000,0.66897,0.67771,0.68622
+0.69492,0.70383,0.71268,0.72101,0.72927,0.73749,0.74599,0.75406,0.76183,0.76957,0.77716,0.78471,0.79202,0.79946,0.80651,0.81351,0.82036,0.82708,0.83390,0.84050
+0.84697,0.85322,0.85915,0.86479,0.87036,0.87560,0.88063,0.88549,0.89012,0.89477,0.89902,0.90321,0.90696,0.91052,0.91376,0.91700,0.92006,0.92279,0.92562,0.92808
+0.93057,0.93293,0.93496,0.93709,0.93912,0.94124,0.94311,0.94499,0.94670,0.94826,0.94972,0.95123,0.95275,0.95413,0.95559,0.95695,0.95820,0.95951,0.96072,0.96190
+0.96305,0.96417,0.96523,0.96640,0.96741,0.96843,0.96939,0.97020,0.97098,0.97182,0.97255,0.97335,0.97398,0.97464,0.97529,0.97599,0.97667,0.97731,0.97794,0.97856
+0.97918,0.97973,0.98033,0.98087,0.98142,0.98198,0.98249,0.98300,0.98348,0.98388,0.98422,0.98457,0.98499,0.98538,0.98577,0.98610,0.98642,0.98676,0.98709,0.98734
+0.98764,0.98789,0.98814,0.98836,0.98860,0.98887,0.98908,0.98929,0.98951,0.98978,0.98998,0.99019,0.99038,0.99056,0.99078,0.99098,0.99116,0.99135,0.99149,0.99167
+0.99180,0.99198,0.99212,0.99228,0.99245,0.99262,0.99280,0.99297,0.99315,0.99329,0.99346,0.99359,0.99377,0.99392,0.99410,0.99425,0.99442,0.99455,0.99467,0.99483
+0.99499,0.99511,0.99524,0.99535,0.99548,0.99559,0.99571,0.99587,0.99600,0.99615,0.99626,0.99639,0.99655,0.99671,0.99681,0.99695,0.99707,0.99721,0.99734,0.99744
+0.99758,0.99770,0.99785,0.99800,0.99817,0.99831,0.99843,0.99855,0.99867,0.99879,0.99889,0.99900,0.99913,0.99925,0.99937,0.99944,0.99953,0.99959,0.99967,0.99975
+0.99984,0.99988,0.99992,0.99995,0.99997,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc2v1fract=0.00090,0.00202,0.00303,0.00449,0.00596,0.00768,0.00971,0.01218,0.01512,0.01857,0.02255,0.02713,0.03185,0.03734,0.04343,0.05006,0.05707,0.06438,0.07268
+0.08100,0.08971,0.09885,0.10799,0.11813,0.12776,0.13801,0.14806,0.15862,0.16942,0.18047,0.19163,0.20254,0.21333,0.22441,0.23563,0.24660,0.25794,0.26936,0.28043
+0.29135,0.30261,0.31346,0.32465,0.33554,0.34627,0.35725,0.36794,0.37879,0.38965,0.40014,0.41056,0.42092,0.43157,0.44182,0.45278,0.46319,0.47386,0.48455,0.49502
+0.50503,0.51553,0.52591,0.53599,0.54577,0.55573,0.56578,0.57533,0.58537,0.59496,0.60488,0.61448,0.62411,0.63345,0.64297,0.65240,0.66128,0.67030,0.67983,0.68880
+0.69788,0.70661,0.71483,0.72341,0.73166,0.73979,0.74788,0.75592,0.76401,0.77201,0.77989,0.78765,0.79483,0.80219,0.80934,0.81645,0.82346,0.83022,0.83676,0.84328
+0.84964,0.85566,0.86165,0.86727,0.87279,0.87793,0.88294,0.88793,0.89257,0.89694,0.90104,0.90510,0.90898,0.91245,0.91580,0.91893,0.92202,0.92488,0.92771,0.93029
+0.93284,0.93488,0.93711,0.93918,0.94124,0.94319,0.94507,0.94703,0.94866,0.95025,0.95189,0.95330,0.95481,0.95627,0.95765,0.95893,0.96014,0.96131,0.96255,0.96356
+0.96456,0.96565,0.96663,0.96762,0.96857,0.96950,0.97042,0.97125,0.97212,0.97285,0.97356,0.97432,0.97505,0.97571,0.97639,0.97704,0.97761,0.97825,0.97894,0.97957
+0.98009,0.98060,0.98115,0.98165,0.98218,0.98262,0.98304,0.98350,0.98394,0.98435,0.98478,0.98520,0.98556,0.98587,0.98617,0.98647,0.98680,0.98714,0.98749,0.98775
+0.98804,0.98834,0.98864,0.98889,0.98914,0.98937,0.98956,0.98977,0.98993,0.99011,0.99033,0.99050,0.99070,0.99088,0.99107,0.99126,0.99144,0.99159,0.99174,0.99187
+0.99206,0.99221,0.99238,0.99254,0.99268,0.99284,0.99298,0.99310,0.99323,0.99338,0.99352,0.99367,0.99380,0.99395,0.99410,0.99423,0.99437,0.99456,0.99468,0.99480
+0.99493,0.99507,0.99523,0.99534,0.99551,0.99565,0.99577,0.99591,0.99605,0.99615,0.99631,0.99645,0.99658,0.99669,0.99686,0.99698,0.99707,0.99720,0.99731,0.99740
+0.99757,0.99768,0.99780,0.99795,0.99808,0.99819,0.99837,0.99848,0.99861,0.99871,0.99881,0.99895,0.99908,0.99918,0.99928,0.99937,0.99948,0.99959,0.99968,0.99976
+0.99982,0.99987,0.99992,0.99995,0.99996,0.99998,0.99998,0.99998,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc2x2fract=0.00104,0.00213,0.00347,0.00519,0.00714,0.00938,0.01197,0.01511,0.01881,0.02295,0.02763,0.03274,0.03839,0.04454,0.05132,0.05854,0.06654,0.07484,0.08342
+0.09250,0.10211,0.11168,0.12168,0.13185,0.14224,0.15266,0.16291,0.17339,0.18371,0.19462,0.20544,0.21653,0.22728,0.23796,0.24868,0.25930,0.27015,0.28067,0.29190
+0.30273,0.31316,0.32375,0.33452,0.34506,0.35599,0.36701,0.37752,0.38804,0.39869,0.40923,0.41985,0.43033,0.44065,0.45093,0.46116,0.47173,0.48202,0.49221,0.50226
+0.51254,0.52286,0.53311,0.54315,0.55332,0.56314,0.57278,0.58250,0.59238,0.60215,0.61165,0.62119,0.63065,0.63980,0.64884,0.65781,0.66727,0.67639,0.68583,0.69451
+0.70341,0.71170,0.72022,0.72883,0.73702,0.74543,0.75378,0.76230,0.77036,0.77823,0.78615,0.79363,0.80118,0.80861,0.81605,0.82306,0.83001,0.83717,0.84362,0.85000
+0.85626,0.86226,0.86817,0.87385,0.87918,0.88417,0.88924,0.89382,0.89835,0.90255,0.90642,0.91003,0.91352,0.91686,0.92000,0.92278,0.92558,0.92819,0.93065,0.93296
+0.93524,0.93731,0.93939,0.94119,0.94307,0.94467,0.94626,0.94782,0.94935,0.95088,0.95221,0.95366,0.95516,0.95643,0.95765,0.95900,0.96018,0.96126,0.96228,0.96335
+0.96430,0.96542,0.96649,0.96749,0.96849,0.96938,0.97025,0.97114,0.97193,0.97275,0.97362,0.97437,0.97514,0.97586,0.97660,0.97726,0.97791,0.97864,0.97921,0.97981
+0.98046,0.98098,0.98146,0.98195,0.98237,0.98286,0.98335,0.98388,0.98428,0.98474,0.98513,0.98549,0.98592,0.98626,0.98659,0.98696,0.98731,0.98760,0.98792,0.98819
+0.98847,0.98872,0.98893,0.98917,0.98937,0.98962,0.98984,0.99004,0.99022,0.99044,0.99066,0.99085,0.99105,0.99126,0.99147,0.99163,0.99183,0.99202,0.99216,0.99229
+0.99243,0.99259,0.99278,0.99293,0.99310,0.99325,0.99335,0.99348,0.99364,0.99383,0.99397,0.99411,0.99421,0.99431,0.99445,0.99459,0.99472,0.99486,0.99497,0.99510
+0.99521,0.99537,0.99549,0.99559,0.99570,0.99583,0.99593,0.99604,0.99617,0.99630,0.99645,0.99657,0.99669,0.99682,0.99692,0.99705,0.99718,0.99732,0.99740,0.99753
+0.99765,0.99778,0.99794,0.99805,0.99814,0.99826,0.99835,0.99847,0.99856,0.99868,0.99878,0.99890,0.99903,0.99915,0.99924,0.99934,0.99943,0.99951,0.99962,0.99970
+0.99981,0.99986,0.99990,0.99991,0.99993,0.99995,0.99998,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc2x1fract=0.00115,0.00248,0.00396,0.00575,0.00801,0.01048,0.01365,0.01709,0.02101,0.02545,0.03034,0.03593,0.04205,0.04876,0.05584,0.06331,0.07128,0.07954,0.08849
+0.09749,0.10660,0.11603,0.12586,0.13577,0.14567,0.15601,0.16647,0.17675,0.18696,0.19755,0.20815,0.21894,0.22977,0.24122,0.25192,0.26254,0.27321,0.28386,0.29453
+0.30515,0.31611,0.32688,0.33769,0.34829,0.35919,0.36980,0.38060,0.39114,0.40119,0.41169,0.42246,0.43280,0.44328,0.45355,0.46405,0.47488,0.48514,0.49547,0.50618
+0.51690,0.52697,0.53706,0.54737,0.55750,0.56737,0.57729,0.58733,0.59706,0.60673,0.61637,0.62585,0.63538,0.64463,0.65372,0.66309,0.67239,0.68151,0.69047,0.69965
+0.70853,0.71727,0.72578,0.73422,0.74256,0.75108,0.75942,0.76737,0.77563,0.78369,0.79163,0.79922,0.80672,0.81424,0.82148,0.82858,0.83570,0.84253,0.84924,0.85537
+0.86155,0.86754,0.87341,0.87871,0.88411,0.88911,0.89403,0.89859,0.90281,0.90680,0.91070,0.91412,0.91761,0.92089,0.92380,0.92674,0.92948,0.93196,0.93429,0.93661
+0.93877,0.94064,0.94260,0.94441,0.94620,0.94785,0.94940,0.95087,0.95250,0.95395,0.95531,0.95662,0.95776,0.95908,0.96026,0.96139,0.96257,0.96377,0.96487,0.96596
+0.96679,0.96772,0.96869,0.96965,0.97055,0.97151,0.97231,0.97320,0.97399,0.97469,0.97536,0.97605,0.97672,0.97738,0.97802,0.97873,0.97943,0.97998,0.98056,0.98114
+0.98164,0.98221,0.98270,0.98310,0.98356,0.98403,0.98450,0.98490,0.98527,0.98564,0.98601,0.98634,0.98671,0.98705,0.98730,0.98758,0.98786,0.98823,0.98846,0.98874
+0.98901,0.98921,0.98943,0.98970,0.98993,0.99014,0.99036,0.99055,0.99075,0.99091,0.99106,0.99128,0.99149,0.99168,0.99183,0.99196,0.99217,0.99231,0.99242,0.99256
+0.99270,0.99286,0.99300,0.99313,0.99327,0.99341,0.99355,0.99369,0.99382,0.99394,0.99408,0.99420,0.99435,0.99448,0.99460,0.99474,0.99488,0.99496,0.99508,0.99519
+0.99535,0.99546,0.99557,0.99568,0.99578,0.99593,0.99606,0.99617,0.99627,0.99639,0.99649,0.99661,0.99673,0.99685,0.99697,0.99708,0.99721,0.99739,0.99752,0.99765
+0.99775,0.99784,0.99798,0.99807,0.99819,0.99831,0.99845,0.99856,0.99866,0.99876,0.99889,0.99899,0.99910,0.99922,0.99930,0.99939,0.99947,0.99954,0.99961,0.99968
+0.99975,0.99984,0.99987,0.99990,0.99992,0.99996,0.99998,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc2u2fract=0.00122,0.00246,0.00390,0.00568,0.00760,0.01013,0.01299,0.01634,0.02011,0.02437,0.02936,0.03478,0.04080,0.04705,0.05394,0.06129,0.06883,0.07692,0.08551
+0.09479,0.10415,0.11378,0.12360,0.13369,0.14361,0.15426,0.16480,0.17559,0.18598,0.19668,0.20738,0.21784,0.22884,0.23949,0.25077,0.26181,0.27291,0.28361,0.29488
+0.30543,0.31633,0.32691,0.33759,0.34864,0.35963,0.37042,0.38101,0.39160,0.40220,0.41282,0.42341,0.43409,0.44464,0.45487,0.46519,0.47567,0.48571,0.49589,0.50623
+0.51664,0.52687,0.53718,0.54719,0.55743,0.56746,0.57734,0.58714,0.59694,0.60678,0.61654,0.62650,0.63626,0.64573,0.65505,0.66460,0.67409,0.68341,0.69251,0.70150
+0.71042,0.71937,0.72783,0.73643,0.74474,0.75331,0.76143,0.76962,0.77775,0.78587,0.79393,0.80169,0.80956,0.81710,0.82438,0.83159,0.83849,0.84515,0.85200,0.85824
+0.86417,0.87013,0.87583,0.88126,0.88641,0.89131,0.89609,0.90050,0.90467,0.90869,0.91240,0.91580,0.91920,0.92235,0.92549,0.92828,0.93084,0.93332,0.93566,0.93785
+0.93987,0.94193,0.94398,0.94590,0.94762,0.94931,0.95087,0.95240,0.95383,0.95529,0.95665,0.95792,0.95938,0.96061,0.96182,0.96296,0.96404,0.96507,0.96608,0.96707
+0.96812,0.96913,0.97009,0.97093,0.97175,0.97272,0.97352,0.97423,0.97505,0.97572,0.97642,0.97714,0.97786,0.97851,0.97922,0.97982,0.98040,0.98095,0.98145,0.98194
+0.98246,0.98297,0.98336,0.98374,0.98414,0.98456,0.98496,0.98534,0.98567,0.98608,0.98638,0.98666,0.98698,0.98727,0.98752,0.98782,0.98813,0.98841,0.98867,0.98889
+0.98908,0.98928,0.98952,0.98970,0.98995,0.99016,0.99034,0.99052,0.99070,0.99085,0.99104,0.99118,0.99127,0.99144,0.99160,0.99175,0.99187,0.99201,0.99215,0.99233
+0.99247,0.99264,0.99278,0.99296,0.99311,0.99323,0.99335,0.99346,0.99357,0.99369,0.99381,0.99391,0.99400,0.99413,0.99425,0.99435,0.99450,0.99462,0.99475,0.99489
+0.99503,0.99517,0.99530,0.99542,0.99553,0.99568,0.99583,0.99596,0.99607,0.99617,0.99628,0.99638,0.99648,0.99662,0.99674,0.99689,0.99700,0.99712,0.99727,0.99736
+0.99748,0.99758,0.99772,0.99783,0.99794,0.99809,0.99826,0.99840,0.99854,0.99866,0.99878,0.99889,0.99898,0.99910,0.99920,0.99929,0.99939,0.99951,0.99961,0.99969
+0.99974,0.99981,0.99986,0.99989,0.99993,0.99997,0.99998,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000
+1.00000
+pwc2u1fract=0.00092,0.00185,0.00301,0.00443,0.00613,0.00800,0.01021,0.01299,0.01604,0.01954,0.02346,0.02783,0.03263,0.03808,0.04363,0.05002,0.05689,0.06401,0.07157
+0.07979,0.08831,0.09751,0.10678,0.11643,0.12595,0.13590,0.14634,0.15653,0.16681,0.17721,0.18777,0.19856,0.20930,0.22025,0.23147,0.24216,0.25314,0.26377,0.27484
+0.28545,0.29665,0.30750,0.31851,0.32947,0.34041,0.35118,0.36200,0.37268,0.38352,0.39435,0.40511,0.41597,0.42632,0.43702,0.44786,0.45839,0.46901,0.47939,0.48965
+0.49980,0.50972,0.52009,0.53069,0.54093,0.55091,0.56113,0.57123,0.58142,0.59143,0.60107,0.61066,0.62034,0.62974,0.63975,0.64928,0.65873,0.66805,0.67744,0.68690
+0.69606,0.70486,0.71421,0.72304,0.73197,0.74068,0.74909,0.75775,0.76588,0.77419,0.78248,0.79085,0.79856,0.80646,0.81402,0.82159,0.82896,0.83623,0.84318,0.85001
+0.85668,0.86310,0.86911,0.87487,0.88020,0.88552,0.89046,0.89551,0.90008,0.90460,0.90876,0.91299,0.91675,0.92021,0.92353,0.92666,0.92959,0.93235,0.93504,0.93745
+0.93966,0.94173,0.94379,0.94575,0.94753,0.94941,0.95112,0.95285,0.95446,0.95596,0.95743,0.95888,0.96034,0.96166,0.96299,0.96427,0.96551,0.96666,0.96769,0.96878
+0.96968,0.97061,0.97151,0.97246,0.97327,0.97410,0.97495,0.97568,0.97649,0.97732,0.97808,0.97875,0.97939,0.97996,0.98056,0.98109,0.98166,0.98214,0.98257,0.98308
+0.98360,0.98403,0.98443,0.98480,0.98518,0.98559,0.98602,0.98632,0.98664,0.98696,0.98727,0.98752,0.98786,0.98812,0.98834,0.98858,0.98881,0.98907,0.98931,0.98956
+0.98978,0.99003,0.99023,0.99040,0.99062,0.99083,0.99106,0.99120,0.99137,0.99151,0.99165,0.99176,0.99190,0.99202,0.99215,0.99228,0.99241,0.99253,0.99261,0.99275
+0.99286,0.99298,0.99309,0.99323,0.99336,0.99347,0.99362,0.99373,0.99386,0.99398,0.99414,0.99425,0.99441,0.99457,0.99469,0.99481,0.99495,0.99505,0.99518,0.99527
+0.99539,0.99551,0.99563,0.99575,0.99588,0.99599,0.99609,0.99619,0.99636,0.99647,0.99660,0.99672,0.99680,0.99692,0.99706,0.99720,0.99734,0.99748,0.99760,0.99772
+0.99781,0.99796,0.99809,0.99821,0.99834,0.99846,0.99855,0.99866,0.99879,0.99890,0.99903,0.99913,0.99920,0.99930,0.99939,0.99946,0.99954,0.99962,0.99970,0.99976
+0.99981,0.99987,0.99990,0.99994,0.99996,0.99998,0.99998,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000
\ No newline at end of file
diff --git a/PARAM/SHMS/DC/CUTS/pdc_cuts.param b/PARAM/SHMS/DC/CUTS/pdc_cuts.param
new file mode 100644
index 0000000000000000000000000000000000000000..d4bcd13acfbef67556766b2de5c2d8ad570b448e
--- /dev/null
+++ b/PARAM/SHMS/DC/CUTS/pdc_cuts.param
@@ -0,0 +1,20 @@
+; Utilize per wire tzero offsets, 1 means true
+p_using_tzero_per_wire = 1
+
+; TEST-STAND PARAMETERS
+; Custom parameter file which should be loaded when aiming to analyze HMS DC
+; data with no tracking.
+psel_using_scin = 0
+
+; TDC window limits for each plane.
+pdc_tdc_min_win = -13000, -13000, -13000, -13000, -13000, -13000
+ -13000, -13000, -13000, -13000, -13000, -13000
+pdc_tdc_max_win = -10000, -10000, -10000, -10000, -10000, -10000
+ -10000, -10000, -10000, -10000, -10000, -10000
+
+pdc_fix_lr = 1
+pdc_fix_propcorr = 1
+
+; Zero time correction for each plane in ns that is added to TDC time.
+pdc_plane_time_zero = 1290.00, 1290.00, 1290.00, 1290.00, 1290.00, 1290.00
+ 1290.00, 1290.00, 1290.00, 1290.00, 1290.00, 1290.00
\ No newline at end of file
diff --git a/PARAM/SHMS/DC/pdc_tzero_per_wire.param b/PARAM/SHMS/DC/GEOM/pdc_geom.param
similarity index 73%
rename from PARAM/SHMS/DC/pdc_tzero_per_wire.param
rename to PARAM/SHMS/DC/GEOM/pdc_geom.param
index 083ad0f5f7c491842a79fa0c25aa3d0dfb5e376b..11c6d510f0aa7da486c278eed0efa17ec15a9195 100644
--- a/PARAM/SHMS/DC/pdc_tzero_per_wire.param
+++ b/PARAM/SHMS/DC/GEOM/pdc_geom.param
@@ -1,3 +1,131 @@
+; Geometrical parameters
+
+; Conversion factor from TDC clicks to ns.
+pdc_tdc_time_per_channel = -0.10
+
+; Number of drift chambers.
+pdc_num_chambers = 2
+
+; Total number of planes.
+pdc_num_planes = 12
+
+; Names of planes.
+pdc_plane_names = "1u1 1u2 1x1 1x2 1v1 1v2 2v2 2v1 2x2 2x1 2u2 2u1" ; TODO
+
+; Chamber index for each plane.
+pdc_chamber_planes = 1, 1, 1, 1, 1, 1
+ 2, 2, 2, 2, 2, 2
+
+; 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
+
+; 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
+
+; 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
+
+; 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
+
+; 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
+pdc_1_pitch = -0.006 ; TODO - final survey
+pdc_2_pitch = 0.001 ; TODO - final survey
+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.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.
+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
+ 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
+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
+
+; t0 per wire corrections
ptzero1u1=
0,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000, 0.000000, 0.000000, 0.000000, 0.000000
0.000000, 7.083270, 1.500000, 3.196340, 0.000000, 3.561760, -24.337200, -8.570420, -1.706110, -12.830400, 3.509240, 2.827790, 2.705790, 1.986040, -2.729090, -8.382810
@@ -85,4 +213,4 @@ ptzero2u1=
8.025290, 8.359520, 5.533810, 9.440830, 7.172200, 7.869600, 6.970210, 8.876350, 7.855080, 7.238380, 8.958600, 3.524920, 9.025910, 10.439000, 9.563340, 1.984250
-0.605358, -2.121810, -2.865110, 2.898040, 1.940570, 1.402800, 2.932110, 0.146516, 2.824990, 5.332050, 2.056730, 5.856240, 3.462260, 3.456100, 3.258370, 1.081600
3.582360, 3.211900, 3.349700, 3.525440, -1.618850, 1.487920, 1.197950, -0.328185, 4.216600, 6.652610, 9.629610, 10.846200, 2.199420, -7.391230, 5.319410, 18.981100
-13.786500, 10.197500, 18.342100, -26.666700, -7.045250, -20.875000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000
+13.786500, 10.197500, 18.342100, -26.666700, -7.045250, -20.875000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000
\ No newline at end of file
diff --git a/PARAM/SHMS/DC/pdc.param b/PARAM/SHMS/DC/pdc.param
deleted file mode 100644
index dc12ec1f606ae571bc72cff54e456caea3faed0c..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/DC/pdc.param
+++ /dev/null
@@ -1,21 +0,0 @@
-; GENERAL PARAMETERS
-
-; Number of drift chambers.
-pdc_num_chambers = 2
-
-; Total number of planes.
-pdc_num_planes = 12
-
-; Names of planes.
-pdc_plane_names = "1u1 1u2 1x1 1x2 1v1 1v2 2v2 2v1 2x2 2x1 2u2 2u1" ; TODO
-
-; Chamber index for each plane.
-pdc_chamber_planes = 1, 1, 1, 1, 1, 1
- 2, 2, 2, 2, 2, 2
-
-; 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
-; 1 means true
-p_using_tzero_per_wire = 1
diff --git a/PARAM/SHMS/DC/pdc.pos b/PARAM/SHMS/DC/pdc.pos
deleted file mode 100644
index ee065a50eb24a900bdb77a423a37bf925e557a9a..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/DC/pdc.pos
+++ /dev/null
@@ -1,92 +0,0 @@
-; 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
-
-; 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
-pdc_1_pitch = -0.006 ; TODO - final survey
-pdc_2_pitch = 0.001 ; TODO - final survey
-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.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.
-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
- 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
-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
diff --git a/PARAM/SHMS/DC/pdc_test_stand.param b/PARAM/SHMS/DC/pdc_test_stand.param
deleted file mode 100644
index be39f3af8de4d00f3f2e4d38e03e8d3a7d0ee240..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/DC/pdc_test_stand.param
+++ /dev/null
@@ -1,5 +0,0 @@
-; 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
deleted file mode 100644
index aba51b9714f7eb5395f945866c302e0847f6219f..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/DC/pdc_tracking.param
+++ /dev/null
@@ -1,47 +0,0 @@
-; 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
-
-
-; TDC window limits for each plane.
-pdc_tdc_min_win = -13000, -13000, -13000, -13000, -13000, -13000 ; TODO - wide limits for now
- -13000, -13000, -13000, -13000, -13000, -13000
-pdc_tdc_max_win = -10000, -10000, -10000, -10000, -10000, -10000 ; TODO - wide limits for now
- -10000, -10000, -10000, -10000, -10000, -10000
-
-
-
-; 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 = 1283.82, 1283.30, 1286.73, 1283.56, 1282.57, 1284.30
-; 1283.94, 1283.34, 1286.95, 1286.46, 1286.37, 1284.47
-
-;Zero time correction for each plane in ns that is added to TDC time.
-;pdc_plane_time_zero = 1293.66, 1293.5, 1286.86, 1294.36, 1291.36, 1293.05
-; 1289.26, 1290.03, 1287.02, 1286.41, 1290.52, 1288.88
-
-;Zero time correction for each plane in ns that is added to TDC time.
-pdc_plane_time_zero = 1290.00, 1290.00, 1290.00, 1290.00, 1290.00, 1290.00
- 1290.00, 1290.00, 1290.00, 1290.00, 1290.00, 1290.00
-
-
-
-
-; 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
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param
new file mode 100644
index 0000000000000000000000000000000000000000..0a3419cdde9782306f6d4874b2979e52f71e0a54
--- /dev/null
+++ b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param
@@ -0,0 +1,2 @@
+; Garth H. gain calibration for run 483, June 20 2017
+phgcer_adc_to_npe = 1./273., 1./460., 1./582., 1./378.
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param
new file mode 100644
index 0000000000000000000000000000000000000000..2b74e628c9e39deaedbf29d37e9d1b44a6455861
--- /dev/null
+++ b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param
@@ -0,0 +1,2 @@
+; Garth H. gain calibration for run 484, June 20 2017
+phgcer_adc_to_npe = 1./454., 1./447., 1./409., 1./547.
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param
new file mode 100644
index 0000000000000000000000000000000000000000..c7f1e569ef9811475d2962150160c7a8afa7d0b2
--- /dev/null
+++ b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param
@@ -0,0 +1,2 @@
+; Garth H. gain calibration for run 486, June 20 2017
+phgcer_adc_to_npe = 1./551., 1./426., 1./376., 1./488.
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param
new file mode 100644
index 0000000000000000000000000000000000000000..fbc6c0a9d5899dc6f6d52cc0fc608452028c4712
--- /dev/null
+++ b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param
@@ -0,0 +1,2 @@
+; Garth H. gain calibration from run 487, June 20 2017
+phgcer_adc_to_npe = 1/551., 1/426., 1/376., 1/488.
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param
new file mode 100644
index 0000000000000000000000000000000000000000..2518a4d42c4723ff76c9369c24e682a6d8a3a844
--- /dev/null
+++ b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param
@@ -0,0 +1,2 @@
+; Garth H. gain calibration from run 488, June 20 2017
+phgcer_adc_to_npe = 1/546., 1/430., 1/376., 1/477.
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/phgcer_calib.param b/PARAM/SHMS/HGCER/CALIB/phgcer_calib.param
new file mode 100644
index 0000000000000000000000000000000000000000..2518a4d42c4723ff76c9369c24e682a6d8a3a844
--- /dev/null
+++ b/PARAM/SHMS/HGCER/CALIB/phgcer_calib.param
@@ -0,0 +1,2 @@
+; Garth H. gain calibration from run 488, June 20 2017
+phgcer_adc_to_npe = 1/546., 1/430., 1/376., 1/477.
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param b/PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param
new file mode 100644
index 0000000000000000000000000000000000000000..3afc69b3e92c32a673456973ce3cdb7135ca6284
--- /dev/null
+++ b/PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param
@@ -0,0 +1,18 @@
+; Track matching reduced chi2 cut values
+phgcer_red_chi2_min = 0.0
+phgcer_red_chi2_max = 25.0
+
+; Track matching beta cut values
+phgcer_beta_min = 0.0
+phgcer_beta_max = 1.2
+
+; Track matching normailized energy (E/p) cut values
+phgcer_enorm_min = 0.0
+phgcer_enorm_max = 1.5
+
+; ADC time window cut values used to select "good" ADC events
+phgcer_adcTimeWindowMin = 500.
+phgcer_adcTimeWindowMax = 2500.
+
+; NPE Threshold for "good" hit (for measureing effic.)
+phgcer_npe_thresh = 0.5
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/phgcer.param b/PARAM/SHMS/HGCER/GEOM/phgcer_geom.param
similarity index 58%
rename from PARAM/SHMS/HGCER/phgcer.param
rename to PARAM/SHMS/HGCER/GEOM/phgcer_geom.param
index a1e93810b416bbd39fe77a6ea7c93d40a92fde08..da65d831cf3a7b71fafe17eae17547d8b48c2e5e 100644
--- a/PARAM/SHMS/HGCER/phgcer.param
+++ b/PARAM/SHMS/HGCER/GEOM/phgcer_geom.param
@@ -1,28 +1,6 @@
; Number of heavy gas Cherenkov PMT's
phgcer_tot_pmts = 4
-; Garth H. gain calibration from run 488, June 20 2017
-phgcer_adc_to_npe = 1/546., 1/430., 1/376., 1/477.
-
-; Track matching reduced chi2 cut values
-phgcer_red_chi2_min = 0.0
-phgcer_red_chi2_max = 25.0
-
-; Track matching beta cut values
-phgcer_beta_min = 0.0
-phgcer_beta_max = 1.2
-
-; Track matching normailized energy (E/p) cut values
-phgcer_enorm_min = 0.0
-phgcer_enorm_max = 1.5
-
-; ADC time window cut values used to select "good" ADC events
-phgcer_adcTimeWindowMin = 500.
-phgcer_adcTimeWindowMax = 2500.
-
-; ; NPE Threshold for "good" hit (for measureing effic.)
-phgcer_npe_thresh = 0.5
-
; Guess from Dwg. 67165-E-00001 R0 -> 175.1 cm
; Updated on 5-8-17 by Univ. of Regina Group
phgcer_mirror_zpos = 156.27
@@ -42,4 +20,4 @@ phgcer_region = 27.5, 27.5, -27.5, -27.5,
27.5, 27.5, 27.5, 27.5,
25.0, 25.0, 25.0, 25.0,
0.15, 0.15, 0.15, 0.15,
- 0.1, 0.1, 0.1, 0.1
+ 0.1, 0.1, 0.1, 0.1
\ No newline at end of file
diff --git a/PARAM/SHMS/HODO/CALIB/phodo_calib.param b/PARAM/SHMS/HODO/CALIB/phodo_calib.param
new file mode 100644
index 0000000000000000000000000000000000000000..fee9af2f3219c9fdff956044d95fbee50f249b38
--- /dev/null
+++ b/PARAM/SHMS/HODO/CALIB/phodo_calib.param
@@ -0,0 +1,381 @@
+pdumptof = 1
+pdumptof_filename = "CALIBRATION/hodo_calib/pfort.37"
+
+phodo_pos_invadc_offset = -5.0000, -5.0000, 0.000, 0.000
+ -5.0000, -2.0000, 0.000, 0.000
+ -5.0000, -2.0000, +10.000, 0.000
+ -5.0000, -4.0000, 0.000, 0.000
+ -5.0000, -4.0000, +10.000, 0.000
+ -5.0000, -5.0000, 0.000, 0.000
+ -5.0000, -6.0000, 0.000, -14.000
+ -5.0000, -4.0000, 0.000, -14.000
+ -5.0000, -5.0000, 0.000, -14.000
+ -5.0000, +6.0000, 0.000, -14.000
+ -5.0000, 0.0000, 0.000, -14.000
+ -5.0000, +5.0000, 0.000, -14.000
+ -5.0000, -7.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+
+phodo_neg_invadc_offset = 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, +10.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, +10.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, -14.000
+ 0.000, +10.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, -14.000
+ 0.000, +10.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, -14.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+
+phodo_pos_invadc_linear = 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+
+phodo_neg_invadc_linear = 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+
+phodo_pos_invadc_adc = 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+
+phodo_neg_invadc_adc = 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+ 0.000, 0.0000, 0.000, 0.000
+
+phodo_vel_light = 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+ 15.0, 15.0, 15.0, 15.0
+
+phodo_pos_sigma = .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+
+phodo_neg_sigma = .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+ .3, .3, .3, .3,
+
+phodo_pos_ped_limit = 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+
+phodo_neg_ped_limit = 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000
+
+
+phodo_pos_invadc_offset = -0.00, -0.00, 0.59, -0.00
+ -6.26, -4.09, 0.45, -0.00
+ -2.48, -1.94, 12.41, -0.00
+ 1.98, -2.95, 0.44, -0.00
+ -1.71, -4.57, 9.75, -0.00
+ -2.48, -5.36, 0.15, -0.00
+ 0.39, -3.34, 0.75, -0.00
+ -7.06, -3.12, 0.21, -0.00
+ -1.75, -3.79, 1.52, -0.00
+ -0.00, 5.02, 1.58, -0.00
+ -3.67, -3.57, 0.80, -0.00
+ 0.76, 11.15, 2.28, -0.00
+ -0.00, -0.00, 3.28, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+
+phodo_neg_invadc_offset = -0.00, -0.00, -5.36, -0.00
+ -7.60, -2.32, -5.24, -0.00
+ 0.62, -3.65, 15.02, -0.00
+ -4.07, -3.42, -6.21, -0.00
+ -2.60, -3.61, 10.43, -0.00
+ -5.70, -2.98, -7.00, -0.00
+ 1.23, -2.53, -5.65, -0.00
+ -2.39, -4.13, -5.78, -0.00
+ -1.38, -3.39, -7.54, -0.00
+ -2.56, 7.05, -5.93, -0.00
+ 1.84, -4.38, -3.91, -0.00
+ -3.23, 9.84, -3.06, -0.00
+ -0.00, -0.00, -5.95, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+
+phodo_pos_invadc_linear = 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 14.97, 15.00
+ 14.28, 13.33, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 14.76, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+
+phodo_neg_invadc_linear = 15.00, 15.00, 15.00, 15.00
+ 13.91, 14.43, 15.00, 15.00
+ 14.52, 14.76, 15.00, 15.00
+ 14.68, 14.14, 15.00, 15.00
+ 14.94, 14.70, 15.00, 15.00
+ 14.34, 14.14, 15.00, 15.00
+ 14.82, 13.94, 15.00, 15.00
+ 15.00, 14.33, 15.00, 15.00
+ 14.77, 13.76, 15.00, 15.00
+ 15.00, 14.75, 14.42, 15.00
+ 15.00, 13.69, 13.56, 15.00
+ 13.75, 13.13, 13.73, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+ 15.00, 15.00, 15.00, 15.00
+
+phodo_pos_invadc_adc = -0.00, -0.00, 112.14, -0.00
+ 85.63, 100.91, 83.19, -0.00
+ 96.42, 36.41, 116.39, -0.00
+ 121.38, 90.00, 118.14, -0.00
+ 114.06, 92.90, 100.01, -0.00
+ 110.24, 92.14, 103.32, -0.00
+ 125.76, 84.99, 122.10, -0.00
+ 92.38, 91.90, 130.47, -0.00
+ 116.53, 85.91, 98.54, -0.00
+ 122.36, 111.70, 113.37, -0.00
+ 104.33, 74.85, 80.05, -0.00
+ 122.25, 100.68, 145.77, -0.00
+ -0.00, -0.00, 134.86, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+
+phodo_neg_invadc_adc = -0.00, -0.00, 115.40, -0.00
+ 100.70, 83.97, 103.44, -0.00
+ 112.43, 84.04, 158.78, -0.00
+ 119.43, 89.05, 118.05, -0.00
+ 101.78, 89.03, 123.62, -0.00
+ 97.26, 87.19, 108.87, -0.00
+ 121.57, 78.91, 104.65, -0.00
+ 110.95, 85.20, 170.10, -0.00
+ 109.62, 78.24, 104.81, -0.00
+ 113.38, 111.82, 60.35, -0.00
+ 126.61, 78.83, 62.49, -0.00
+ 91.82, 87.61, 62.81, -0.00
+ -0.00, -0.00, 155.93, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+ -0.00, -0.00, -0.00, -0.00
+
+phodo_pos_sigma = 100.00, 100.00, 0.67, 100.00
+ 0.60, 0.57, 0.84, 100.00
+ 0.49, 0.64, 0.64, 100.00
+ 0.61, 0.50, 0.65, 100.00
+ 0.59, 0.63, 0.82, 100.00
+ 0.72, 0.56, 0.62, 100.00
+ 0.51, 0.52, 0.68, 100.00
+ 0.65, 0.56, 0.92, 100.00
+ 0.69, 0.49, 0.67, 100.00
+ 0.66, 0.60, 1.69, 100.00
+ 0.56, 0.54, 1.72, 100.00
+ 0.57, 0.51, 1.49, 100.00
+ 100.00, 100.00, 2.01, 100.00
+ 100.00, 100.00, 100.00, 100.00
+ 100.00, 100.00, 100.00, 100.00
+ 100.00, 100.00, 100.00, 100.00
+
+phodo_neg_sigma = 100.00, 100.00, 0.58, 100.00
+ 0.66, 0.61, 0.74, 100.00
+ 0.53, 0.61, 0.60, 100.00
+ 0.57, 0.46, 0.91, 100.00
+ 0.55, 0.62, 0.85, 100.00
+ 0.65, 0.51, 0.67, 100.00
+ 0.49, 0.53, 0.62, 100.00
+ 0.64, 0.54, 0.85, 100.00
+ 0.65, 0.54, 0.67, 100.00
+ 0.71, 0.62, 1.27, 100.00
+ 0.75, 0.53, 1.67, 100.00
+ 0.51, 0.57, 1.33, 100.00
+ 100.00, 100.00, 2.07, 100.00
+ 100.00, 100.00, 100.00, 100.00
+ 100.00, 100.00, 100.00, 100.00
+ 100.00, 100.00, 100.00, 100.00
diff --git a/PARAM/SHMS/HODO/CUTS/phodo_cuts.param b/PARAM/SHMS/HODO/CUTS/phodo_cuts.param
new file mode 100644
index 0000000000000000000000000000000000000000..fad7ba2396fc6d2759e8055e04ad12a2b9237402
--- /dev/null
+++ b/PARAM/SHMS/HODO/CUTS/phodo_cuts.param
@@ -0,0 +1,45 @@
+; Cosmic flag for beta calculation
+
+pcosmicflag=0
+
+; for now manually set hte FADC mode
+; 1 == Use the pulse int - pulse ped
+; 2 == Use the sample integral - known ped
+; 3 == Use the sample integral - sample ped
+; if not set then defaults to use the raw pulse integral
+phodo_adc_mode=1
+
+; phodo_tdc_offset is array of time offsets for all paddles in a plane
+; to move the tdc to between 0 and 4000 channels.
+phodo_tdc_offset = 1860, 2000, 2060, 2000
+
+; phodo set min and max fADC time window for all paddles in a plane in 'Channel' units
+; the conversion is 0.0625 ns / channel for flash ADC 250
+phodo_AdcTimeWindowMin = 0., 0., 0., 640.
+phodo_AdcTimeWindowMax = 3200., 3200., 3200., 1760.
+
+; pstart_time_center center of allowed time window
+pstart_time_center = 32.
+
+; hstart_time_slop 1/2 width of time window
+pstart_time_slop = 100.
+
+; pscin_tdc_min minimum tdc value in hms scin
+pscin_tdc_min = -500
+
+; pscin_tdc_max maximum allowed tdc value
+pscin_tdc_max = 1000
+
+; pscin_tdc_to_time scin tdc time per channel
+pscin_tdc_to_time = 0.1
+
+; tof and you figured out good values
+ptof_tolerance = 100.0
+
+; shms_tof_params
+; pnum_scin_counters, phodo_zpos, phodo_center_coord, phodo_width
+; are all calculated within p_init_scin
+; phodo_pos_coord and phodo_neg_coord are not yet used
+phodo_slop = 2., 2., 4., 4.
+
+ptofusinginvadc=1
diff --git a/PARAM/SHMS/HODO/GEOM/phodo_geom.param b/PARAM/SHMS/HODO/GEOM/phodo_geom.param
new file mode 100644
index 0000000000000000000000000000000000000000..86e72951dabf1143624b8da758e18f97efea12a4
--- /dev/null
+++ b/PARAM/SHMS/HODO/GEOM/phodo_geom.param
@@ -0,0 +1,108 @@
+phodo_num_planes = 4
+
+phodo_plane_names = "1x 1y 2x 2y"
+
+ppathlength_central = 1800
+
+; Z positions of hodoscopes
+pscin_1x_zpos = 56.3-9.5
+pscin_1y_zpos = 56.3+9.5
+pscin_2x_zpos = 276.35-9.5
+pscin_2y_zpos = 276.35+9.5
+pscin_1x_dzpos = 1.0
+pscin_1y_dzpos = 1.0
+pscin_2x_dzpos = 1.0
+pscin_2y_dzpos = 1.0
+pscin_1x_size = 8.0
+pscin_1y_size = 8.0
+pscin_2x_size = 8.0
+pscin_2y_size = 8.0
+pscin_1x_spacing = 7.5
+pscin_1y_spacing = 7.5
+pscin_2x_spacing = 7.5
+pscin_2y_spacing = 7.5
+
+; Number of hodoscope paddles per layer
+pscin_1x_nr = 13
+pscin_1y_nr = 13
+pscin_2x_nr = 14
+pscin_2y_nr = 21
+
+; X,Y positions of hodoscope paddles
+pscin_1x_left = 50.
+pscin_1x_right = -50
+pscin_1x_offset = 0.0
+pscin_1x_center = -42.
+ -35.
+ -28.
+ -21.
+ -14.
+ -7.
+ 0.0
+ 7.
+ 14.
+ 21.
+ 28.
+ 35.
+ 42.
+
+pscin_1y_top = -50
+pscin_1y_bot = 50
+pscin_1y_offset = 0.0
+pscin_1y_center = +42.
+ +35.
+ +28.
+ +21.
+ +14.
+ +7.
+ 0.0
+ -7.
+ -14.
+ -21.
+ -28.
+ -35.
+ -42.
+
+pscin_2x_left = 55.
+pscin_2x_right = -55.
+pscin_2x_offset = 0.0
+pscin_2x_center = -58.5
+ -49.5
+ -40.5
+ -31.5
+ -22.5
+ -13.5
+ -4.5
+ 4.5
+ 13.5
+ 22.5
+ 31.5
+ 40.5
+ 49.5
+ 58.5
+
+pscin_2y_top = -55
+pscin_2y_bot = 55
+pscin_2y_offset = 0.0
+pscin_2y_center = 50.
+ 45.
+ 40.
+ 35.
+ 30.
+ 25.
+ 20.
+ 15.
+ 10.
+ 5.
+ 0.
+ -5.
+ -10.
+ -15.
+ -20.
+ -25.
+ -30.
+ -35.
+ -40.
+ -45.
+ -50.
+
diff --git a/PARAM/SHMS/HODO/phodo.param b/PARAM/SHMS/HODO/phodo.param
deleted file mode 100644
index bcca416c11309ab3738bdb928c22ce81e2769e29..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/HODO/phodo.param
+++ /dev/null
@@ -1,417 +0,0 @@
-pcosmicflag=0
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-phodo_adc_mode=1
-;
-; phodo_tdc_offset is array of time offsets for all paddles in a plane
-; to move the tdc to between 0 and 4000 channels.
- phodo_tdc_offset = 1860, 2000, 2060, 2000
-
-;phodo set min and max fADC time window for all paddles in a plane in 'Channel' units
-; the conversion is 0.0625 ns / channel for flash ADC 250
-phodo_AdcTimeWindowMin = 0., 0., 0., 640.
-phodo_AdcTimeWindowMax = 3200., 3200., 3200., 1760.
-
-; pstart_time_center center of allowed time window
- pstart_time_center = 32.
-; hstart_time_slop 1/2 width of time window
- pstart_time_slop = 100.
-; pscin_tdc_min minimum tdc value in hms scin
- pscin_tdc_min = -500
-; pscin_tdc_max maximum allowed tdc value
- pscin_tdc_max = 1000
-; pscin_tdc_to_time scin tdc time per channel
- pscin_tdc_to_time = 0.1
-; tof and you figured out good values
- ptof_tolerance = 100.0
-;
-; shms_tof_params
-; pnum_scin_counters, phodo_zpos, phodo_center_coord, phodo_width
-; are all calculated within p_init_scin
-; phodo_pos_coord and phodo_neg_coord are not yet used
-;
- phodo_slop = 2., 2., 4., 4.
-;
-ptofusinginvadc=1
-;
-
-phodo_pos_invadc_offset = -5.0000, -5.0000, 0.000, 0.000
- -5.0000, -2.0000, 0.000, 0.000
- -5.0000, -2.0000, +10.000, 0.000
- -5.0000, -4.0000, 0.000, 0.000
- -5.0000, -4.0000, +10.000, 0.000
- -5.0000, -5.0000, 0.000, 0.000
- -5.0000, -6.0000, 0.000, -14.000
- -5.0000, -4.0000, 0.000, -14.000
- -5.0000, -5.0000, 0.000, -14.000
- -5.0000, +6.0000, 0.000, -14.000
- -5.0000, 0.0000, 0.000, -14.000
- -5.0000, +5.0000, 0.000, -14.000
- -5.0000, -7.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-phodo_neg_invadc_offset = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, +10.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, +10.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, -14.000
- 0.000, +10.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, -14.000
- 0.000, +10.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, -14.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-phodo_pos_invadc_linear = 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
-phodo_neg_invadc_linear = 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
-
-phodo_pos_invadc_adc = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-phodo_neg_invadc_adc = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
- phodo_vel_light = 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
-
- phodo_pos_sigma = .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
-;
- phodo_neg_sigma = .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
- .3,.3,.3,.3,
-;
-phodo_pos_ped_limit = 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- ;
-phodo_neg_ped_limit = 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
- 1000,1000,1000,1000
-
-
-phodo_pos_invadc_offset = -0.00, -0.00, 0.59, -0.00
- -6.26, -4.09, 0.45, -0.00
- -2.48, -1.94, 12.41, -0.00
- 1.98, -2.95, 0.44, -0.00
- -1.71, -4.57, 9.75, -0.00
- -2.48, -5.36, 0.15, -0.00
- 0.39, -3.34, 0.75, -0.00
- -7.06, -3.12, 0.21, -0.00
- -1.75, -3.79, 1.52, -0.00
- -0.00, 5.02, 1.58, -0.00
- -3.67, -3.57, 0.80, -0.00
- 0.76, 11.15, 2.28, -0.00
- -0.00, -0.00, 3.28, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-phodo_neg_invadc_offset = -0.00, -0.00, -5.36, -0.00
- -7.60, -2.32, -5.24, -0.00
- 0.62, -3.65, 15.02, -0.00
- -4.07, -3.42, -6.21, -0.00
- -2.60, -3.61, 10.43, -0.00
- -5.70, -2.98, -7.00, -0.00
- 1.23, -2.53, -5.65, -0.00
- -2.39, -4.13, -5.78, -0.00
- -1.38, -3.39, -7.54, -0.00
- -2.56, 7.05, -5.93, -0.00
- 1.84, -4.38, -3.91, -0.00
- -3.23, 9.84, -3.06, -0.00
- -0.00, -0.00, -5.95, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-phodo_pos_invadc_linear = 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 14.97, 15.00
- 14.28, 13.33, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 14.76, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
-
-phodo_neg_invadc_linear = 15.00, 15.00, 15.00, 15.00
- 13.91, 14.43, 15.00, 15.00
- 14.52, 14.76, 15.00, 15.00
- 14.68, 14.14, 15.00, 15.00
- 14.94, 14.70, 15.00, 15.00
- 14.34, 14.14, 15.00, 15.00
- 14.82, 13.94, 15.00, 15.00
- 15.00, 14.33, 15.00, 15.00
- 14.77, 13.76, 15.00, 15.00
- 15.00, 14.75, 14.42, 15.00
- 15.00, 13.69, 13.56, 15.00
- 13.75, 13.13, 13.73, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
-
-phodo_pos_invadc_adc= -0.00, -0.00, 112.14, -0.00
- 85.63, 100.91, 83.19, -0.00
- 96.42, 36.41, 116.39, -0.00
- 121.38, 90.00, 118.14, -0.00
- 114.06, 92.90, 100.01, -0.00
- 110.24, 92.14, 103.32, -0.00
- 125.76, 84.99, 122.10, -0.00
- 92.38, 91.90, 130.47, -0.00
- 116.53, 85.91, 98.54, -0.00
- 122.36, 111.70, 113.37, -0.00
- 104.33, 74.85, 80.05, -0.00
- 122.25, 100.68, 145.77, -0.00
- -0.00, -0.00, 134.86, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-phodo_neg_invadc_adc= -0.00, -0.00, 115.40, -0.00
- 100.70, 83.97, 103.44, -0.00
- 112.43, 84.04, 158.78, -0.00
- 119.43, 89.05, 118.05, -0.00
- 101.78, 89.03, 123.62, -0.00
- 97.26, 87.19, 108.87, -0.00
- 121.57, 78.91, 104.65, -0.00
- 110.95, 85.20, 170.10, -0.00
- 109.62, 78.24, 104.81, -0.00
- 113.38, 111.82, 60.35, -0.00
- 126.61, 78.83, 62.49, -0.00
- 91.82, 87.61, 62.81, -0.00
- -0.00, -0.00, 155.93, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-phodo_pos_sigma = 100.00, 100.00, 0.67, 100.00
- 0.60, 0.57, 0.84, 100.00
- 0.49, 0.64, 0.64, 100.00
- 0.61, 0.50, 0.65, 100.00
- 0.59, 0.63, 0.82, 100.00
- 0.72, 0.56, 0.62, 100.00
- 0.51, 0.52, 0.68, 100.00
- 0.65, 0.56, 0.92, 100.00
- 0.69, 0.49, 0.67, 100.00
- 0.66, 0.60, 1.69, 100.00
- 0.56, 0.54, 1.72, 100.00
- 0.57, 0.51, 1.49, 100.00
- 100.00, 100.00, 2.01, 100.00
- 100.00, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
-
-phodo_neg_sigma = 100.00, 100.00, 0.58, 100.00
- 0.66, 0.61, 0.74, 100.00
- 0.53, 0.61, 0.60, 100.00
- 0.57, 0.46, 0.91, 100.00
- 0.55, 0.62, 0.85, 100.00
- 0.65, 0.51, 0.67, 100.00
- 0.49, 0.53, 0.62, 100.00
- 0.64, 0.54, 0.85, 100.00
- 0.65, 0.54, 0.67, 100.00
- 0.71, 0.62, 1.27, 100.00
- 0.75, 0.53, 1.67, 100.00
- 0.51, 0.57, 1.33, 100.00
- 100.00, 100.00, 2.07, 100.00
- 100.00, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
diff --git a/PARAM/SHMS/HODO/phodo.pos b/PARAM/SHMS/HODO/phodo.pos
deleted file mode 100644
index fc5d3077c133353fc5c92dcddce349b138b80b52..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/HODO/phodo.pos
+++ /dev/null
@@ -1,101 +0,0 @@
-phodo_num_planes = 4
-phodo_plane_names = "1x 1y 2x 2y"
- ppathlength_central = 1800
-; Z positions of hodoscopes
- pscin_1x_zpos = 56.3-9.5
- pscin_1y_zpos = 56.3+9.5
- pscin_2x_zpos = 276.35-9.5
- pscin_2y_zpos = 276.35+9.5
- pscin_1x_dzpos = 1.0
- pscin_1y_dzpos = 1.0
- pscin_2x_dzpos = 1.0
- pscin_2y_dzpos = 1.0
- pscin_1x_size = 8.0
- pscin_1y_size = 8.0
- pscin_2x_size = 8.0
- pscin_2y_size = 8.0
- pscin_1x_spacing = 7.5
- pscin_1y_spacing = 7.5
- pscin_2x_spacing = 7.5
- pscin_2y_spacing = 7.5
-; Number of hodoscope paddles per layer
- pscin_1x_nr = 13
- pscin_1y_nr = 13
- pscin_2x_nr = 14
- pscin_2y_nr = 21
-; X,Y positions of hodoscope paddles
- pscin_1x_left = 50.
- pscin_1x_right = -50
- pscin_1x_offset= 0.0
- pscin_1x_center= -42.
- -35.
- -28.
- -21.
- -14.
- -7.
- 0.0
- 7.
- 14.
- 21.
- 28.
- 35.
- 42.
-;
- pscin_1y_top = -50
- pscin_1y_bot = 50
- pscin_1y_offset= 0.0
- pscin_1y_center= +42.
- +35.
- +28.
- +21.
- +14.
- +7.
- 0.0
- -7.
- -14.
- -21.
- -28.
- -35.
- -42.
- pscin_2x_left = 55.
- pscin_2x_right = -55.
- pscin_2x_offset= 0.0
- pscin_2x_center= -58.5
- -49.5
- -40.5
- -31.5
- -22.5
- -13.5
- -4.5
- 4.5
- 13.5
- 22.5
- 31.5
- 40.5
- 49.5
- 58.5
- pscin_2y_top = -55
- pscin_2y_bot = 55
- pscin_2y_offset= 0.0
- pscin_2y_center= 50.
- 45.
- 40.
- 35.
- 30.
- 25.
- 20.
- 15.
- 10.
- 5.
- 0.
- -5.
- -10.
- -15.
- -20.
- -25.
- -30.
- -35.
- -40.
- -45.
- -50.
-
diff --git a/PARAM/SHMS/HODO/ptofcal.param b/PARAM/SHMS/HODO/ptofcal.param
deleted file mode 100644
index 3f0ae425484645481556fb9c581494d65500e53b..0000000000000000000000000000000000000000
--- a/PARAM/SHMS/HODO/ptofcal.param
+++ /dev/null
@@ -1,2 +0,0 @@
-pdumptof=1
-pdumptof_filename="CALIBRATION/hodo_calib/pfort.37"
diff --git a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param
new file mode 100644
index 0000000000000000000000000000000000000000..a36301b1e1eff0e6d28057b0354d4af438648d6d
--- /dev/null
+++ b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param
@@ -0,0 +1,2 @@
+; Noble gas cherenkov gain factors run 483, July 11 2017
+pngcer_adc_to_npe = 1.0/462.791, 1.0/475.186, 1.0/524.213, 1.0/520.873
\ No newline at end of file
diff --git a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param
new file mode 100644
index 0000000000000000000000000000000000000000..1782399865f45706be611e16c8ad6c6c85d742d0
--- /dev/null
+++ b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param
@@ -0,0 +1,2 @@
+; Noble gas cherenkov gain factors run 487, July 11 2017
+pngcer_adc_to_npe = 1.0/464.187, 1.0/484.511, 1.0/499.748, 1.0/462.744
\ No newline at end of file
diff --git a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param
new file mode 100644
index 0000000000000000000000000000000000000000..23a987fe9f14526d28e07324815621562d22586c
--- /dev/null
+++ b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param
@@ -0,0 +1,2 @@
+; Noble gas cherenkov gain factors run 488, July 11 2017
+pngcer_adc_to_npe = 1.0/438.119, 1.0/477.902, 1.0/475.153, 1.0/488.668
\ No newline at end of file
diff --git a/PARAM/SHMS/NGCER/CALIB/pngcer_calib.param b/PARAM/SHMS/NGCER/CALIB/pngcer_calib.param
new file mode 100644
index 0000000000000000000000000000000000000000..23a987fe9f14526d28e07324815621562d22586c
--- /dev/null
+++ b/PARAM/SHMS/NGCER/CALIB/pngcer_calib.param
@@ -0,0 +1,2 @@
+; Noble gas cherenkov gain factors run 488, July 11 2017
+pngcer_adc_to_npe = 1.0/438.119, 1.0/477.902, 1.0/475.153, 1.0/488.668
\ No newline at end of file
diff --git a/PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param b/PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param
new file mode 100644
index 0000000000000000000000000000000000000000..b54ab36098e57a02b4a0cfead76f3d41b1c6331d
--- /dev/null
+++ b/PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param
@@ -0,0 +1,18 @@
+; Track matching reduced chi2 cut values
+pngcer_red_chi2_min = 0.0
+pngcer_red_chi2_max = 25.0
+
+; Track matching beta cut values
+pngcer_beta_min = 0.0
+pngcer_beta_max = 1.2
+
+; Track matching normailized energy (E/p) cut values
+pngcer_enorm_min = 0.0
+pngcer_enorm_max = 1.5
+
+; ADC time window cut values used to select "good" ADC events
+pngcer_adcTimeWindowMin = 500.
+pngcer_adcTimeWindowMax = 2500.
+
+; ; NPE Threshold for "good" hit (for measureing effic.)
+pngcer_npe_thresh = 0.5
\ No newline at end of file
diff --git a/PARAM/SHMS/NGCER/pngcer.param b/PARAM/SHMS/NGCER/GEOM/pngcer_geom.param
similarity index 57%
rename from PARAM/SHMS/NGCER/pngcer.param
rename to PARAM/SHMS/NGCER/GEOM/pngcer_geom.param
index 0c267bd8cfbfe255ea922a06610d456435ffe1a5..7aef47c020f35b7f6916cf3f262ccfe7377ed910 100644
--- a/PARAM/SHMS/NGCER/pngcer.param
+++ b/PARAM/SHMS/NGCER/GEOM/pngcer_geom.param
@@ -1,28 +1,6 @@
; Number of noble gas Cherenkov PMT's
pngcer_tot_pmts = 4
-; Noble gas cherenkov gain factors run 488, July 11 2017
-pngcer_adc_to_npe = 1.0/438.119, 1.0/477.902, 1.0/475.153, 1.0/488.668
-
-; Track matching reduced chi2 cut values
-pngcer_red_chi2_min = 0.0
-pngcer_red_chi2_max = 25.0
-
-; Track matching beta cut values
-pngcer_beta_min = 0.0
-pngcer_beta_max = 1.2
-
-; Track matching normailized energy (E/p) cut values
-pngcer_enorm_min = 0.0
-pngcer_enorm_max = 1.5
-
-; ADC time window cut values used to select "good" ADC events
-pngcer_adcTimeWindowMin = 500.
-pngcer_adcTimeWindowMax = 2500.
-
-; ; NPE Threshold for "good" hit (for measureing effic.)
-pngcer_npe_thresh = 0.5
-
; Guess from Dwg. 67165-E-00001 R0
pngcer_mirror_zpos = -89.1
diff --git a/SCRIPTS/SHMS/ALL/replay_all_shms.C b/SCRIPTS/SHMS/ALL/replay_all_shms.C
index 29e318d4b1d48f4ee211ad50f207ca68406f678a..a2d28fa4f2b42ea9dd96af54becde622986aa8ad 100644
--- a/SCRIPTS/SHMS/ALL/replay_all_shms.C
+++ b/SCRIPTS/SHMS/ALL/replay_all_shms.C
@@ -28,6 +28,7 @@ void replay_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for SHMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
diff --git a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
index a39ccb3d23251c85211ddccca5eae9a21181d094..67c5feb8e6ffd0d3a1150c1aaf658f26d8ce3de8 100644
--- a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
+++ b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
@@ -28,6 +28,7 @@ void replay_shms_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
diff --git a/SCRIPTS/SHMS/STACK/replay_shms.C b/SCRIPTS/SHMS/STACK/replay_shms.C
index 6aec81006b55b6232ad84c2344c28b65bed37512..345b7433f605c0677aae16bd64f06cd14a583867 100644
--- a/SCRIPTS/SHMS/STACK/replay_shms.C
+++ b/SCRIPTS/SHMS/STACK/replay_shms.C
@@ -28,6 +28,7 @@ void replay_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for SHMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
index 6ffaf77184d73d8d5f2eea54256641a7f08df46d..fc1e21d97cee1a0061befe9ee63d54e362e6c376 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
@@ -28,7 +28,7 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for HMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
index c57a55cf4419f79b8f6e0bd50bcd64a0f65289e7..439305355a754ad4db09e121fa2ee27e0dbe6e32 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
@@ -28,7 +28,7 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/CAL/pcal.map");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
index 8a236f0f57d7888179f61e3c62e81882044f5fb9..271ca28cd4fb8699692260c9785ab12a511840f5 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
@@ -28,7 +28,7 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for HMS DC test stand configuration
gHcParms->Load("PARAM/SHMS/DC/pdc_test_stand.param");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
index fd59667cf7e36fa0663bcd9163ec999ab891d61f..6e5f31ef811b3d61f8b356a60f828e98ef4b4ba9 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
@@ -28,7 +28,7 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for HMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
index 824bbcdd07dafba5caba44b877ae346c43c87674..eafbafda18f4350ad226df12a663487e2da0d7af 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
@@ -28,7 +28,7 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for HMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
index 0162528d429217a6fb0fe8c5e9d42244b22c57d2..986ba4aa275272cbcde454876ca6a4e2eb4fb44c 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
@@ -28,7 +28,7 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for SHMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
index ca91d7f0dc5b79bbcce9bf3b888a7594eb3e02af..62854cfcc0b352b516f8417f055fc42527d19bf2 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
@@ -28,7 +28,7 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
// Load params for HMS DC test stand configuration
gHcParms->Load("PARAM/TRIG/tshms.param");