diff --git a/DEF-files/SHMS/CAL/pcalana.def b/DEF-files/SHMS/CAL/pcalana.def
index 6e4b19445686d538aa34924a38ed129a0cb6f358..7b1339859c451f45e0fde6007fc8df336ba73e31 100644
--- a/DEF-files/SHMS/CAL/pcalana.def
+++ b/DEF-files/SHMS/CAL/pcalana.def
@@ -66,14 +66,14 @@ TH2F pcal_prshwr_good_raw_pi_vs_pmt_pos 'SHMS PreShower+ Good Raw Pulse Integral
 TH2F pcal_prshwr_good_raw_pi_vs_pmt_neg 'SHMS PreShower- Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseIntRaw 14 0.5 14.5 650 0 32500  P.cal.pr.goodNegAdcPulseIntRaw>0.0
 
 #SHMS PRE-SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS (calib consts (GAIN) are in GeV/ADC units )
-TH2F pcal_prshwr_Epos_vs_pmt 'SHMS PreShower+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.epos 14 0.5 14.5 200 0 2 P.cal.pr.epos>0.0
-TH2F pcal_prshwr_Eneg_vs_pmt 'SHMS PreShower- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.eneg 14 0.5 14.5 200 0 2 P.cal.pr.eneg>0.0
-TH2F pcal_prshwr_Emean_vs_pmt 'SHMS PreShower Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.emean 14 0.5 14.5 300 0 3 P.cal.pr.emean>0.0
+TH2F pcal_prshwr_Epos_vs_pmt 'SHMS PreShower+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.pr.epos 14 0.5 14.5 200 0 2 P.cal.pr.epos>0.0
+TH2F pcal_prshwr_Eneg_vs_pmt 'SHMS PreShower- Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.pr.eneg 14 0.5 14.5 200 0 2 P.cal.pr.eneg>0.0
+TH2F pcal_prshwr_Emean_vs_pmt 'SHMS PreShower Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.pr.emean 14 0.5 14.5 300 0 3 P.cal.pr.emean>0.0
 
 #SHMS ENERGY DEPOSITION in PreShower PLANE
-TH1F pcal_prshwr_Eplane_pos 'SHMS PreShower+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_pos 200 0 2 P.cal.pr.eplane_pos>0.0
-TH1F pcal_prshwr_Eplane_neg 'SHMS PreShower- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_neg 200 0 2 P.cal.pr.eplane_neg>0.0
-TH1F pcal_prshwr_Eplane 'SHMS PreShower Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane 300 0 3 P.cal.pr.eplane>0.0
+TH1F pcal_prshwr_Eplane_pos 'SHMS PreShower+ Energy Deposition; Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_pos 200 0 2 P.cal.pr.eplane_pos>0.0
+TH1F pcal_prshwr_Eplane_neg 'SHMS PreShower- Energy Deposition; Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_neg 200 0 2 P.cal.pr.eplane_neg>0.0
+TH1F pcal_prshwr_Eplane 'SHMS PreShower Total Energy Deposition; Total Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane 300 0 3 P.cal.pr.eplane>0.0
 
 ###########################################################################################
 
@@ -111,12 +111,12 @@ TH2F pcal_shwr_good_ptime_vs_pmt 'SHMS Shower Good Pulse Time vs. PMT Number; PM
 TH2F pcal_shwr_good_raw_pi_vs_pmt 'SHMS Shower Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] P.cal.fly.goodAdcPulseIntRaw 224 0.5 224.5 650 0 32500  P.cal.fly.goodAdcPulseIntRaw>0.0
 
 #SHMS SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS (calib consts (GAIN) are in GeV/ADC units )
-TH2F pcal_shwr_E_vs_pmt 'SHMS Shower Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.fly.e 224 0.5 224.5 300 0 3 P.cal.fly.e>0.0
+TH2F pcal_shwr_E_vs_pmt 'SHMS Shower Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.fly.e 224 0.5 224.5 300 0 3 P.cal.fly.e>0.0
 
 #TOTAL ENERGY DEPOSITION IN THE SHMS SHOWER ARRAY
