diff --git a/DEF-files/SHMS/HGCER/phgcerana.def b/DEF-files/SHMS/HGCER/phgcerana.def
index 9fb8e883fb763108b916d4e4fa65c09eb9e53406..b07a7d8df25012fa8ef4d2cd98616960f00389c0 100644
--- a/DEF-files/SHMS/HGCER/phgcerana.def
+++ b/DEF-files/SHMS/HGCER/phgcerana.def
@@ -4,31 +4,30 @@ block P.hgcer.*
 block T.shms.*
 
 #1D HISTOGRAMS
-TH1F phgcer_raw_occ 'SHMS Heavy Gas Cherenkov Raw Occupancy; Counter Number; Number of Entries' P.hgcer.adcCounter 4 0.5 4.5
-TH1F phgcer_adcErrFlg 'SHMS Heavy Gas Cherenkov Error Flag for When FPGA Fails; Error Flag; Number of Entries' P.hgcer.adcErrorFlag 22 -0.1 1.2
-TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Number of Good ADC Hits Per PMT; Number of Good ADC Hits / PMT; Number of Entries' P.hgcer.numGoodAdcHits 4 0.5 4.5
-TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Total Number of Good ADC Hits; Total Number of Good ADC Hits; Number of Entries' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
-TH1F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons Per PMT; Number of Photoelectrons / PMT; Number of Entries' P.hgcer.npe 4 0.5 4.5 
-TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries' P.hgcer.npeSum 4 0.5 4.5 
+TH1F phgcer_raw_occ 'SHMS Heavy Gas Cherenkov Raw Occupancy; PMT Number; Number of Entries' P.hgcer.adcCounter 4 0.5 4.5
+TH1F phgcer_adcErrFlg 'SHMS Heavy Gas Cherenkov FPGA Error Flag; Error Flag; Number of Entries' P.hgcer.adcErrorFlag 2 -0.5 1.5
+TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Number of Entries' P.hgcer.numGoodAdcHits 4 0.5 4.5
+TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Total Number of Good ADC Hits; Number of Entries' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
+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 
 
-#2D HISTOGRAMS
-TH2F phgcer_goodped_vs_cntr 'SHMS Heavy Gas Cherenkov Good Pulse Pedestal vs. Counter Number; Counter Number; Raw Pulse Pedestal / 10 ADC Units' [I] P.hgcer.goodAdcPed 4 -0.5 3.5 1000 0 10000
-TH2F phgcer_goodpi_vs_cntr 'SHMS Heavy Gas Cherenkov Good Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.hgcer.goodAdcPulseInt 4 -0.5 3.5 4000 0 40000
-TH2F phgcer_goodrawpi_vs_cntr 'SHMS Heavy Gas Cherenkov Good Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.hgcer.goodAdcPulseIntRaw 4 -0.5 3.5 4000 0 40000
-TH2F phgcer_goodamp_vs_cntr 'SHMS Heavy Gas Cherenkov Good Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' [I] P.hgcer.goodAdcPulseAmp 4 -0.5 3.5 410 0 4100
-TH2F phgcer_goodptime_vs_cntr 'SHMS Heavy Gas Cherenkov Good Pulse Time vs. Counter Number; Counter Number;  Raw Pulse Time / 10 ADC Units' [I] P.hgcer.goodAdcPulseTime 4 -0.5 3.5 1000 0 10000
+#2D HISTOGRAMS  
+TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I] P.hgcer.npe 4 -0.5 3.5 200 0 100 P.hgcer.npe>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] P.hgcer.goodAdcPed 4 -0.5 3.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] P.hgcer.goodAdcPulseInt 4 -0.5 3.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] P.hgcer.goodAdcPulseIntRaw 4 -0.5 3.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] P.hgcer.goodAdcPulseAmp 4 -0.5 3.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] P.hgcer.goodAdcPulseTime 4 -0.5 3.5 350 0 3500 P.hgcer.goodAdcPulseTime > 0.0
 
 
 #1D Histos for Debugging 
-TH1F phgcer_occ 'SHMS Heavy Gas Cherenkov ADC Hits Per PMT; Number of ADC Hits / PMT; Number of Entries' P.hgcer.numAdcHits 4 0.5 4.5
-TH1F phgcer_mult 'SHMS Heavy Gas Cherenkov Total Number of ADC Hits; Total Number of ADC Hits; Number of Entries' P.hgcer.totNumAdcHits 4 0.5 4.5
+TH1F phgcer_mult 'SHMS Heavy Gas Cherenkov Raw Multiplicity; Total Number of ADC Hits; Number of Entries' P.hgcer.totNumAdcHits 4 0.5 4.5
 
 #2d Histos for Debugging 
-TH2F phgcer_rawped_vs_cntr 'SHMS Heavy Gas Cherenkov Raw Pulse Pedestal vs. Counter Number; Counter Number; Raw Pulse Pedestal / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPedRaw 4 0.5 4.5 1000 0 10000
-TH2F phgcer_rawpi_vs_cntr 'SHMS Heavy Gas Cherenkov Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseIntRaw 4 0.5 4.5 4000 0 40000
-TH2F phgcer_rawamp_vs_cntr 'SHMS Heavy Gas Cherenkov Raw Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseAmpRaw 4 0.5 4.5 410 0 4100
-TH2F phgcer_rawptime_vs_cntr 'SHMS Heavy Gas Cherenkov Raw Pulse Time vs. Counter Number; Counter Number;  Raw Pulse Time / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseTimeRaw 4 0.5 4.5 1000 0 10000
-TH2F phgcer_ped_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number;  Pulse Pedestal / 1 ADC Units' P.hgcer.adcCounter P.hgcer.adcPed 4 0.5 4.5 1000 0 1000
-TH2F phgcer_pi_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Integral vs. Counter Number; Counter Number;  Pulse Integral / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseInt 4 0.5 4.5 4000 0 40000
-TH2F phgcer_amp_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Amplitude vs. Counter Number; Counter Number;  Pulse Amplitude / 1 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseAmp 4 0.5 4.5 4100 0 4100
+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_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