diff --git a/DBASE/SHMS/general.param b/DBASE/SHMS/general.param
index 1f0d44715c24b4af6220d5cdf62f89ed193d7a1f..76233b417ad1c677df01b40ca5d64b54e78f81e1 100644
--- a/DBASE/SHMS/general.param
+++ b/DBASE/SHMS/general.param
@@ -43,4 +43,4 @@ cminch=2.54
 #include "PARAM/SHMS/HODO/phodo_Vpcalib.param"
 #include "PARAM/SHMS/HGCER/phgcer_calib.param"
 #include "PARAM/SHMS/AERO/paero_calib.param"
-#include "PARAM/SHMS/CAL/pcal_calib_9589.param"
+#include "PARAM/SHMS/CAL/pcal_calib.param"
diff --git a/DBASE/SHMS/general_elclean.param b/DBASE/SHMS/general_elclean.param
index 803656c516c1d961b9da09be511d7a6c0ea50e70..bdfafcd0e9d560ae66e3e65d2c7da79127f5ae80 100644
--- a/DBASE/SHMS/general_elclean.param
+++ b/DBASE/SHMS/general_elclean.param
@@ -43,4 +43,4 @@ cminch=2.54
 #include "PARAM/SHMS/HODO/phodo_Vpcalib.param"
 #include "PARAM/SHMS/HGCER/phgcer_calib.param"
 #include "PARAM/SHMS/AERO/paero_calib.param"
-#include "PARAM/SHMS/CAL/pcal_calib_9589.param"
+#include "PARAM/SHMS/CAL/pcal_calib.param"
diff --git a/PARAM/SHMS/CAL/pcal_calib.param b/PARAM/SHMS/CAL/pcal_calib.param
index fcca6ad0586982003509743fbd87d8590a0ad640..ac73402d9ca3bfc41ce5ef3e17fbc0f5d1d318ce 100644
--- a/PARAM/SHMS/CAL/pcal_calib.param
+++ b/PARAM/SHMS/CAL/pcal_calib.param
@@ -19,19 +19,38 @@
 
 ; Calibration constants for file shms_replay_production_all_7110_500000, 55611 events processed
 