-TH1F pcal_shwr_Earray 'SHMS Shower Total Energy Deposition in Array; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.fly.earray 600 0 6 P.cal.fly.earray>0.0
+TH1F pcal_shwr_Earray 'SHMS Shower Total Energy Deposition in Array; Tot. Energy Dep. (GeV); Number of Entries / 0.01 GeV' P.cal.fly.earray 600 0 6 P.cal.fly.earray>0.0
 
 #TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
-TH1F pcal_etot 'SHMS Calorimeter Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.etot 500 0 5 P.cal.etot>0.0
-TH1F pcal_etot_norm 'SHMS Calorimeter Total Normalized Energy Deposition; Total Energy Deposition (GeV) / P0 (GeV); Number of Entries / 0.01' P.cal.etotnorm 500 0 5 P.cal.etotnorm>0.0
+TH1F pcal_etot 'SHMS Calorimeter Total Energy Deposition; Tot. Energy Dep. (GeV); Number of Entries / 0.01 GeV' P.cal.etot 500 0 5 P.cal.etot>0.0
+TH1F pcal_etot_norm 'SHMS Calorimeter Total Normalized Energy Deposition; Tot. Energy Dep. (GeV) / P0 (GeV); Number of Entries / 0.01' P.cal.etotnorm 500 0 5 P.cal.etotnorm>0.0
 
diff --git a/DEF-files/SHMS/GEN/pstackana.def b/DEF-files/SHMS/GEN/pstackana.def
index 780bfea9f093bad96564d52296e174f239fcc0b2..b50eceacea06b7da1a5fc546a237b4d6c3c64a8e 100644
--- a/DEF-files/SHMS/GEN/pstackana.def
+++ b/DEF-files/SHMS/GEN/pstackana.def
@@ -511,21 +511,31 @@ TH2F pcal_shwr_good_raw_pi_vs_pmt 'SHMS Shower Good Raw Pulse Integral vs. PMT N
 #SHMS SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS 
 #(calib consts (GAIN) are in GeV/ADC units )
 #--------------------------------------------------
-TH2F pcal_shwr_E_vs_pmt 'SHMS Shower Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.fly.e 224 0.5 224.5 300 0 3 P.cal.fly.e>0.0
+TH2F pcal_shwr_E_vs_pmt 'SHMS Shower Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.fly.e 224 0.5 224.5 300 0 3 P.cal.fly.e>0.0
 
 #-------------------------------------------------
 #TOTAL ENERGY DEPOSITION IN THE SHMS SHOWER ARRAY
 #-------------------------------------------------
-TH1F pcal_shwr_Earray 'SHMS Shower Total Energy Deposition in Array; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.fly.earray 600 0 6 P.cal.fly.earray>0.0
+TH1F pcal_shwr_Earray 'SHMS Shower Total Energy Deposition in Array; Total Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.fly.earray 600 0 6 P.cal.fly.earray>0.0
 
 #-----------------------------------------------------------------
 #SHMS PRE-SHOWER AND SHOWER (CALORIMETER) TOTAL ENERGY DEPOSITION
 #-----------------------------------------------------------------
 #TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
 TH1F pcal_etot 'SHMS Calorimeter Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.etot 500 0 5 P.cal.etot>0.0
