From 8b3c37b067046ea27a1a180fb1cfc945842e0420 Mon Sep 17 00:00:00 2001
From: Melanie Rehfuss <tud20704@temple.edu>
Date: Fri, 16 Apr 2021 20:36:42 +0000
Subject: [PATCH] added default pedestals and update hodo_adc_tdc_offsets for
 the HMS & SHMS

---
 .rootlogon.C                                  |   2 +-
 .../HMS/PRODUCTION}/HMS_PedDefault.def        |   0
 .../HMS/PRODUCTION/hstackana_production.def   |   2 +
 .../SHMS/PRODUCTION}/SHMS_PedDefault.def      |   0
 .../SHMS/PRODUCTION/pstackana_production.def  |   3 +
 PARAM/HMS/CAL/hcal_cuts.param                 |  10 +
 PARAM/HMS/CER/hcer_cuts.param                 |   5 +-
 PARAM/HMS/HODO/hhodo_cuts_2488-3624.param     | 146 +++++++-------
 PARAM/HMS/HODO/hhodo_cuts_3633-4334.param     | 146 +++++++-------
 PARAM/SHMS/AERO/paero_cuts.param              |   6 +-
 PARAM/SHMS/CAL/pcal_cuts.param                |  19 ++
 PARAM/SHMS/HGCER/phgcer_cuts.param            |   5 +-
 PARAM/SHMS/HODO/phodo_cuts_10815-11541.param  | 189 +++++++++---------
 PARAM/SHMS/HODO/phodo_cuts_9663-10804.param   | 187 ++++++++---------
 PARAM/SHMS/NGCER/pngcer_cuts.param            |   5 +-
 15 files changed, 389 insertions(+), 336 deletions(-)
 rename {CALIBRATION/set_peddefault => DEF-files/HMS/PRODUCTION}/HMS_PedDefault.def (100%)
 rename {CALIBRATION/set_peddefault => DEF-files/SHMS/PRODUCTION}/SHMS_PedDefault.def (100%)