-pcal_neg_gain_cor =  0.00, 34.29, 26.22, 15.20, 19.68, 15.32, 26.14, 30.69, 17.56, 26.02, 20.68, 19.25, 20.75,  0.00,
-pcal_pos_gain_cor =  0.00,102.71, 21.34, 21.76, 21.24, 21.51, 16.79, 15.73, 23.75, 18.73, 27.05, 27.71, 23.34,  0.00,
-pcal_arr_gain_cor =  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,  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,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
-                     0.00,  0.00,  0.00, 27.09, 50.31, 56.29, 30.82,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
-                     0.00,  0.00, 26.49, 42.81, 30.21, 25.18, 73.22, 51.66,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
-                     0.00,  0.00, 26.46, 23.52, 51.05, 44.91, 37.83, 29.30, 28.77, 52.94,  0.00,  0.00, 45.28,  0.00,  0.00,  0.00,
-                     0.00,  0.00, 26.43, 60.10, 15.91, 37.32, 35.39, 42.33, 62.12, 28.93, 43.55, 49.82, 67.91, 13.58,  0.00,  0.00,
-                     0.00,  0.00, 42.74, 38.15, 20.99, 42.95, 49.97, 38.09, 31.33, 31.21, 26.74, 22.07, 32.13, 29.50,  0.00,  0.00,
-                     0.00,  8.38, 13.40, 11.38, 14.51, 10.15, 15.53, 18.06, 11.99, 15.92, 22.94, 18.91, 27.45, 15.64,  5.96,  0.00,
-                     0.00,  0.00, 26.81, 28.63, 44.78, 37.93, 22.13, 41.35, 53.17, 66.24, 21.71, 55.88, 26.29, 23.72,  0.00,  0.00,
-                     0.00, 25.56, 17.96, 37.92, 22.03, 51.11, 40.21, 53.45, 28.64, 50.23, 51.12, 36.61, 51.63, 31.33,-17.58,  0.00,
-                     0.00,  0.00, 59.83, 34.78, 28.68, 38.46, 19.57, 31.14,  0.00,  0.00,  0.00,  0.00, 35.10, 22.48,  0.00,  0.00,
-                     0.00,  0.00,  0.00, 26.35, 33.08, 33.50,-12.38,  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,  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,  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,  0.00,  0.00,
+;pcal_neg_gain_cor =  0.00, 34.29, 26.22, 15.20, 19.68, 15.32, 26.14, 30.69, 17.56, 26.02, 20.68, 19.25, 20.75,  0.00,
+;pcal_pos_gain_cor =  0.00,102.71, 21.34, 21.76, 21.24, 21.51, 16.79, 15.73, 23.75, 18.73, 27.05, 27.71, 23.34,  0.00,
+;pcal_arr_gain_cor =  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,  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,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
+;                     0.00,  0.00,  0.00, 27.09, 50.31, 56.29, 30.82,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
+;                     0.00,  0.00, 26.49, 42.81, 30.21, 25.18, 73.22, 51.66,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
+;                     0.00,  0.00, 26.46, 23.52, 51.05, 44.91, 37.83, 29.30, 28.77, 52.94,  0.00,  0.00, 45.28,  0.00,  0.00,  0.00,
+;                     0.00,  0.00, 26.43, 60.10, 15.91, 37.32, 35.39, 42.33, 62.12, 28.93, 43.55, 49.82, 67.91, 13.58,  0.00,  0.00,
+;                     0.00,  0.00, 42.74, 38.15, 20.99, 42.95, 49.97, 38.09, 31.33, 31.21, 26.74, 22.07, 32.13, 29.50,  0.00,  0.00,
+;                     0.00,  8.38, 13.40, 11.38, 14.51, 10.15, 15.53, 18.06, 11.99, 15.92, 22.94, 18.91, 27.45, 15.64,  5.96,  0.00,
+;                     0.00,  0.00, 26.81, 28.63, 44.78, 37.93, 22.13, 41.35, 53.17, 66.24, 21.71, 55.88, 26.29, 23.72,  0.00,  0.00,
+;                     0.00, 25.56, 17.96, 37.92, 22.03, 51.11, 40.21, 53.45, 28.64, 50.23, 51.12, 36.61, 51.63, 31.33,-17.58,  0.00,
+;                     0.00,  0.00, 59.83, 34.78, 28.68, 38.46, 19.57, 31.14,  0.00,  0.00,  0.00,  0.00, 35.10, 22.48,  0.00,  0.00,
+;                     0.00,  0.00,  0.00, 26.35, 33.08, 33.50,-12.38,  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,  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,  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,  0.00,  0.00,
+
+; Calibration constants for file shms_defocused, 306065 events processed
+
+pcal_neg_gain_cor = 23.98, 26.50, 27.96, 17.52, 22.82, 16.46, 22.16, 29.95, 30.88, 43.38, 21.45, 22.89, 21.67, 55.90,
+pcal_pos_gain_cor = 11.72, 53.90, 23.71, 24.34, 28.44, 30.40, 23.79, 26.81, 28.26, 18.71, 26.45, 29.51, 22.84,  0.00,
+pcal_arr_gain_cor =  0.00,  0.00,  0.00,  8.94, 26.83, 22.93, 56.80, 38.60, 28.83, 62.52, 44.36,  0.00,  0.00,  0.00,  0.00,  0.00,
+                     0.00, 27.21, 29.68, 35.31, 27.88, 36.87, 33.00, 30.82, 35.13, 30.02, 34.52, 26.17,  0.00,  0.00,  0.00,  0.00,
+                     0.00, 45.97, 27.32, 37.10, 29.30, 31.68, 28.79, 31.26, 30.81, 26.81, 30.30, 33.84, 27.26,  0.00,  0.00,  0.00,
+                     0.00, 37.45, 27.89, 37.59, 25.33, 27.25, 34.88, 29.72, 32.25, 29.53, 31.04, 26.59, 25.45, 37.25, 18.66,  0.00,
+                     0.00, 39.42, 32.60, 29.71, 30.02, 30.66, 27.36, 31.91, 31.44, 27.97, 29.05, 32.15, 31.40, 39.06, 39.77,  0.00,
+                     0.00, 40.89, 28.40, 30.11, 31.55, 33.34, 26.43, 28.06, 32.35, 28.88, 32.93, 33.22, 36.02, 25.97, 33.14,  0.00,
+                     0.00, 33.96, 28.59, 29.46, 29.55, 34.78, 30.58, 39.43, 41.19, 40.14, 35.08, 34.17, 28.21, 28.97, 28.91,  0.00,
+                     18.83, 29.93, 28.87, 28.48, 27.35, 29.80, 32.57, 35.65, 43.36, 44.82, 49.44, 30.55, 33.73, 32.49, 37.63,  8.54,
+                     24.72, 29.79, 28.03, 28.83, 30.09, 30.23, 30.97, 32.67, 31.17, 34.81, 27.39, 30.92, 32.68, 32.03, 36.40,  0.00,
+                     18.14, 26.43, 28.73, 29.75, 27.81, 28.17, 28.83, 32.40, 30.13, 34.18, 31.61, 33.15, 32.58, 32.02, 29.99,  0.00,
+                     9.24, 25.62, 26.91, 24.97, 26.43, 31.29, 30.08, 27.68, 31.54, 33.71, 31.36, 32.03, 29.98, 33.83, 34.00,  0.00,
+                     0.00, 26.08, 23.04, 26.06, 29.22, 30.54, 28.60, 27.62, 26.95, 27.16, 27.36, 30.72, 28.00, 20.02,  0.00,  0.00,
+                     0.00, 31.38, 26.62, 32.41, 57.55, 28.71, 23.28, 26.16, 27.63, 22.19, 22.46, 36.94,  0.00,  0.00,  0.00,  0.00,
+                     0.00,  0.00,  0.00,  0.00, 42.28,  5.81, 45.36, 25.30, 21.53, 46.54, 16.55,  0.00,  0.00,  0.00,  0.00,  0.00,