-TH1F pcal_etot_norm 'SHMS Calorimeter Total Normalized Energy Deposition; Total Energy Deposition (GeV) / P0 (GeV); Number of Entries / 0.01' P.cal.etotnorm 500 0 5 P.cal.etotnorm>0.0
-TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposition (GeV); Number of Entries / 0.1 GeV' P.cal.etrack 100 0 10 P.cal.etrack>0.0 
-TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Track Energy Deposition (GeV) / Track Momentum, P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0
+TH1F pcal_etot_norm 'SHMS Calorimeter Total Normalized Energy Deposition; Total Energy Deposited (GeV) / P0 (GeV); Number of Entries / 0.01' P.cal.etotnorm 500 0 5 P.cal.etotnorm>0.0
+TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposited (GeV); Number of Entries / 0.1 GeV' P.cal.etrack 100 0 10 P.cal.etrack>0.0 
+TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0
+
+#-------------------------------
+# SHMS PID AND ACCEPTANCE PLOTS
+#-------------------------------
+TH2F hgc_vs_prshw 'SHMS HGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC Total N.P.E. / 0.5' P.cal.pr.eplane P.hgcer.npeSum 300 0 3 40 0 20 P.cal.pr.eplane>0.0&&P.hgcer.npeSum>0.0 
+TH2F ngc_vs_prshw 'SHMS NGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC Total N.P.E. / 0.5' P.cal.pr.eplane P.ngcer.npeSum 300 0 3 40 0 20 P.cal.pr.eplane>0.0&&P.ngcer.npeSum>0.0 
+TH2F pcal_shw_vs_prshw 'Shower vs. PreShower Energy Deposition; PreShower Energy / 0.1 GeV; Shower Energy / 0.1 GeV' P.cal.pr.eplane P.cal.fly.earray 50 0 5 350 0 35  P.cal.pr.eplane>0.0&&P.cal.fly.earray>0.0 
+TH2F delta_vs_etracknorm 'SHMS Delta. vs. Normalized Track Energy; Calorimeter Normalized Track Energy; Momentum Acceptance (%)' P.cal.etracknorm P.gtr.dp 50 0 5 80 -15, 25 P.cal.etracknorm>0.0 
+
+
 
 #********************
 # Trigger Apparatus *
diff --git a/DEF-files/SHMS/HGCER/phgcerana.def b/DEF-files/SHMS/HGCER/phgcerana.def
index f9041490d57b6ac6e01b5ae3763822809118e819..f698c7510d06dd1343a02632e89710e6e7eb0253 100644
--- a/DEF-files/SHMS/HGCER/phgcerana.def
+++ b/DEF-files/SHMS/HGCER/phgcerana.def
@@ -7,36 +7,36 @@ block T.shms.*
 TH2F phgcer_adcErrFlg2D 'SHMS Heavy Gas Cherenkov FPGA Error Flag; PMT Number; Error Flag' P.hgcer.adcCounter P.hgcer.adcErrorFlag 4 0.5 4.5 2 -0.5 1.5
 
 #SHMS HGC RAW Occupancy and Multiplicity
-TH1F phgcer_raw_occ 'SHMS Heavy Gas Cherenkov Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.hgcer.adcCounter 4 0.5 4.5
-TH1F phgcer_raw_mult 'SHMS Heavy Gas Cherenkov Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.hgcer.totNumAdcHits 4 0.5 4.5
+#TH1F phgcer_raw_occ 'SHMS Heavy Gas Cherenkov Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.hgcer.adcCounter 4 0.5 4.5
+#TH1F phgcer_raw_mult 'SHMS Heavy Gas Cherenkov Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.hgcer.totNumAdcHits 4 0.5 4.5
 
 
 #SHMS HGC GOOD Occupancy and Multiplicity
-TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Number Good ADC Hits' P.hgcer.numGoodAdcHits 4 0.5 4.5
-TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
+#TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Number Good ADC Hits' P.hgcer.numGoodAdcHits 4 0.5 4.5
+#TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
 
 #SHMS HGC TOTAL NUMBER OF P.E.
-TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 200 0 100 P.hgcer.npeSum>0.0 
+#TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 200 0 100 P.hgcer.npeSum>0.0 
 
 #SHMS HGC Number of P.E. / PMT
-TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.hgcer.npe 4 0.5 4.5 200 0 100 P.hgcer.npe>0.0 
+#TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.hgcer.npe 4 0.5 4.5 200 0 100 P.hgcer.npe>0.0 
 
 #SHMS HGC RAW Pulse Pedestal / Integral  / Amplitude / Time