diff --git a/.rootlogon.C b/.rootlogon.C
index 025be51b..e3b2d60b 100644
--- a/.rootlogon.C
+++ b/.rootlogon.C
@@ -16,7 +16,7 @@ void _rootlogon() {
   const std::string mkdir = "mkdir -p " + build_dir;
   gSystem->Exec(mkdir.c_str());
 
-  // Communicate what build directory we are using
+  // Communicate what build directory we are using 
   std::cout << "---> Setting ACLiC build directory to: " << build_dir << "\n\n";
   // Make the ROOT build process use a flat build directory by setting
   // second arg to kTRUE.  This avoids an apparent race condition in ROOT
diff --git a/CALIBRATION/set_peddefault/HMS_PedDefault.def b/DEF-files/HMS/PRODUCTION/HMS_PedDefault.def
similarity index 100%
rename from CALIBRATION/set_peddefault/HMS_PedDefault.def
rename to DEF-files/HMS/PRODUCTION/HMS_PedDefault.def
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def b/DEF-files/HMS/PRODUCTION/hstackana_production.def
index d515a82f..4099cd6d 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def
@@ -1,3 +1,5 @@
+#include "DEF-files/HMS/PRODUCTION/HMS_PedDefault.def"
+
 variable T.hms.hFADC_TREF_ROC1_adcMultiplicity
 variable T.hms.hFADC_TREF_ROC1_adcPed
 variable T.hms.hFADC_TREF_ROC1_adcPedRaw
diff --git a/CALIBRATION/set_peddefault/SHMS_PedDefault.def b/DEF-files/SHMS/PRODUCTION/SHMS_PedDefault.def
similarity index 100%
rename from CALIBRATION/set_peddefault/SHMS_PedDefault.def
rename to DEF-files/SHMS/PRODUCTION/SHMS_PedDefault.def
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
index 5d1ecf41..7796db16 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
@@ -1,4 +1,7 @@
 ##   --> SHMS 
+
+#include "DEF-files/SHMS/PRODUCTION/SHMS_PedDefault.def"
+
 variable T.shms.pFADC_TREF_ROC2_adcMultiplicity
 variable T.shms.pFADC_TREF_ROC2_adcPed
 variable T.shms.pFADC_TREF_ROC2_adcPedRaw
diff --git a/PARAM/HMS/CAL/hcal_cuts.param b/PARAM/HMS/CAL/hcal_cuts.param
index 7f9b43db..e0a46f6b 100644
--- a/PARAM/HMS/CAL/hcal_cuts.param
+++ b/PARAM/HMS/CAL/hcal_cuts.param
@@ -64,4 +64,14 @@ hcal_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
 
+; Pedestal Defaults (April 2021)
+hcal_PedPosDefault = 1955, 2101, 2130, 2014, 1994, 2263, 2061, 2202, 2117, 2216, 2164, 1961, 2105
+		     1970, 2234, 1962, 2201, 2180, 2092, 2160, 1994, 2018, 2070, 2071, 2112, 2047
+		     2095, 2103, 2002, 1975, 2134, 2239, 2048, 1954, 2089, 2139, 2047, 2113, 2179
+		     2000, 1982, 1906, 1964, 2153, 2043, 1975, 2091, 2103, 2016, 1916, 2138, 2111
+
+hcal_PedNegDefault = 2085, 2095, 1997, 2020, 2109, 2112, 2071, 2250, 2126, 2095, 2079, 2094, 2171
+		     2048, 2150, 2048, 2034, 2178, 2092, 2186, 2004, 2025, 2005, 2144, 2002, 2048
+		     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+		     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 
diff --git a/PARAM/HMS/CER/hcer_cuts.param b/PARAM/HMS/CER/hcer_cuts.param
index 6a9274f0..90f99407 100644
--- a/PARAM/HMS/CER/hcer_cuts.param
+++ b/PARAM/HMS/CER/hcer_cuts.param
@@ -1,5 +1,8 @@
 ; HMS Cherenkov Cuts parameter files
 
+; Pedestal Defaults (April 2021)
+hcer_PedDefault= 2139, 1934
+
 ; Track matching reduced chi2 cut values
 hcer_red_chi2_min = 0.0
 hcer_red_chi2_max = 25.0
@@ -30,4 +33,4 @@ hcer_adcTimeWindowMax =  200., 200.
 ; No cuts
 ; cut variable is H.cer.goodAdcTdcDiffTime
 ;hcer_adcTimeWindowMin =   -1000.,  -1000.
-;hcer_adcTimeWindowMax =  1000., 1000.
\ No newline at end of file
+;hcer_adcTimeWindowMax =  1000., 1000.
diff --git a/PARAM/HMS/HODO/hhodo_cuts_2488-3624.param b/PARAM/HMS/HODO/hhodo_cuts_2488-3624.param
index cf0a6f28..9bfcdf3b 100644
--- a/PARAM/HMS/HODO/hhodo_cuts_2488-3624.param
+++ b/PARAM/HMS/HODO/hhodo_cuts_2488-3624.param
@@ -44,82 +44,84 @@ hhodo_slop     =    2.,  2.,  4.,  4.
 ;   to move the tdc to between 0 and 4000 channels.
 hhodo_tdc_offset = 1580, 1580, 1580, 1580
 
-hhodo_adc_tdc_offset = 200., 200., 200., 200.
+;hhodo_adc_tdc_offset = 200., 200., 200., 200.
+;Offset changed with HCANA update (April 2021)
+hhodo_adc_tdc_offset = 176., 176., 176., 176.
 
 ; HMS Hodoscope Parameter File Containing TimeWindow Min/Max Cuts
 ; variables = H.hod.(1x, 1y, 2x, 2y).GoodNeg(Pos)AdcTdcDiffTime
 
-;                              1x                 1y              2x              2y
-hhodo_PosAdcTimeWindowMin = -33.36,             -33.71,          -31.39,                -32.26,
-                            -33.29,             -34.08,          -31.03,                -31.23,
-                            -29.07,             -33.68,          -30.98,                -30.22,
-                            -29.41,             -30.11,          -34.60,                -34.49,
-                            -29.55,             -30.20,          -31.58,                -31.44,
-                            -29.19,             -30.35,          -31.19,                -31.43,
-                            -28.72,             -29.54,          -31.10,                -31.55,
-                            -29.08,             -33.95,          -31.23,                -31.80,
-                            -29.20,             -30.04,          -31.32,                -32.09,
-                            -29.34,             -30.79,          -31.49,                -32.31,
-                            -28.75,               0.00,          -30.60,                  0.00,
-                            -29.38,               0.00,          -31.07,                  0.00,
-                            -29.73,               0.00,          -30.60,                  0.00,
-                            -29.56,               0.00,          -30.42,                  0.00,
-                            -29.10,               0.00,          -30.34,                  0.00,
-                            -29.32,               0.00,          -30.54,                  0.00
-
-;                              1x                 1y              2x              2y
-hhodo_PosAdcTimeWindowMax = -17.36,             -17.71,          -15.39,                -16.26,
-                            -17.29,             -18.08,          -15.03,                -15.23,
-                            -13.07,             -17.68,          -14.98,                -14.22,
-                            -13.41,             -14.11,          -18.60,                -18.49,
-                            -13.55,             -14.20,          -15.58,                -15.44,
-                            -13.19,             -14.35,          -15.19,                -15.43,
-                            -12.72,             -13.54,          -15.10,                -15.55,
-                            -13.08,             -17.95,          -15.23,                -15.80,
-                            -13.20,             -14.04,          -15.32,                -16.09,
-                            -13.34,             -14.79,          -15.49,                -16.31,
-                            -12.75,               0.00,          -14.60,                  0.00,
-                            -13.38,               0.00,          -15.07,                  0.00,
-                            -13.73,               0.00,          -14.60,                  0.00,
-                            -13.56,               0.00,          -14.42,                  0.00,
-                            -13.10,               0.00,          -14.34,                  0.00,
-                            -13.32,               0.00,          -14.54,                  0.00
-
-;                              1x                 1y              2x              2y
-hhodo_NegAdcTimeWindowMin = -31.75,             -31.99,          -31.08,                -32.10,
-                            -35.07,             -31.36,          -30.68,                -31.83,
-                            -30.86,             -31.14,          -30.39,                -34.60,
-                            -31.19,             -31.64,          -30.15,                -30.90,
-                            -31.48,             -31.74,          -31.15,                -31.59,
-                            -31.01,             -31.49,          -30.70,                -31.49,
-                            -30.58,             -34.79,          -30.86,                -30.74,
-                            -30.67,             -35.00,          -31.02,                -30.85,
-                            -30.97,             -31.42,          -30.59,                -31.24,
-                            -30.79,             -31.34,          -30.74,                -31.02,
-                            -30.57,               0.00,          -30.23,                  0.00,
-                            -30.86,               0.00,          -30.19,                  0.00,
-                            -31.35,               0.00,          -33.82,                  0.00,
-                            -31.13,               0.00,          -33.92,                  0.00,
-                            -31.12,               0.00,          -30.22,                  0.00,
-                            -31.02,               0.00,          -29.85,                  0.00
-
-;                              1x                 1y              2x              2y
-hhodo_NegAdcTimeWindowMax = -15.75,             -15.99,          -15.08,                -16.10,
-                            -19.07,             -15.36,          -14.68,                -15.83,
-                            -14.86,             -15.14,          -14.39,                -18.60,
-                            -15.19,             -15.64,          -14.15,                -14.90,
-                            -15.48,             -15.74,          -15.15,                -15.59,
-                            -15.01,             -15.49,          -14.70,                -15.49,
-                            -14.58,             -18.79,          -14.86,                -14.74,
-                            -14.67,             -19.00,          -15.02,                -14.85,
-                            -14.97,             -15.42,          -14.59,                -15.24,
-                            -14.79,             -15.34,          -14.74,                -15.02,
-                            -14.57,               0.00,          -14.23,                  0.00,
-                            -14.86,               0.00,          -14.19,                  0.00,
-                            -15.35,               0.00,          -17.82,                  0.00,
-                            -15.13,               0.00,          -17.92,                  0.00,
-                            -15.12,               0.00,          -14.22,                  0.00,
-                            -15.02,               0.00,          -13.85,                  0.00
+;                                 1x                 	    1y              	    2x              		2y
+hhodo_PosAdcTimeWindowMin = -33.36+21.86,             -33.71+23.74,          -31.39+23.24,                -32.26+23.87,
+                            -33.29+21.86,             -34.08+23.74,          -31.03+23.24,                -31.23+23.87,
+                            -29.07+21.86,             -33.68+23.74,          -30.98+23.24,                -30.22+23.87,
+                            -29.41+21.86,             -30.11+23.74,          -34.60+23.24,                -34.49+23.87,
+                            -29.55+21.86,             -30.20+23.74,          -31.58+23.24,                -31.44+23.87,
+                            -29.19+21.86,             -30.35+23.74,          -31.19+23.24,                -31.43+23.87,
+                            -28.72+21.86,             -29.54+23.74,          -31.10+23.24,                -31.55+23.87,
+                            -29.08+21.86,             -33.95+23.74,          -31.23+23.24,                -31.80+23.87,
+                            -29.20+21.86,             -30.04+23.74,          -31.32+23.24,                -32.09+23.87,
+                            -29.34+21.86,             -30.79+23.74,          -31.49+23.24,                -32.31+23.87,
+                            -28.75+21.86,               0.00,          	     -30.60+23.24,                  0.00,
+                            -29.38+21.86,               0.00,                -31.07+23.24,                  0.00,
+                            -29.73+21.86,               0.00,                -30.60+23.24,                  0.00,
+                            -29.56+21.86,               0.00,                -30.42+23.24,                  0.00,
+                            -29.10+21.86,               0.00,                -30.34+23.24,                  0.00,
+                            -29.32+21.86,               0.00,                -30.54+23.24,                  0.00
+
+;                                 1x                       1y                      2x                           2y
+hhodo_PosAdcTimeWindowMax = -17.36+21.86,             -17.71+23.74,          -15.39+23.24,                -16.26+23.87,
+                            -17.29+21.86,             -18.08+23.74,          -15.03+23.24,                -15.23+23.87,
+                            -13.07+21.86,             -17.68+23.74,          -14.98+23.24,                -14.22+23.87,
+                            -13.41+21.86,             -14.11+23.74,          -18.60+23.24,                -18.49+23.87,
+                            -13.55+21.86,             -14.20+23.74,          -15.58+23.24,                -15.44+23.87,
+                            -13.19+21.86,             -14.35+23.74,          -15.19+23.24,                -15.43+23.87,
+                            -12.72+21.86,             -13.54+23.74,          -15.10+23.24,                -15.55+23.87,
+                            -13.08+21.86,             -17.95+23.74,          -15.23+23.24,                -15.80+23.87,
+                            -13.20+21.86,             -14.04+23.74,          -15.32+23.24,                -16.09+23.87,
+                            -13.34+21.86,             -14.79+23.74,          -15.49+23.24,                -16.31+23.87,
+                            -12.75+21.86,               0.00,          	     -14.60+23.24,                  0.00,
+                            -13.38+21.86,               0.00,                -15.07+23.24,                  0.00,
+                            -13.73+21.86,               0.00,                -14.60+23.24,                  0.00,
+                            -13.56+21.86,               0.00,                -14.42+23.24,                  0.00,
+                            -13.10+21.86,               0.00,                -14.34+23.24,                  0.00,
+                            -13.32+21.86,               0.00,                -14.54+23.24,                  0.00
+
+;                                 1x                        1y                     2x                           2y
+hhodo_NegAdcTimeWindowMin = -31.75+23.69,             -31.99+24.06,          -31.08+22.93,                -32.10+23.64,
+                            -35.07+23.69,             -31.36+24.06,          -30.68+22.93,                -31.83+23.64,
+                            -30.86+23.69,             -31.14+24.06,          -30.39+22.93,                -34.60+23.64,
+                            -31.19+23.69,             -31.64+24.06,          -30.15+22.93,                -30.90+23.64,
+                            -31.48+23.69,             -31.74+24.06,          -31.15+22.93,                -31.59+23.64,
+                            -31.01+23.69,             -31.49+24.06,          -30.70+22.93,                -31.49+23.64,
+                            -30.58+23.69,             -34.79+24.06,          -30.86+22.93,                -30.74+23.64,
+                            -30.67+23.69,             -35.00+24.06,          -31.02+22.93,                -30.85+23.64,
+                            -30.97+23.69,             -31.42+24.06,          -30.59+22.93,                -31.24+23.64,
+                            -30.79+23.69,             -31.34+24.06,          -30.74+22.93,                -31.02+23.64,
+                            -30.57+23.69,               0.00,                -30.23+22.93,                  0.00,
+                            -30.86+23.69,               0.00,                -30.19+22.93,                  0.00,
+                            -31.35+23.69,               0.00,                -33.82+22.93,                  0.00,
+                            -31.13+23.69,               0.00,                -33.92+22.93,                  0.00,
+                            -31.12+23.69,               0.00,                -30.22+22.93,                  0.00,
+                            -31.02+23.69,               0.00,                -29.85+22.93,                  0.00
+
+;                                 1x                        1y                      2x                           2y
+hhodo_NegAdcTimeWindowMax = -15.75+23.69,             -15.99+24.06,           -15.08+22.93,                -16.10+23.64,
+                            -19.07+23.69,             -15.36+24.06,           -14.68+22.93,                -15.83+23.64,
+                            -14.86+23.69,             -15.14+24.06,           -14.39+22.93,                -18.60+23.64,
+                            -15.19+23.69,             -15.64+24.06,           -14.15+22.93,                -14.90+23.64,
+                            -15.48+23.69,             -15.74+24.06,           -15.15+22.93,                -15.59+23.64,
+                            -15.01+23.69,             -15.49+24.06,           -14.70+22.93,                -15.49+23.64,
+                            -14.58+23.69,             -18.79+24.06,           -14.86+22.93,                -14.74+23.64,
+                            -14.67+23.69,             -19.00+24.06,           -15.02+22.93,                -14.85+23.64,
+                            -14.97+23.69,             -15.42+24.06,           -14.59+22.93,                -15.24+23.64,
+                            -14.79+23.69,             -15.34+24.06,           -14.74+22.93,                -15.02+23.64,
+                            -14.57+23.69,               0.00,                 -14.23+22.93,                  0.00,
+                            -14.86+23.69,               0.00,                 -14.19+22.93,                  0.00,
+                            -15.35+23.69,               0.00,                 -17.82+22.93,                  0.00,
+                            -15.13+23.69,               0.00,                 -17.92+22.93,                  0.00,
+                            -15.12+23.69,               0.00,                 -14.22+22.93,                  0.00,
+                            -15.02+23.69,               0.00,                 -13.85+22.93,                  0.00
 
 ;
 hhodo_pos_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000,
diff --git a/PARAM/HMS/HODO/hhodo_cuts_3633-4334.param b/PARAM/HMS/HODO/hhodo_cuts_3633-4334.param
index e6cb854f..44a34ae6 100644
--- a/PARAM/HMS/HODO/hhodo_cuts_3633-4334.param
+++ b/PARAM/HMS/HODO/hhodo_cuts_3633-4334.param
@@ -44,82 +44,84 @@ hhodo_slop     =    2.,  2.,  4.,  4.
 ;   to move the tdc to between 0 and 4000 channels.
 hhodo_tdc_offset = 1580, 1580, 1580, 1580
 
-hhodo_adc_tdc_offset = 200., 200., 200., 200.
+;hhodo_adc_tdc_offset = 200., 200., 200., 200.
+;Offset changed with HCANA update (April 2021)
+hhodo_adc_tdc_offset = 171., 171., 171., 171.
 
 ; HMS Hodoscope Parameter File Containing TimeWindow Min/Max Cuts
 ; variables = H.hod.(1x, 1y, 2x, 2y).GoodNeg(Pos)AdcTdcDiffTime
 
-;                              1x                 1y              2x              2y
-hhodo_PosAdcTimeWindowMin = -39.65,             -40.35,          -37.19,                -37.58,
-                            -39.21,             -40.36,          -36.75,                -37.25,
-                            -34.77,             -39.82,          -36.61,                -36.17,
-                            -35.02,             -36.05,          -40.33,                -40.34,
-                            -35.21,             -35.98,          -37.26,                -37.13,
-                            -34.84,             -36.11,          -36.87,                -37.05,
-                            -34.36,             -35.33,          -36.78,                -36.93,
-                            -34.72,             -39.81,          -36.94,                -37.20,
-                            -34.88,             -36.00,          -37.04,                -37.55,
-                            -35.05,             -36.68,          -37.23,                -37.68,
-                            -34.42,               0.00,          -36.36,                  0.00,
-                            -35.13,               0.00,          -36.91,                  0.00,
-                            -35.52,               0.00,          -36.40,                  0.00,
-                            -35.47,               0.00,          -36.30,                  0.00,
-                            -35.23,               0.00,          -36.40,                  0.00,
-                            -35.54,               0.00,          -36.42,                  0.00
-
-;                              1x                 1y              2x              2y
-hhodo_PosAdcTimeWindowMax = -23.65,             -24.35,          -21.19,                -21.58,
-                            -23.21,             -24.36,          -20.75,                -21.25,
-                            -18.77,             -23.82,          -20.61,                -20.17,
-                            -19.02,             -20.05,          -24.33,                -24.34,
-                            -19.21,             -19.98,          -21.26,                -21.13,
-                            -18.84,             -20.11,          -20.87,                -21.05,
-                            -18.36,             -19.33,          -20.78,                -20.93,
-                            -18.72,             -23.81,          -20.94,                -21.20,
-                            -18.88,             -20.00,          -21.04,                -21.55,
-                            -19.05,             -20.68,          -21.23,                -21.68,
-                            -18.42,               0.00,          -20.36,                  0.00,
-                            -19.13,               0.00,          -20.91,                  0.00,
-                            -19.52,               0.00,          -20.40,                  0.00,
-                            -19.47,               0.00,          -20.30,                  0.00,
-                            -19.23,               0.00,          -20.40,                  0.00,
-                            -19.54,               0.00,          -20.42,                  0.00
-
-;                              1x                 1y              2x              2y
-hhodo_NegAdcTimeWindowMin = -42.13,             -37.93,          -36.94,                -37.83,
-                            -41.40,             -36.97,          -36.58,                -37.34,
-                            -36.87,             -36.61,          -36.16,                -40.12,
-                            -37.05,             -37.18,          -35.98,                -36.48,
-                            -37.42,             -37.38,          -36.93,                -37.34,
-                            -36.87,             -37.22,          -36.42,                -37.26,
-                            -36.41,             -40.53,          -36.56,                -36.51,
-                            -36.49,             -40.90,          -36.70,                -36.65,
-                            -36.75,             -37.48,          -36.22,                -37.02,
-                            -36.44,             -37.53,          -36.20,                -36.63,
-                            -36.20,               0.00,          -35.72,                  0.00,
-                            -36.47,               0.00,          -35.69,                  0.00,
-                            -37.00,               0.00,          -39.25,                  0.00,
-                            -36.85,               0.00,          -39.34,                  0.00,
-                            -37.10,               0.00,          -35.58,                  0.00,
-                            -37.26,               0.00,          -35.33,                  0.00
-
-;                              1x                 1y              2x              2y
-hhodo_NegAdcTimeWindowMax = -26.13,             -21.93,          -20.94,                -21.83,
-                            -25.40,             -20.97,          -20.58,                -21.34,
-                            -20.87,             -20.61,          -20.16,                -24.12,
-                            -21.05,             -21.18,          -19.98,                -20.48,
-                            -21.42,             -21.38,          -20.93,                -21.34,
-                            -20.87,             -21.22,          -20.42,                -21.26,
-                            -20.41,             -24.53,          -20.56,                -20.51,
-                            -20.49,             -24.90,          -20.70,                -20.65,
-                            -20.75,             -21.48,          -20.22,                -21.02,
-                            -20.44,             -21.53,          -20.20,                -20.63,
-                            -20.20,               0.00,          -19.72,                  0.00,
-                            -20.47,               0.00,          -19.69,                  0.00,
-                            -21.00,               0.00,          -23.25,                  0.00,
-                            -20.85,               0.00,          -23.34,                  0.00,
-                            -21.10,               0.00,          -19.58,                  0.00,
-                            -21.26,               0.00,          -19.33,                  0.00
+;                              1x                           1y                     2x                      2y
+hhodo_PosAdcTimeWindowMin = -39.65+27.21,             -40.35+29.18,          -37.19+28.96,                -37.58+29.45,
+                            -39.21+27.21,             -40.36+29.18,          -36.75+28.96,                -37.25+29.45,
+                            -34.77+27.21,             -39.82+29.18,          -36.61+28.96,                -36.17+29.45,
+                            -35.02+27.21,             -36.05+29.18,          -40.33+28.96,                -40.34+29.45,
+                            -35.21+27.21,             -35.98+29.18,          -37.26+28.96,                -37.13+29.45,
+                            -34.84+27.21,             -36.11+29.18,          -36.87+28.96,                -37.05+29.45,
+                            -34.36+27.21,             -35.33+29.18,          -36.78+28.96,                -36.93+29.45,
+                            -34.72+27.21,             -39.81+29.18,          -36.94+28.96,                -37.20+29.45,
+                            -34.88+27.21,             -36.00+29.18,          -37.04+28.96,                -37.55+29.45,
+                            -35.05+27.21,             -36.68+29.18,          -37.23+28.96,                -37.68+29.45,
+                            -34.42+27.21,               0.00,                -36.36+28.96,                  0.00,
+                            -35.13+27.21,               0.00,                -36.91+28.96,                  0.00,
+                            -35.52+27.21,               0.00,                -36.40+28.96,                  0.00,
+                            -35.47+27.21,               0.00,                -36.30+28.96,                  0.00,
+                            -35.23+27.21,               0.00,                -36.40+28.96,                  0.00,
+                            -35.54+27.21,               0.00,                -36.42+28.96,                  0.00
+
+;                              1x                 1y                         2x                                  2y
+hhodo_PosAdcTimeWindowMax = -23.65+27.21,             -24.35+29.18,          -21.19+28.96,                -21.58+29.45,
+                            -23.21+27.21,             -24.36+29.18,          -20.75+28.96,                -21.25+29.45,
+                            -18.77+27.21,             -23.82+29.18,          -20.61+28.96,                -20.17+29.45,
+                            -19.02+27.21,             -20.05+29.18,          -24.33+28.96,                -24.34+29.45,
+                            -19.21+27.21,             -19.98+29.18,          -21.26+28.96,                -21.13+29.45,
+                            -18.84+27.21,             -20.11+29.18,          -20.87+28.96,                -21.05+29.45,
+                            -18.36+27.21,             -19.33+29.18,          -20.78+28.96,                -20.93+29.45,
+                            -18.72+27.21,             -23.81+29.18,          -20.94+28.96,                -21.20+29.45,
+                            -18.88+27.21,             -20.00+29.18,          -21.04+28.96,                -21.55+29.45,
+                            -19.05+27.21,             -20.68+29.18,          -21.23+28.96,                -21.68+29.45,
+                            -18.42+27.21,               0.00,                -20.36+28.96,                  0.00,
+                            -19.13+27.21,               0.00,                -20.91+28.96,                  0.00,
+                            -19.52+27.21,               0.00,                -20.40+28.96,                  0.00,
+                            -19.47+27.21,               0.00,                -20.30+28.96,                  0.00,
+                            -19.23+27.21,               0.00,                -20.40+28.96,                  0.00,
+                            -19.54+27.21,               0.00,                -20.42+28.96,                  0.00
+
+;                                 1x                        1y                      2x                          2y
+hhodo_NegAdcTimeWindowMin = -42.13+29.04,             -37.93+29.85,          -36.94+28.50,                -37.83+29.31,
+                            -41.40+29.04,             -36.97+29.85,          -36.58+28.50,                -37.34+29.31,
+                            -36.87+29.04,             -36.61+29.85,          -36.16+28.50,                -40.12+29.31,
+                            -37.05+29.04,             -37.18+29.85,          -35.98+28.50,                -36.48+29.31,
+                            -37.42+29.04,             -37.38+29.85,          -36.93+28.50,                -37.34+29.31,
+                            -36.87+29.04,             -37.22+29.85,          -36.42+28.50,                -37.26+29.31,
+                            -36.41+29.04,             -40.53+29.85,          -36.56+28.50,                -36.51+29.31,
+                            -36.49+29.04,             -40.90+29.85,          -36.70+28.50,                -36.65+29.31,
+                            -36.75+29.04,             -37.48+29.85,          -36.22+28.50,                -37.02+29.31,
+                            -36.44+29.04,             -37.53+29.85,          -36.20+28.50,                -36.63+29.31,
+                            -36.20+29.04,               0.00,                -35.72+28.50,                  0.00,
+                            -36.47+29.04,               0.00,                -35.69+28.50,                  0.00,
+                            -37.00+29.04,               0.00,                -39.25+28.50,                  0.00,
+                            -36.85+29.04,               0.00,                -39.34+28.50,                  0.00,
+                            -37.10+29.04,               0.00,                -35.58+28.50,                  0.00,
+                            -37.26+29.04,               0.00,                -35.33+28.50,                  0.00
+
+;                                 1x                        1y                      2x                          2y
+hhodo_NegAdcTimeWindowMax = -26.13+29.04,             -21.93+29.85,          -20.94+28.50,                -21.83+29.31,
+                            -25.40+29.04,             -20.97+29.85,          -20.58+28.50,                -21.34+29.31,
+                            -20.87+29.04,             -20.61+29.85,          -20.16+28.50,                -24.12+29.31,
+                            -21.05+29.04,             -21.18+29.85,          -19.98+28.50,                -20.48+29.31,
+                            -21.42+29.04,             -21.38+29.85,          -20.93+28.50,                -21.34+29.31,
+                            -20.87+29.04,             -21.22+29.85,          -20.42+28.50,                -21.26+29.31,
+                            -20.41+29.04,             -24.53+29.85,          -20.56+28.50,                -20.51+29.31,
+                            -20.49+29.04,             -24.90+29.85,          -20.70+28.50,                -20.65+29.31,
+                            -20.75+29.04,             -21.48+29.85,          -20.22+28.50,                -21.02+29.31,
+                            -20.44+29.04,             -21.53+29.85,          -20.20+28.50,                -20.63+29.31,
+                            -20.20+29.04,               0.00,                -19.72+28.50,                  0.00,
+                            -20.47+29.04,               0.00,                -19.69+28.50,                  0.00,
+                            -21.00+29.04,               0.00,                -23.25+28.50,                  0.00,
+                            -20.85+29.04,               0.00,                -23.34+28.50,                  0.00,
+                            -21.10+29.04,               0.00,                -19.58+28.50,                  0.00,
+                            -21.26+29.04,               0.00,                -19.33+28.50,                  0.00
 
 
 ;
diff --git a/PARAM/SHMS/AERO/paero_cuts.param b/PARAM/SHMS/AERO/paero_cuts.param
index cc151de0..8746ebeb 100644
--- a/PARAM/SHMS/AERO/paero_cuts.param
+++ b/PARAM/SHMS/AERO/paero_cuts.param
@@ -24,4 +24,8 @@ paero_adcPosTimeWindowMin =   0.,   0.,   0.,   0.,   0.,   0.,   0.
 paero_adcNegTimeWindowMin = 195., 195., 195., 195., 195., 195., 195.
 
 paero_adcPosTimeWindowMax = 100., 100., 100., 100., 100., 100., 100.
-paero_adcNegTimeWindowMax = 295., 295., 295., 295., 295., 295., 295.
\ No newline at end of file
+paero_adcNegTimeWindowMax = 295., 295., 295., 295., 295., 295., 295.
+
+; Pedestal Defaults from HCANA Update (April 2021)
+paero_PedPosDefault= 0, 0, 0, 0, 0, 0, 0
+paero_PedNegDefault= 0, 0, 0, 0, 0, 0, 0
diff --git a/PARAM/SHMS/CAL/pcal_cuts.param b/PARAM/SHMS/CAL/pcal_cuts.param
index 369777ef..119e30b3 100644
--- a/PARAM/SHMS/CAL/pcal_cuts.param
+++ b/PARAM/SHMS/CAL/pcal_cuts.param
@@ -75,3 +75,22 @@ pdbg_tracks_cal = 0
 
 ; Exclusion bandwidth for calorimeter fiducial volume.
 pcal_fv_delta = 5
+
+; Pedestal Defaults from HCANA Update (April 2021)
+pcal_PedPosDefault= 2000, 2025, 2137, 1943, 1969, 2124, 2095, 2075, 2162, 2089, 2130, 2066, 2063, 1988
+pcal_PedNegDefault= 1891, 2182, 2087, 2208, 2204, 2152, 2220, 2106, 2143, 2147, 2072, 2162, 2176, 2113
+
+pcal_arr_PedDefault= 2164, 2212, 2098, 2076, 2251, 2325, 2345, 2288, 2318, 2247, 2258, 2335, 2277, 2189, 2174, 2281, 2159, 
+2204, 2090, 2202, 2190, 2225, 2280, 2265, 2356, 2233, 2212, 2218, 2312, 2135, 2239, 2246, 2141, 
+2172, 2241, 2033, 2146, 2128, 2105, 2151, 2129, 2083, 2090, 2139, 2043, 2184, 2173, 2244, 2339, 
+2101, 2224, 2188, 2307, 2311, 2208, 2122, 2200, 2346, 2126, 2231, 2268, 2209, 2204, 2247, 2103, 
+2114, 2136, 2106, 2292, 2097, 2160, 2194, 2293, 2099, 2142, 2320, 2198, 2110, 2141, 2095, 2258, 
+2352, 2212, 2213, 2279, 2106, 2260, 2190, 2130, 2291, 2242, 2165, 2287, 2203, 2138, 2172, 2309, 
+2159, 2291, 2294, 2231, 2178, 2264, 2255, 2100, 2079, 2140, 2257, 2351, 2222, 2177, 2221, 1940, 
+1880, 1978, 1960, 1869, 2007, 2045, 1948, 1909, 1983, 1875, 1851, 1922, 2076, 1937, 1797, 2148, 
+2195, 2252, 2183, 2143, 2319, 2249, 2229, 2284, 2214, 2239, 2223, 2136, 2239, 2178, 2149, 2290, 
+2118, 2154, 2163, 2273, 2091, 2164, 2139, 2163, 2155, 2084, 2288, 2204, 2057, 2134, 2185, 2251, 
+2288, 2235, 2060, 2163, 2165, 2256, 2310, 2286, 2266, 2221, 2217, 2200, 2221, 2173, 2224, 2097, 
+2234, 2374, 2350, 2204, 2260, 2211, 2294, 2391, 2225, 2310, 2253, 2265, 2207, 2127, 2044, 2232, 
+2143, 2213, 2200, 2083, 2292, 2026, 2272, 2264, 2207, 2212, 2247, 2176, 2084, 2196, 2059, 2215, 
+2140, 2230, 2217, 2197, 2103, 2213, 2216, 2150, 2239, 2141, 2263, 2235, 0, 2249, 2211
diff --git a/PARAM/SHMS/HGCER/phgcer_cuts.param b/PARAM/SHMS/HGCER/phgcer_cuts.param
index 6952aac9..1795e4c3 100644
--- a/PARAM/SHMS/HGCER/phgcer_cuts.param
+++ b/PARAM/SHMS/HGCER/phgcer_cuts.param
@@ -23,4 +23,7 @@ phgcer_adc_tdc_offset   =  200.0
 ; fall 2019 startup
 ; cut variable is P.hgcer.goodAdcTdcDiffTime
 phgcer_adcTimeWindowMin = -60.0, -60.0, -60.0, -60.0
-phgcer_adcTimeWindowMax =  80.0,  80.0,  80.0,  80.0
\ No newline at end of file
+phgcer_adcTimeWindowMax =  80.0,  80.0,  80.0,  80.0
+
+; Pedestal Defaults from HCANA update (April 2021)
+phgcer_PedDefault= 2085, 2141, 2309, 1980
diff --git a/PARAM/SHMS/HODO/phodo_cuts_10815-11541.param b/PARAM/SHMS/HODO/phodo_cuts_10815-11541.param
index 8dcfb432..0cdead26 100644
--- a/PARAM/SHMS/HODO/phodo_cuts_10815-11541.param
+++ b/PARAM/SHMS/HODO/phodo_cuts_10815-11541.param
@@ -46,8 +46,9 @@ phodo_tdc_offset = 2000, 2000, 2000, 2000
 
 ; phodo_adc_tdc_offset is array of time offsets for all paddles in a plane
 ;   to move the ADC pulse time after reference time subtraction to a reasonable time (ns).
-phodo_adc_tdc_offset = 200., 200., 200., 200.
-
+;phodo_adc_tdc_offset = 200., 200., 200., 200.
+; Offset changed with HCANA update (April 2021)
+phodo_adc_tdc_offset = 211., 219., 212., 228.
 
 ; SHMS Hodoscope TimeWindow Min/Max Cuts
 
@@ -56,98 +57,98 @@ phodo_adc_tdc_offset = 200., 200., 200., 200.
 
 ; variables = P.hod.(1x, 1y, 2x, 2y).GoodNeg(Pos)AdcTdcDiffTime
 
-;                              1x                 1y              2x              2y
-phodo_PosAdcTimeWindowMin = 5.48,               11.45,              9.87,                0.00
-                            6.63,               11.07,             10.20,                0.00
-                           10.57,               11.98,             10.30,               29.24
-                           10.39,               11.23,              7.15,               28.49
-                           11.17,               10.64,             10.21,               28.68
-                           10.70,               10.33,             10.24,               27.87
-                           11.01,               11.98,             10.55,               29.11
-                            8.17,               11.05,             10.07,               28.39
-                           10.91,               10.06,             10.93,               28.26
-                           10.99,                6.33,             10.56,               29.05
-                           11.39,                7.36,             11.03,               28.30
-                           11.02,                9.92,             11.19,               25.72
-                           10.77,               10.19,              6.45,               28.63
-                            0.00,                0.00,              7.09,               29.03
-                            0.00,                0.00,              0.00,               28.87
-                            0.00,                0.00,              0.00,               29.26
-                            0.00,                0.00,              0.00,               27.32
-                            0.00,                0.00,              0.00,               26.78
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-
-;                              1x                 1y              2x              2y
-phodo_PosAdcTimeWindowMax =21.48,               27.45,             25.87,                0.00
-                           22.63,               27.07,             26.20,                0.00
-                           26.57,               27.98,             26.30,               45.24
-                           26.39,               27.23,             23.15,               44.49
-                           27.17,               26.64,             26.21,               44.68
-                           26.70,               26.33,             26.24,               43.87
-                           27.01,               27.98,             26.55,               45.11
-                           24.17,               27.05,             26.07,               44.39
-                           26.91,               26.06,             26.93,               44.26
-                           26.99,               22.33,             26.56,               45.05
-                           27.39,               23.36,             27.03,               44.30
-                           27.02,               25.92,             27.19,               41.72
-                           26.77,               26.19,             22.45,               44.63
-                            0.00,                0.00,             23.09,               45.03
-                            0.00,                0.00,              0.00,               44.87
-                            0.00,                0.00,              0.00,               45.26
-                            0.00,                0.00,              0.00,               43.32
-                            0.00,                0.00,              0.00,               42.78
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-
-;                              1x                 1y              2x              2y
-phodo_NegAdcTimeWindowMin =1.97,                10.77,              2.83,                0.00
-                           3.03,                10.62,              3.49,                0.00
-                           3.70,                11.24,              2.66,               22.83
-                           0.39,                10.83,              3.81,               22.17
-                           4.29,                10.87,              3.04,               22.32
-                           3.39,                10.20,              4.18,               21.53
-                           4.16,                12.12,              4.30,               22.12
-                           3.99,                11.14,              3.53,               24.16
-                           4.34,                11.07,              3.92,               21.19
-                           4.70,                 9.49,              3.58,               21.66
-                           1.22,                10.27,              4.08,               20.66
-                           4.53,                 9.25,              4.07,               21.41
-                           4.34,                 9.88,              3.45,               21.73
-                           0.00,                 0.00,              4.03,               21.14
-                           0.00,                 0.00,              0.00,               21.57
-                           0.00,                 0.00,              0.00,               22.26
-                           0.00,                 0.00,              0.00,               16.19
-                           0.00,                 0.00,              0.00,               19.55
-                           0.00,                 0.00,              0.00,                0.00
-                           0.00,                 0.00,              0.00,                0.00
-                           0.00,                 0.00,              0.00,                0.00
-
-
-;                              1x                 1y              2x              2y
-phodo_NegAdcTimeWindowMax =17.97,               26.77,             18.83,                0.00
-                           19.03,               26.62,             19.49,                0.00
-                           19.70,               27.24,             18.66,               38.83
-                           16.39,               26.83,             19.81,               38.17
-                           20.29,               26.87,             19.04,               38.32
-                           19.39,               26.20,             20.18,               37.53
-                           20.16,               28.12,             20.30,               38.12
-                           19.99,               27.14,             19.53,               40.16
-                           20.34,               27.07,             19.92,               37.19
-                           20.70,               25.49,             19.58,               37.66
-                           17.22,               26.27,             20.08,               36.66
-                           20.53,               25.25,             20.07,               37.41
-                           20.34,               25.88,             19.45,               37.73
-                            0.00,                0.00,             20.03,               37.14
-                            0.00,                0.00,              0.00,               37.57
-                            0.00,                0.00,              0.00,               38.26
-                            0.00,                0.00,              0.00,               32.19
-                            0.00,                0.00,              0.00,               35.55
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
+;                              1x                 	   1y             	    2x             	 2y
+phodo_PosAdcTimeWindowMin = 5.48-17.71,               11.45-18.43,              9.87-18.01,              0.00
+                            6.63-17.71,               11.07-18.43,             10.20-18.01,              0.00
+                           10.57-17.71,               11.98-18.43,             10.30-18.01,             29.24-34.67
+                           10.39-17.71,               11.23-18.43,              7.15-18.01,             28.49-34.67
+                           11.17-17.71,               10.64-18.43,             10.21-18.01,             28.68-34.67
+                           10.70-17.71,               10.33-18.43,             10.24-18.01,             27.87-34.67
+                           11.01-17.71,               11.98-18.43,             10.55-18.01,             29.11-34.67
+                            8.17-17.71,               11.05-18.43,             10.07-18.01,             28.39-34.67
+                           10.91-17.71,               10.06-18.43,             10.93-18.01,             28.26-34.67
+                           10.99-17.71,                6.33-18.43,             10.56-18.01,             29.05-34.67
+                           11.39-17.71,                7.36-18.43,             11.03-18.01,             28.30-34.67
+                           11.02-17.71,                9.92-18.43,             11.19-18.01,             25.72-34.67
+                           10.77-17.71,               10.19-18.43,              6.45-18.01,             28.63-34.67
+                            0.00,                	0.00,              	7.09-18.01,             29.03-34.67
+                            0.00,                	0.00,              	0.00,                   28.87-34.67
+                            0.00,                	0.00,              	0.00,                   29.26-34.67
+                            0.00,                	0.00,              	0.00,                   27.32-34.67
+                            0.00,                	0.00,              	0.00,                   26.78-34.67
+                            0.00,                	0.00,              	0.00,                   0.00
+                            0.00,                	0.00,              	0.00,                   0.00
+                            0.00,                	0.00,             	0.00,                   0.00
+
+;                              1x                 	  1y              	    2x                    2y
+phodo_PosAdcTimeWindowMax =21.48-17.71,               27.45-18.43,             25.87-18.01,                0.00
+                           22.63-17.71,               27.07-18.43,             26.20-18.01,                0.00
+                           26.57-17.71,               27.98-18.43,             26.30-18.01,               45.24-34.67
+                           26.39-17.71,               27.23-18.43,             23.15-18.01,               44.49-34.67
+                           27.17-17.71,               26.64-18.43,             26.21-18.01,               44.68-34.67
+                           26.70-17.71,               26.33-18.43,             26.24-18.01,               43.87-34.67
+                           27.01-17.71,               27.98-18.43,             26.55-18.01,               45.11-34.67
+                           24.17-17.71,               27.05-18.43,             26.07-18.01,               44.39-34.67
+                           26.91-17.71,               26.06-18.43,             26.93-18.01,               44.26-34.67
+                           26.99-17.71,               22.33-18.43,             26.56-18.01,               45.05-34.67
+                           27.39-17.71,               23.36-18.43,             27.03-18.01,               44.30-34.67
+                           27.02-17.71,               25.92-18.43,             27.19-18.01,               41.72-34.67
+                           26.77-17.71,               26.19-18.43,             22.45-18.01,               44.63-34.67
+                            0.00,             	   	0.00,                  23.09-18.01,               45.03-34.67
+                            0.00,                	0.00,                  0.00,               	  44.87-34.67
+                            0.00,                	0.00,                  0.00,               	  45.26-34.67
+                            0.00,                	0.00,                  0.00,                      43.32-34.67
+                            0.00,                	0.00,                  0.00,               	  42.78-34.67
+                            0.00,                	0.00,                  0.00,                       0.00
+                            0.00,               	0.00,                  0.00,                       0.00
+                            0.00,                	0.00,                  0.00,                       0.00
+
+;                              1x                 	   1y                       2x                      2y
+phodo_NegAdcTimeWindowMin =1.97-10.89,                10.77-18.92,              2.83-11.67,                0.00
+                           3.03-10.89,                10.62-18.92,              3.49-11.67,                0.00
+                           3.70-10.89,                11.24-18.92,              2.66-11.67,               22.83-27.95
+                           0.39-10.89,                10.83-18.92,              3.81-11.67,               22.17-27.95
+                           4.29-10.89,                10.87-18.92,              3.04-11.67,               22.32-27.95
+                           3.39-10.89,                10.20-18.92,              4.18-11.67,               21.53-27.95
+                           4.16-10.89,                12.12-18.92,              4.30-11.67,               22.12-27.95
+                           3.99-10.89,                11.14-18.92,              3.53-11.67,               24.16-27.95
+                           4.34-10.89,                11.07-18.92,              3.92-11.67,               21.19-27.95
+                           4.70-10.89,                 9.49-18.92,              3.58-11.67,               21.66-27.95
+                           1.22-10.89,                10.27-18.92,              4.08-11.67,               20.66-27.95
+                           4.53-10.89,                 9.25-18.92,              4.07-11.67,               21.41-27.95
+                           4.34-10.89,                 9.88-18.92,              3.45-11.67,               21.73-27.95
+                           0.00,                 	0.00,              	4.03-11.67,               21.14-27.95
+                           0.00,                 	0.00,              	0.00,                     21.57-27.95
+                           0.00,                 	0.00,              	0.00,                     22.26-27.95
+                           0.00,                 	0.00,              	0.00,                     16.19-27.95
+                           0.00,                 	0.00,              	0.00,                     19.55-27.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
+
+
+;                              1x                 	   1y              	    2x                      2y
+phodo_NegAdcTimeWindowMax =17.97-10.89,               26.77-18.92,             18.83-11.67,                0.00
+                           19.03-10.89,               26.62-18.92,             19.49-11.67,                0.00
+                           19.70-10.89,               27.24-18.92,             18.66-11.67,               38.83-27.95
+                           16.39-10.89,               26.83-18.92,             19.81-11.67,               38.17-27.95
+                           20.29-10.89,               26.87-18.92,             19.04-11.67,               38.32-27.95
+                           19.39-10.89,               26.20-18.92,             20.18-11.67,               37.53-27.95
+                           20.16-10.89,               28.12-18.92,             20.30-11.67,               38.12-27.95
+                           19.99-10.89,               27.14-18.92,             19.53-11.67,               40.16-27.95
+                           20.34-10.89,               27.07-18.92,             19.92-11.67,               37.19-27.95
+                           20.70-10.89,               25.49-18.92,             19.58-11.67,               37.66-27.95
+                           17.22-10.89,               26.27-18.92,             20.08-11.67,               36.66-27.95
+                           20.53-10.89,               25.25-18.92,             20.07-11.67,               37.41-27.95
+                           20.34-10.89,               25.88-18.92,             19.45-11.67,               37.73-27.95
+                            0.00,                	0.00,                  20.03-11.67,               37.14-27.95
+                            0.00,                	0.00,                  0.00,               	  37.57-27.95
+                            0.00,                	0.00,                  0.00,                      38.26-27.95
+                            0.00,                	0.00,                  0.00,                      32.19-27.95
+                            0.00,                	0.00,                  0.00,                      35.55-27.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
 
 ; ;                              1x                   1y                   2x                   2y
 ; phodo_PosAdcTimeWindowMin = -10000.0,            -10000.0,            -10000.0,            -10000.0
diff --git a/PARAM/SHMS/HODO/phodo_cuts_9663-10804.param b/PARAM/SHMS/HODO/phodo_cuts_9663-10804.param
index 3ecc14a9..569462fc 100644
--- a/PARAM/SHMS/HODO/phodo_cuts_9663-10804.param
+++ b/PARAM/SHMS/HODO/phodo_cuts_9663-10804.param
@@ -46,8 +46,9 @@ phodo_tdc_offset = 2000, 2000, 2000, 2000
 
 ; phodo_adc_tdc_offset is array of time offsets for all paddles in a plane
 ;   to move the ADC pulse time after reference time subtraction to a reasonable time (ns).
-phodo_adc_tdc_offset = 200., 200., 200., 200.
-
+;phodo_adc_tdc_offset = 200., 200., 200., 200.
+; Offset changed with HCANA update (2021)
+phodo_adc_tdc_offset = 219., 227., 220., 236.
 
 ; SHMS Hodoscope TimeWindow Min/Max Cuts
 
@@ -56,97 +57,97 @@ phodo_adc_tdc_offset = 200., 200., 200., 200.
 
 ; variables = P.hod.(1x, 1y, 2x, 2y).GoodNeg(Pos)AdcTdcDiffTime
 
-;                              1x                 1y              2x              2y
-phodo_PosAdcTimeWindowMin =14.95,               19.62,             18.68,                0.00
-                           15.49,               19.35,             18.79,                0.00
-                           19.02,               20.25,             18.82,               35.59
-                           18.91,               19.51,             15.59,               35.14
-                           19.43,               18.65,             18.45,               34.87
-                           18.84,               18.32,             18.44,               34.47
-                           19.06,               20.07,             18.67,               35.64
-                           16.14,               19.18,             18.05,               35.07
-                           18.88,               18.25,             18.89,               34.80
-                           18.89,               14.53,             18.46,               35.28
-                           19.43,               15.66,             18.89,               34.95
-                           19.03,               18.20,             19.15,               32.24
-                           18.59,               18.19,             14.39,               35.05
-                            0.00,                0.00,             14.84,               35.43
-                            0.00,                0.00,              0.00,               35.34
-                            0.00,                0.00,              0.00,               35.64
-                            0.00,                0.00,              0.00,               35.55
-                            0.00,                0.00,              0.00,               35.01
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-
-;                              1x                 1y              2x              2y
-phodo_PosAdcTimeWindowMax =30.95,               35.62,             34.68,                0.00
-                           31.49,               35.35,             34.79,                0.00
-                           35.02,               36.25,             34.82,               51.59
-                           34.91,               35.51,             31.59,               51.14
-                           35.43,               34.65,             34.45,               50.87
-                           34.84,               34.32,             34.44,               50.47
-                           35.06,               36.07,             34.67,               51.64
-                           32.14,               35.18,             34.05,               51.07
-                           34.88,               34.25,             34.89,               50.80
-                           34.89,               30.53,             34.46,               51.28
-                           35.43,               31.66,             34.89,               50.95
-                           35.03,               34.20,             35.15,               48.24
-                           34.59,               34.19,             30.39,               51.05
-                            0.00,                0.00,             30.84,               51.43
-                            0.00,                0.00,              0.00,               51.34
-                            0.00,                0.00,              0.00,               51.64
-                            0.00,                0.00,              0.00,               51.55
-                            0.00,                0.00,              0.00,               51.01
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-                            0.00,                0.00,              0.00,                0.00
-
-;                              1x                 1y              2x              2y
-phodo_NegAdcTimeWindowMin =11.33,               19.47,           11.71,                  0.00
-                           11.57,               19.66,           12.14,                  0.00
-                           12.13,               20.02,           11.08,                 29.61
-                            8.53,               19.59,           12.10,                 29.15
-                            8.31,               19.35,           11.18,                 28.90
-                           11.49,               18.66,           12.23,                 28.38
-                           12.20,               20.52,           12.37,                 29.01
-                           12.08,               19.34,           11.64,                 29.16
-                           12.43,               19.48,           11.96,                 28.03
-                           12.81,               18.00,           11.65,                 28.17
-                            9.33,               18.85,           12.25,                 27.52
-                           12.43,               17.76,           12.15,                 27.84
-                           12.15,               18.22,           11.39,                 27.81
-                            0.00,                0.00,           11.92,                 27.62
-                            0.00,                0.00,            0.00,                 28.13
-                            0.00,                0.00,            0.00,                 28.50
-                            0.00,                0.00,            0.00,                 24.49
-                            0.00,                0.00,            0.00,                 27.88
-                            0.00,                0.00,            0.00,                  0.00
-                            0.00,                0.00,            0.00,                  0.00
-                            0.00,                0.00,            0.00,                  0.00
-
-;                              1x                 1y              2x              2y
-phodo_NegAdcTimeWindowMax =27.33,               35.47,           27.71,                  0.00
-                           27.57,               35.66,           28.14,                  0.00
-                           28.13,               36.02,           27.08,                 45.61
-                           24.53,               35.59,           28.10,                 45.15
-                           24.31,               35.35,           27.18,                 44.90
-                           27.49,               34.66,           28.23,                 44.38
-                           28.20,               36.52,           28.37,                 45.01
-                           28.08,               35.34,           27.64,                 45.16
-                           28.43,               35.48,           27.96,                 44.03
-                           28.81,               34.00,           27.65,                 44.17
-                           25.33,               34.85,           28.25,                 43.52
-                           28.43,               33.76,           28.15,                 43.84
-                           28.15,               34.22,           27.39,                 43.81
-                            0.00,                0.00,           27.92,                 43.62
-                            0.00,                0.00,            0.00,                 44.13
-                            0.00,                0.00,            0.00,                 44.50
-                            0.00,                0.00,            0.00,                 40.49
-                            0.00,                0.00,            0.00,                 43.88
-                            0.00,                0.00,            0.00,                  0.00
-                            0.00,                0.00,            0.00,                  0.00
-                            0.00,                0.00,            0.00,                  0.00
+;                              1x                          1y                      2x                 2y
+phodo_PosAdcTimeWindowMin =14.95-26.06,               19.62-26.32,             18.68-26.04,          0.00
+                           15.49-26.06,               19.35-26.32,             18.79-26.04,          0.00
+                           19.02-26.06,               20.25-26.32,             18.82-26.04,          35.5-32.97
+                           18.91-26.06,               19.51-26.32,             15.59-26.04,          35.14-32.97
+                           19.43-26.06,               18.65-26.32,             18.45-26.04,          34.87-32.97
+                           18.84-26.06,               18.32-26.32,             18.44-26.04,          34.47-32.97
+                           19.06-26.06,               20.07-26.32,             18.67-26.04,          35.64-32.97
+                           16.14-26.06,               19.18-26.32,             18.05-26.04,          35.07-32.97
+                           18.88-26.06,               18.25-26.32,             18.89-26.04,          34.80-32.97
+                           18.89-26.06,               14.53-26.32,             18.46-26.04,          35.28-32.97
+                           19.43-26.06,               15.66-26.32,             18.89-26.04,          34.95-32.97
+                           19.03-26.06,               18.20-26.32,             19.15-26.04,          32.24-32.97
+                           18.59-26.06,               18.19-26.32,             14.39-26.04,          35.05-32.97
+                            0.00,                      0.00,                   14.84-26.04,          35.43-32.97
+                            0.00,                      0.00,              	 0.00,               35.34-32.97
+                            0.00,                      0.00,              	 0.00,               35.64-32.97
+                            0.00,                      0.00,              	 0.00,               35.55-32.97
+                            0.00,                      0.00,              	 0.00,               35.01-32.97
+                            0.00,                      0.00,              	 0.00,                0.00
+                            0.00,                      0.00,              	 0.00,                0.00
+                            0.00,                      0.00,              	 0.00,                0.00
+
+;                              1x                          1y                       2x                 2y
+phodo_PosAdcTimeWindowMax =30.95-26.06,        	      35.62-26.32,             34.68-26.04,           0.00
+                           31.49-26.06,               35.35-26.32,             34.79-26.04,           0.00
+                           35.02-26.06,               36.25-26.32,             34.82-26.04,           51.59-32.97
+                           34.91-26.06,               35.51-26.32,             31.59-26.04,           51.14-32.97
+                           35.43-26.06,               34.65-26.32,             34.45-26.04,           50.87-32.97
+                           34.84-26.06,               34.32-26.32,             34.44-26.04,           50.47-32.97
+                           35.06-26.06,               36.07-26.32,             34.67-26.04,           51.64-32.97
+                           32.14-26.06,               35.18-26.32,             34.05-26.04,           51.07-32.97
+                           34.88-26.06,               34.25-26.32,             34.89-26.04,           50.80-32.97
+                           34.89-26.06,               30.53-26.32,             34.46-26.04,           51.28-32.97
+                           35.43-26.06,               31.66-26.32,             34.89-26.04,           50.95-32.97
+                           35.03-26.06,               34.20-26.32,             35.15-26.04,           48.24-32.97
+                           34.59-26.06,               34.19-26.32,             30.39-26.04,           51.05-32.97
+                            0.00,                	0.00,                  30.84-26.04,           51.43-32.97
+                            0.00,                	0.00,              	 0.00,                51.34-32.97
+                            0.00,                	0.00,              	 0.00,                51.64-32.97
+                            0.00,                	0.00,              	 0.00,                51.55-32.97
+                            0.00,               	0.00,              	 0.00,                51.01-32.97
+                            0.00,                	0.00,              	 0.00,                0.00
+                            0.00,                	0.00,              	 0.00,                0.00
+                            0.00,                	0.00,              	 0.00,                0.00
+
+;                              1x                          1y                     2x                     2y
+phodo_NegAdcTimeWindowMin =11.33-19.15,               19.47-27.20,           11.71-19.85,               0.00
+                           11.57-19.15,               19.66-27.20,           12.14-19.85,               0.00
+                           12.13-19.15,               20.02-27.20,           11.08-19.85,             29.61-36.33
+                            8.53-19.15,               19.59-27.20,           12.10-19.85,             29.15-36.33
+                            8.31-19.15,               19.35-27.20,           11.18-19.85,             28.90-36.33
+                           11.49-19.15,               18.66-27.20,           12.23-19.85,             28.38-36.33
+                           12.20-19.15,               20.52-27.20,           12.37-19.85,             29.01-36.33
+                           12.08-19.15,               19.34-27.20,           11.64-19.85,             29.16-36.33
+                           12.43-19.15,               19.48-27.20,           11.96-19.85,             28.03-36.33
+                           12.81-19.15,               18.00-27.20,           11.65-19.85,             28.17-36.33
+                            9.33-19.15,               18.85-27.20,           12.25-19.85,             27.52-36.33
+                           12.43-19.15,               17.76-27.20,           12.15-19.85,             27.84-36.33
+                           12.15-19.15,               18.22-27.20,           11.39-19.85,             27.81-36.33
+                            0.00,                	0.00,                11.92-19.85,             27.62-36.33
+                            0.00,                	0.00,                 0.00,                   28.13-36.33
+                            0.00,                	0.00,                 0.00,                   28.50-36.33
+                            0.00,                	0.00,                 0.00,                   24.49-36.33
+                            0.00,                	0.00,                 0.00,                   27.88-36.33
+                            0.00,                	0.00,                 0.00,                   0.00
+                            0.00,                	0.00,                 0.00,                   0.00
+                            0.00,                	0.00,                 0.00,                   0.00
+
+;                              1x                 	   1y                     2x                     2y
+phodo_NegAdcTimeWindowMax =27.33-19.15,               35.47-27.20,           27.71-19.85,              0.00
+                           27.57-19.15,               35.66-27.20,           28.14-19.85,              0.00
+                           28.13-19.15,               36.02-27.20,           27.08-19.85,              45.61-36.33
+                           24.53-19.15,               35.59-27.20,           28.10-19.85,              45.15-36.33
+                           24.31-19.15,               35.35-27.20,           27.18-19.85,              44.90-36.33
+                           27.49-19.15,               34.66-27.20,           28.23-19.85,              44.38-36.33
+                           28.20-19.15,               36.52-27.20,           28.37-19.85,              45.01-36.33
+                           28.08-19.15,               35.34-27.20,           27.64-19.85,              45.16-36.33
+                           28.43-19.15,               35.48-27.20,           27.96-19.85,              44.03-36.33
+                           28.81-19.15,               34.00-27.20,           27.65-19.85,              44.17-36.33
+                           25.33-19.15,               34.85-27.20,           28.25-19.85,              43.52-36.33
+                           28.43-19.15,               33.76-27.20,           28.15-19.85,              43.84-36.33
+                           28.15-19.15,               34.22-27.20,           27.39-19.85,              43.81-36.33
+                            0.00,                	0.00,                27.92-19.85,              43.62-36.33
+                            0.00,                	0.00,                0.00,                     44.13-36.33
+                            0.00,                	0.00,                0.00,                     44.50-36.33
+                            0.00,                	0.00,                0.00,                     40.49-36.33
+                            0.00,                	0.00,                0.00,                     43.88-36.33
+                            0.00,                	0.00,                0.00,                     0.00
+                            0.00,                	0.00,                0.00,                     0.00
+                            0.00,                	0.00,                0.00,                     0.00
 
 ; ;                              1x                   1y                   2x                   2y
 ; phodo_PosAdcTimeWindowMin = -10000.0,            -10000.0,            -10000.0,            -10000.0
diff --git a/PARAM/SHMS/NGCER/pngcer_cuts.param b/PARAM/SHMS/NGCER/pngcer_cuts.param
index 69b02ea8..47bc0e57 100644
--- a/PARAM/SHMS/NGCER/pngcer_cuts.param
+++ b/PARAM/SHMS/NGCER/pngcer_cuts.param
@@ -28,4 +28,7 @@ pngcer_adcTimeWindowMax = 80.0, 80.0, 80.0, 80.0
 ; No cuts
 ; cut variable is P.ngcer.goodAdcTdcDiffTime
 ;pngcer_adcTimeWindowMin = -1000.0, -1000.0, -1000.0, -1000.0
-;pngcer_adcTimeWindowMax = 1000.0, 1000.0, 1000.0, 1000.0
\ No newline at end of file
+;pngcer_adcTimeWindowMax = 1000.0, 1000.0, 1000.0, 1000.0
+
+; Pedestal Defaults from HCANA Update (April 2021)
+pngcer_PedDefault= 2083, 2070, 2033, 1955
-- 
GitLab