-TH2F phgcer_raw_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' P.hgcer.adcCounter P.hgcer.adcPedRaw 4 0.5 4.5 10000 0 10000
-TH2F phgcer_raw_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseIntRaw 4 0.5 4.5 650 0 32500
-TH2F phgcer_raw_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseAmpRaw 4 0.5 4.5 410 0 8200
-TH2F phgcer_raw_ptime_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Time vs. PMT Number; PMT Number;  Raw Pulse Time / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseTimeRaw 4 0.5 4.5 650 0 6500
+#TH2F phgcer_raw_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' P.hgcer.adcCounter P.hgcer.adcPedRaw 4 0.5 4.5 10000 0 10000
+#TH2F phgcer_raw_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseIntRaw 4 0.5 4.5 650 0 32500
+#TH2F phgcer_raw_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseAmpRaw 4 0.5 4.5 410 0 8200
+#TH2F phgcer_raw_ptime_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Time vs. PMT Number; PMT Number;  Raw Pulse Time / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseTimeRaw 4 0.5 4.5 650 0 6500
 
 #SHMS HGC Pulse Pedestal / Integral  / Amplitude 
-TH2F phgcer_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. PMT Number; PMT Number;  Pulse Pedestal / 1 ADC Units' P.hgcer.adcCounter P.hgcer.adcPed 4 0.5 4.5 400 300 700
-TH2F phgcer_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Integral vs. PMT Number; PMT Number;  Pulse Integral / 50 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseInt 4 0.5 4.5 600 0 30000
-TH2F phgcer_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Amplitude vs. PMT Number; PMT Number;  Pulse Amplitude / 20 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseAmp 4 0.5 4.5 400 0 8000
+#TH2F phgcer_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. PMT Number; PMT Number;  Pulse Pedestal / 1 ADC Units' P.hgcer.adcCounter P.hgcer.adcPed 4 0.5 4.5 400 300 700
+#TH2F phgcer_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Integral vs. PMT Number; PMT Number;  Pulse Integral / 50 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseInt 4 0.5 4.5 600 0 30000
+#TH2F phgcer_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Amplitude vs. PMT Number; PMT Number;  Pulse Amplitude / 20 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseAmp 4 0.5 4.5 400 0 8000
 
 #SHMS HGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time :: GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window) 
-TH2F phgcer_good_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.hgcer.goodAdcPed 4 0.5 4.5 400 300 700
-TH2F phgcer_good_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.hgcer.goodAdcPulseInt 4 0.5 4.5 600 0 30000 P.hgcer.goodAdcPulseInt>0.0
-TH2F phgcer_good_rawpi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I+1] P.hgcer.goodAdcPulseIntRaw 4 0.5 4.5 600 0 30000 P.hgcer.goodAdcPulseIntRaw>0.0
-TH2F phgcer_good_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.hgcer.goodAdcPulseAmp 4 0.5 4.5 200 0 4000 P.hgcer.goodAdcPulseAmp>0.0
-TH2F phgcer_good_ptime_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.hgcer.goodAdcPulseTime 4 0.5 4.5 350 0 3500 P.hgcer.goodAdcPulseTime>0.0
+#TH2F phgcer_good_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.hgcer.goodAdcPed 4 0.5 4.5 400 300 700
+#TH2F phgcer_good_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.hgcer.goodAdcPulseInt 4 0.5 4.5 600 0 30000 P.hgcer.goodAdcPulseInt>0.0
+#TH2F phgcer_good_rawpi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I+1] P.hgcer.goodAdcPulseIntRaw 4 0.5 4.5 600 0 30000 P.hgcer.goodAdcPulseIntRaw>0.0
+#TH2F phgcer_good_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.hgcer.goodAdcPulseAmp 4 0.5 4.5 200 0 4000 P.hgcer.goodAdcPulseAmp>0.0
+#TH2F phgcer_good_ptime_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.hgcer.goodAdcPulseTime 4 0.5 4.5 350 0 3500 P.hgcer.goodAdcPulseTime>0.0
 
 
diff --git a/onlineGUI/Config/SHMS/GEN/shms_stack.cfg b/onlineGUI/Config/SHMS/GEN/shms_stack.cfg
index 433d8835511067cb764eeb3b6d722105140a9c8f..75832c18bc0e4f97826377e16be84040bc09ad54 100644
--- a/onlineGUI/Config/SHMS/GEN/shms_stack.cfg
+++ b/onlineGUI/Config/SHMS/GEN/shms_stack.cfg
@@ -4,17 +4,17 @@ guicolor orange
 canvassize 1600 800
 #canvassize 800 800
 newpage 2 1
-title SHMS NGC Good Occupancy/Multiplicity
+title SHMS NGC Good Occ./Mult.
 pngcer_good_occ -nostat
 pngcer_good_mult -nostat
 newpage 2 2 logz
-title SHMS NGC Good Pulse Pedestals/Amplitudes/Integrals/Times
+title SHMS NGC Good Pulse Profile
 pngcer_good_pped_vs_pmt -nostat
 pngcer_good_pamp_vs_pmt -nostat
 pngcer_good_pi_vs_pmt -nostat
 pngcer_good_ptime_vs_pmt -nostat
 newpage 2 1 logz
-title SHMS NGC Number of PhotoElectrons (PID)
+title SHMS NGC N.P.E. (PID)
 pngcer_npe -nostat
 pngcer_tot_npe -nostat
 newpage 6 2
@@ -32,7 +32,7 @@ pdc2x1_wirenum -nostat
 pdc2u2_wirenum -nostat
 pdc2u1_wirenum -nostat
 newpage 6 2 
-title SHMS DC Drift Time Per Plane
+title SHMS DC Drift Plane Times
 pdc1u1_drifttime -nostat
 pdc1u2_drifttime -nostat
 pdc1x1_drifttime -nostat
@@ -60,7 +60,7 @@ pdc2x1_drifttime_vs_wirenum -nostat
 pdc2u2_drifttime_vs_wirenum -nostat
 pdc2u1_drifttime_vs_wirenum -nostat
 newpage 6 2 
-title SHMS DC Drift Distance Per Plane
+title SHMS DC Plane Drift Distance
 pdc1u1_ddist -nostat
 pdc1u2_ddist -nostat
 pdc1x1_ddist -nostat
@@ -89,7 +89,7 @@ pdc2u2_wirenum_vs_ddist -nostat
 pdc2u1_wirenum_vs_ddist -nostat
 
 newpage 6 2 
-title SHMS DC Residuals Per Plane
+title SHMS DC Plane Residuals
 pdc1u1_residuals -nostat
 pdc1u2_residuals -nostat
 pdc1x1_residuals -nostat
@@ -117,30 +117,30 @@ pdc2x1_residuals_vs_wirenum -nostat
 pdc2u2_residuals_vs_wirenum -nostat
 pdc2u1_residuals_vs_wirenum -nostat
 newpage 1 1 logz
-title SHMS DC X vs. Y at Focal Plane
+title SHMS DC X vs. Y at F.P.
 pdc_xfp_vs_yxp -nostat
 newpage 1 1 logz
-title SHMS DC Xp (theta) vs. Yp(phi) at Focal Plane
+title SHMS DC Xp vs. Yp at F.P.
 pdc_xfpp_vs_yfpp -nostat
 
 newpage 2 1
-title SHMS HGC Good Occupancy/Multiplicity
+title SHMS HGC Good Occ./Mult.
 phgcer_good_occ -nostat
 phgcer_good_mult -nostat
 newpage 2 2 logz
-title SHMS HGC Good Pulse Pedestals/Amplitudes/Integrals/Times
+title SHMS HGC Good Pulse Profile
 phgcer_good_pped_vs_pmt -nostat
 phgcer_good_pamp_vs_pmt -nostat
 phgcer_good_pi_vs_pmt -nostat
 phgcer_good_ptime_vs_pmt -nostat
 newpage 2 1 logz
-title SHMS HGC Number of PhotoElectrons (PID)
+title SHMS HGC N.P.E. (PID)
 phgcer_npe -nostat
 phgcer_tot_npe -nostat
 
 
 newpage 4 2 
-title SHMS Hodo Good ADC Occupancy
+title SHMS Hodo Good ADC Occ.
 phodo_1x_good_adc_occ_pos -nostat
 phodo_1x_good_adc_occ_neg -nostat
 phodo_1y_good_adc_occ_pos -nostat
@@ -150,7 +150,7 @@ phodo_2x_good_adc_occ_neg -nostat
 phodo_2y_good_adc_occ_pos -nostat
 phodo_2y_good_adc_occ_neg -nostat
 newpage 3 4 
-title SHMS Hodo Good ADC Multiplicity
+title SHMS Hodo Good ADC Mult.
 phodo_1x_good_adc_mult_pos -nostat
 phodo_1x_good_adc_mult_neg -nostat
 phodo_1x_good_adc_mult -nostat
@@ -165,7 +165,7 @@ phodo_2y_good_adc_mult_neg -nostat
 phodo_2y_good_adc_mult -nostat
 
 newpage 4 2 
-title SHMS Hodo Good TDC Occupancy
+title SHMS Hodo Good TDC Occ.
 phodo_1x_good_tdc_occ_pos -nostat
 phodo_1x_good_tdc_occ_neg -nostat
 phodo_1y_good_tdc_occ_pos -nostat
@@ -175,7 +175,7 @@ phodo_2x_good_tdc_occ_neg -nostat
 phodo_2y_good_tdc_occ_pos -nostat
 phodo_2y_good_tdc_occ_neg -nostat
 newpage 3 4
-title SHMS Hodo Good TDC Multiplicity
+title SHMS Hodo Good TDC Mult.
 phodo_1x_good_tdc_mult_pos -nostat
 phodo_1x_good_tdc_mult_neg -nostat
 phodo_1x_good_tdc_mult -nostat
@@ -190,7 +190,7 @@ phodo_2y_good_tdc_mult_neg -nostat
 phodo_2y_good_tdc_mult -nostat
 
 newpage 4 2 logz
-title SHMS Hodo Good Pulse Pedestals
+title SHMS Hodo Good Pulse Ped.
 phodo_1x_good_pped_vs_pmt_pos -nostat
 phodo_1x_good_pped_vs_pmt_neg -nostat
 phodo_1y_good_pped_vs_pmt_pos -nostat
@@ -201,7 +201,7 @@ phodo_2y_good_pped_vs_pmt_pos -nostat
 phodo_2y_good_pped_vs_pmt_neg -nostat
 
 newpage 4 2 logz
-title SHMS Hodo Good Pulse Integrals
+title SHMS Hodo Good Pulse Int.
 phodo_1x_good_pi_vs_pmt_pos -nostat
 phodo_1x_good_pi_vs_pmt_neg -nostat
 phodo_1y_good_pi_vs_pmt_pos -nostat
@@ -212,7 +212,7 @@ phodo_2y_good_pi_vs_pmt_pos -nostat
 phodo_2y_good_pi_vs_pmt_neg -nostat
 
 newpage 4 2 logz
-title SHMS Hodo Pulse Amplitudes
+title SHMS Hodo Pulse Amp.
 phodo_1x_good_pamp_vs_pmt_pos -nostat
 phodo_1x_good_pamp_vs_pmt_neg -nostat
 phodo_1y_good_pamp_vs_pmt_pos -nostat
@@ -268,23 +268,23 @@ title SHMS Hodo Beta (PID)
 phodo_beta -nostat
 
 newpage 2 1
-title SHMS Aerogel Cherenkov Good Occupancy 
+title SHMS Aerogel Cherenkov Good Occ. 
 paero_good_occ_pos 
 paero_good_occ_neg 
 newpage 3 1
-title SHMS Aerogel Cherenkov Good Multiplicity
+title SHMS Aerogel Cherenkov Good Mult.
 paero_good_mult_pos 
 paero_good_mult_neg 
 paero_good_mult 
 newpage 3 2 logz
-title SHMS Aerogel Number of Photoelectrons (PID)
+title SHMS Aerogel N.P.E (PID)
 paero_tot_npe_pos -nostat
 paero_tot_npe_neg -nostat
 paero_tot_npe -nostat
 paero_npe_pos -nostat
 paero_npe_neg -nostat
 newpage 4 2 logz
-title SHMS Aerogel Good Pulse Pedestals/Amplitudes/Integrals/Times
+title SHMS Aerogel Good Pulse Profile
 paero_good_pped_vs_pmt_pos -nostat
 paero_good_pped_vs_pmt_neg -nostat
 paero_good_pamp_vs_pmt_pos -nostat
@@ -296,16 +296,16 @@ paero_good_ptime_vs_pmt_neg -nostat
 
 
 newpage 2 1
-title SHMS Pre-Shower Good Occupancy
+title SHMS PreSH Good Occ.
 pcal_prshwr_good_occ_pos -nostat
 pcal_prshwr_good_occ_neg -nostat
 newpage 3 1
-title SHMS Pre-Shower Good Multiplicity
+title SHMS PreSH Good Mult.
 pcal_prshwr_good_mult_pos -nostat
 pcal_prshwr_good_mult_neg -nostat
 pcal_prshwr_good_mult -nostat
 newpage 4 2 logz
-title SHMS Pre-Shower Good Pulse Pedestals/Amplitudes/Integrals/Times
+title SHMS PreSH Good Pulse Profile
 pcal_prshwr_good_pped_vs_pmt_pos -nostat
 pcal_prshwr_good_pped_vs_pmt_neg -nostat
 pcal_prshwr_good_pamp_vs_pmt_pos -nostat
@@ -315,23 +315,23 @@ pcal_prshwr_good_pi_vs_pmt_neg -nostat
 pcal_prshwr_good_ptime_vs_pmt_pos -nostat
 pcal_prshwr_good_ptime_vs_pmt_neg -nostat
 newpage 3 1 logz
-title SHMS Pre-Shower Energy Deposition Per PMT
+title SHMS PreSH Energy Dep. / PMT
 pcal_prshwr_Epos_vs_pmt -nostat
 pcal_prshwr_Eneg_vs_pmt -nostat
 pcal_prshwr_Emean_vs_pmt -nostat
 newpage 3 1
-title SHMS Pre-Shower Total Energy Deposition 
+title SHMS PreSH Tot. Energy Dep. 
 pcal_prshwr_Eplane_pos -nostat
 pcal_prshwr_Eplane_neg -nostat
 pcal_prshwr_Eplane -nostat
 
 newpage 2 1
-title SHMS Shower Good Occupancy/Multiplicity
+title SHMS Shower Good Occ./Mult.
 pcal_shwr_good_occ -nostat
 pcal_shwr_good_mult -nostat
 
 newpage 2 2 logz
-title SHMS Shower Good Pulse Pedestals/Amplitudes/Integrals/Times
+title SHMS Shower Good Pulse Profile
 pcal_shwr_good_pped_vs_pmt -nostat
 pcal_shwr_good_pamp_vs_pmt -nostat
 pcal_shwr_good_pi_vs_pmt -nostat
@@ -343,17 +343,22 @@ pcal_shwr_E_vs_pmt -nostat
 pcal_shwr_Earray -nostat
 
 newpage 2 1
-title SHMS Calorimeter Normalized Energy (PID)
+title SHMS Calo Energy Dep. (PID)
 pcal_etot -nostat
 pcal_etot_norm -nostat
 
 newpage 2 1
-title SHMS Calorimeter Normalized Track Energy (PID)
+title SHMS Calo Track Energy Dep. (PID)
 pcal_etrack -nostat
 pcal_etracknorm -nostat
 
+newpage 2 2 logz
+title SHMS PID/Acc. Histos
+hgc_vs_prshw
+ngc_vs_prshw
+pcal_shw_vs_prshw
+delta_vs_etracknorm
 
-newpage 2 1
 newpage 3 3 logy
 title SHMS Trigger Times
 ptrig_p1x_tdc
@@ -365,3 +370,4 @@ ptrig_p2T_tdc
 ptrig_pT1_tdc
 ptrig_pT2_tdc
 ptrig_pT3_tdc
+