diff --git a/DEF-files/SHMS/AERO/paeroana.def b/DEF-files/SHMS/AERO/paeroana.def
index 837ecf30e40b597d92e05fff7b7d03dbd85a228c..1c21cfaa7a1d1c522b9aaf4854b3a4dd850c47b8 100644
--- a/DEF-files/SHMS/AERO/paeroana.def
+++ b/DEF-files/SHMS/AERO/paeroana.def
@@ -3,19 +3,61 @@
 block P.aero.*
 block T.shms.*
 
-TH1F paero_neg_occu 'SHMS Aero- Occupancy; Counter Number; Number of Entries' P.aero.negAdcCounter 7 0.5 7.5
-TH1F paero_pos_occu 'SHMS Aero+ Occupancy; Counter Number; Number of Entries' P.aero.posAdcCounter 7 0.5 7.5
-
-TH2F paero_neg_rawamp_vs_cntr 'SHMS Aero- Raw Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' [I]  P.aero.goodNegAdcPulseAmpRaw 7 -0.5 7.5 410 0 4100
-TH2F paero_neg_ped_vs_cntr 'SHMS Aero- Pulse Pedestal vs. Counter Number; Counter Number;  Pulse Pedestal / 10 ADC Units' [I] P.aero.goodNegAdcPed 7 -0.5 7.5 1000 0 10000
-TH2F paero_neg_rawpi_vs_cntr 'SHMS Aero- Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.aero.goodNegAdcPulseIntRaw 7 -0.5 7.5 4000 0 40000
-TH2F paero_neg_pi_vs_cntr 'SHMS Aero- Pulse Integral vs. Counter Number; Counter Number;  Pulse Integral / 10 ADC Units' [I] P.aero.goodNegAdcPulseInt 7 -0.5 7.5 4000 0 40000
-TH2F paero_neg_amp_vs_cntr 'SHMS Aero- Pulse Amplitude vs. Counter Number; Counter Number;  Pulse Amplitude / 10 ADC Units' [I] P.aero.goodNegAdcPulseAmp 7 -0.5 7.5 410 0 4100
-TH2F paero_neg_rawptime_vs_cntr 'SHMS Aero- Pulse Time vs. Counter Number; Counter Number;  Raw Pulse Time / 10 ADC Units' [I]  P.aero.negAdcPulseTime 7 -0.5 7.5 1000 0 10000
-
-
-TH2F paero_pos_ped_vs_cntr 'SHMS Aero+ Pulse Pedestal vs. Counter Number; Counter Number;  Pulse Pedestal / 10 ADC Units' [I] P.aero.goodPosAdcPed 7 -0.5 7.5 1000 0 10000
-TH2F paero_pos_rawpi_vs_cntr 'SHMS Aero+ Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.aero.goodPosAdcPulseIntRaw 7 -0.5 7.5 4000 0 40000
-TH2F paero_pos_pi_vs_cntr 'SHMS Aero+ Pulse Integral vs. Counter Number; Counter Number;  Pulse Integral / 10 ADC Units' [I] P.aero.goodPosAdcPulseInt 7 -0.5 7.5 4000 0 40000
-TH2F paero_pos_amp_vs_cntr 'SHMS Aero+ Pulse Amplitude vs. Counter Number; Counter Number;  Pulse Amplitude / 10 ADC Units' [I] P.aero.goodPosAdcPulseAmp 7 -0.5 7.5 410 0 4100
-TH2F paero_pos_rawptime_vs_cntr 'SHMS Aero+ Raw Pulse Time vs. Counter Number; Counter Number;  Raw Pulse Time / 10 ADC Units' [I] P.aero.goodNegAdcPulseTime 7 -0.5 7.5 1000 0 10000
+#1D Histograms
+TH1F paero_adcErrFlg_pos 'SHMS Aero+ FPGA Error Flag; Error Flag; Number of Entries' P.aero.posAdcErrorFlag 2 -0.5 1.5
+TH1F paero_adcErrFlg_neg 'SHMS Aero- FPGA Error Flag; Error Flag; Number of Entries' P.aero.negAdcErrorFlag 2 -0.5 1.5
+
+TH1F paero_raw_occ_pos 'SHMS Aero+ Raw Occupancy; PMT Number; Number of Entries' P.aero.posAdcCounter 7 0.5 7.5
+TH1F paero_raw_occ_neg 'SHMS Aero- Raw Occupancy; PMT Number; Number of Entries' P.aero.negAdcCounter 7 0.5 7.5
+
+TH1F paero_good_occ_pos 'SHMS Aero+ Good Occupancy; PMT Number; Number of Entries' P.aero.numGoodPosAdcHits 7 0.5 7.5
+TH1F paero_good_occ_neg 'SHMS Aero- Good Occupancy; PMT Number; Number of Entries' P.aero.numGoodNegAdcHits 7 0.5 7.5
+
+TH1F paero_good_mult_pos 'SHMS Aero+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' P.aero.totNumGoodPosAdcHits 7 0.5 7.5
+TH1F paero_good_mult_neg 'SHMS Aero- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' P.aero.totNumGoodNegAdcHits 7 0.5 7.5
+TH1F paero_good_mult 'SHMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' P.aero.totnumGoodAdcHits 14 0.5 14.5
+
+TH1F paero_tot_npe_pos 'SHMS Aero+ Total Number of Photoelectrons; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.posNpeSum 200 0 100 P.aero.posNpeSum>0.0 
+TH1F paero_tot_npe_neg 'SHMS Aero- Total Number of Photoelectrons; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.negNpeSum 200 0 100 P.aero.negNpeSum>0.0 
+TH1F paero_tot_npe 'SHMS Aero Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.npeSum 200 0 100 P.aero.npeSum>0.0 
+
+#2D HISTOGRAMS
+TH2F paero_npe_pos 'SHMS Aero+ Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I] P.aero.posNpe 7 -0.5 6.5 200 0 100 P.aero.posNpe>0.0 
+TH2F paero_npe_neg 'SHMS Aero- Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I] P.aero.negNpe 7 -0.5 6.5 200 0 100 P.aero.negNpe>0.0 
+
+TH2F paero_good_pped_vs_pmt_pos 'SHMS Aero+ Good Pulse Pedestal vs. PMT Number; PMT Number;  Pulse Pedestal / 1 ADC Units' [I] P.aero.goodPosAdcPed 7 -0.5 6.5 400 300 700  P.aero.goodPosAdcPed>0.0
+TH2F paero_good_pi_vs_pmt_pos 'SHMS Aero+ Good Pulse Integral vs. PMT Number; PMT Number;  Pulse Integral / 50 ADC Units' [I] P.aero.goodPosAdcPulseInt 7 -0.5 6.5 600 0 30000 P.aero.goodPosAdcPulseInt>0.0
+TH2F paero_good_raw_pi_vs_pmt_pos 'SHMS Aero+ Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I] P.aero.goodPosAdcPulseIntRaw 7 -0.5 6.5 600 0 30000 P.aero.goodPosAdcPulseIntRaw>0.0
+TH2F paero_good_pamp_vs_pmt_pos 'SHMS Aero+ Good Pulse Amplitude vs. PMT Number; PMT Number;  Pulse Amplitude / 20 ADC Units' [I] P.aero.goodPosAdcPulseAmp 7 -0.5 6.5 200 0 4000 P.aero.goodPosAdcPulseAmp>0.0
+TH2F paero_good_ptime_vs_pmt_pos 'SHMS Aero+ Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I] P.aero.goodPosAdcPulseTime 7 -0.5 6.5 350 0 3500 P.aero.goodPosAdcPulseTime>0.0
+
+TH2F paero_good_pped_vs_pmt_neg 'SHMS Aero- Good Pulse Pedestal vs. PMT Number; PMT Number;  Pulse Pedestal / 1 ADC Units' [I] P.aero.goodNegAdcPed 7 -0.5 6.5 400 300 700 P.aero.goodNegAdcPed>0.0
+TH2F paero_good_raw_pi_vs_pmt_neg 'SHMS Aero- Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I] P.aero.goodNegAdcPulseIntRaw 7 -0.5 6.5 600 0 30000 P.aero.goodNegAdcPulseIntRaw>0.0
+TH2F paero_good_pi_vs_pmt_neg 'SHMS Aero- Good Pulse Integral vs. PMT Number; PMT Number;  Pulse Integral / 50 ADC Units' [I] P.aero.goodNegAdcPulseInt 7 -0.5 6.5 600 0 30000 P.aero.goodNegAdcPulseInt>0.0
+TH2F paero_good_pamp_vs_pmt_neg 'SHMS Aero- Good Pulse Amplitude vs. PMT Number; PMT Number;  Pulse Amplitude / 20 ADC Units' [I] P.aero.goodNegAdcPulseAmp 7 -0.5 6.5 200 0 4000 P.aero.goodNegAdcPulseAmp>0.0
+TH2F paero_good_ptime_vs_pmt_neg 'SHMS Aero- Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I] P.aero.goodNegAdcPulseTime 7 -0.5 6.5 350 0 3500 P.aero.goodNegAdcPulseTime>0.0
+
+
+#1D HISTOGRAMS FOR DEBUGGING
+TH1F paero_raw_mult_pos 'SHMS Aero+ Raw Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits / PMT' P.aero.totNumPosAdcHits 7 0.5 7.5
+TH1F paero_raw_mult_neg 'SHMS Aero- Raw Multiplicity; Number of PMTs Hit; Total Number of Raw -ADC Hits / PMT; Number of Entries' P.aero.totNumNegAdcHits 7 0.5 7.5
+TH1F paero_raw_mult 'SHMS Aero Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits / PMT' P.aero.totnumAdcHits 14 0.5 14.5
+
+#2D HISTOGRAMS DEBUGGING
+TH2F paero_raw_pped_vs_pmt_pos 'SHMS Aero+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units'  P.aero.posAdcCounter P.aero.posAdcPedRaw 7 0.5 7.5 10000 0 10000
+TH2F paero_raw_pi_vs_pmt_pos 'SHMS Aero+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseIntRaw 7 0.5 7.5 650 0 32500
+TH2F paero_raw_pamp_vs_pmt_pos 'SHMS Aero+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseAmpRaw 7 0.5 7.5 410 0 8200
+TH2F paero_raw_ptime_vs_pmt_pos 'SHMS Aero+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseTimeRaw 7 0.5 7.5 650 0 6500
+
+TH2F paero_pped_vs_pmt_pos 'SHMS Aero+ Pulse Pedestal vs. PMT Number; PMT Number;  Pulse Pedestal / 1 ADC Units' P.aero.posAdcCounter P.aero.posAdcPed 7 0.5 7.5 400 300 700
+TH2F paero_pi_vs_pmt_pos 'SHMS Aero+ Pulse Integral vs. PMT Number; PMT Number;  Pulse Integral / 50 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseInt 7 0.5 7.5 600 0 30000
+TH2F paero_pamp_vs_pmt_pos 'SHMS Aero+ Pulse Amplitude vs. PMT Number; PMT Number;  Pulse Amplitude / 20 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseAmp 7 0.5 7.5 400 0 8000
+
+TH2F paero_raw_pped_vs_pmt_neg 'SHMS Aero- Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units'  P.aero.negAdcCounter P.aero.negAdcPedRaw 7 0.5 7.5 10000 0 10000
+TH2F paero_raw_pi_vs_pmt_neg 'SHMS Aero- Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseIntRaw 7 0.5 7.5 650 0 32500
+TH2F paero_raw_pamp_vs_pmt_neg 'SHMS Aero- Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseAmpRaw 7 0.5 7.5 410 0 8200
+TH2F paero_raw_ptime_vs_pmt_neg 'SHMS Aero- Raw Pulse Time vs. PMT Number; PMT Number;  Raw Pulse Time / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseTimeRaw 7 0.5 7.5 650 0 6500
+
+TH2F paero_pped_vs_pmt_neg 'SHMS Aero- Pulse Pedestal vs. PMT Number; PMT Number;  Pulse Pedestal / 1 ADC Units' P.aero.negAdcCounter P.aero.negAdcPed 7 0.5 7.5 400 300 700
+TH2F paero_pi_vs_pmt_neg 'SHMS Aero- Pulse Integral vs. PMT Number; PMT Number;  Pulse Integral / 50 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseInt 7 0.5 7.5 600 0 30000
+TH2F paero_pamp_vs_pmt_neg 'SHMS Aero- Pulse Amplitude vs. PMT Number; PMT Number;  Pulse Amplitude / 20 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseAmp 7 0.5 7.5 400 0 8000
diff --git a/DEF-files/SHMS/HGCER/phgcerana.def b/DEF-files/SHMS/HGCER/phgcerana.def
index b07a7d8df25012fa8ef4d2cd98616960f00389c0..e7d3a5cc5ded1282776b13e690d5766699c13dca 100644
--- a/DEF-files/SHMS/HGCER/phgcerana.def
+++ b/DEF-files/SHMS/HGCER/phgcerana.def
@@ -7,20 +7,20 @@ block T.shms.*
 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_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' 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_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
+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_mult 'SHMS Heavy Gas Cherenkov Raw Multiplicity; Total Number of ADC Hits; Number of Entries' P.hgcer.totNumAdcHits 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 / PMT' P.hgcer.totNumAdcHits 4 0.5 4.5
 
 #2d Histos for Debugging 
 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
diff --git a/DEF-files/SHMS/NGCER/pngcerana.def b/DEF-files/SHMS/NGCER/pngcerana.def
index 20776161537ac0840880dad5cee48852af832880..3ff0782339dc7ad7f1b711f6ff3837125316ea03 100644
--- a/DEF-files/SHMS/NGCER/pngcerana.def
+++ b/DEF-files/SHMS/NGCER/pngcerana.def
@@ -4,31 +4,29 @@ block P.ngcer.*
 block T.shms.*
 
 #1D HISTOGRAMS
-TH1F pngcer_raw_occ 'SHMS Noble Gas Cherenkov Raw Occupancy; Counter Number; Number of Entries' P.ngcer.adcCounter 4 0.5 4.5
-TH1F pngcer_adcErrFlg 'SHMS Noble Gas Cherenkov Error Flag for When FPGA Fails; Error Flag; Number of Entries' P.ngcer.adcErrorFlag 22 -0.1 1.2
-TH1F pngcer_good_occ 'SHMS Noble Gas Cherenkov Number of Good ADC Hits Per PMT; Number of Good ADC Hits / PMT; Number of Entries' P.ngcer.numGoodAdcHits 4 0.5 4.5
-TH1F pngcer_good_mult 'SHMS Noble Gas Cherenkov Total Number of Good ADC Hits; Total Number of Good ADC Hits; Number of Entries' P.ngcer.totNumGoodAdcHits 4 0.5 4.5
-TH1F pngcer_npe 'SHMS Noble Gas Cherenkov Number of Photoelectrons Per PMT; Number of Photoelectrons / PMT; Number of Entries' P.ngcer.npe 4 0.5 4.5 
-TH1F pngcer_tot_npe 'SHMS Noble Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries' P.ngcer.npeSum 4 0.5 4.5 
+TH1F pngcer_raw_occ 'SHMS Noble Gas Cherenkov Raw Occupancy; PMT Number; Number of Entries' P.ngcer.adcCounter 4 0.5 4.5
+TH1F pngcer_adcErrFlg 'SHMS Noble Gas Cherenkov FPGA Error Flag; Error Flag; Number of Entries' P.ngcer.adcErrorFlag 2 -0.5 1.5
+TH1F pngcer_good_occ 'SHMS Noble Gas Cherenkov Good Occupancy; PMT Number; Number of Entries' P.ngcer.numGoodAdcHits 4 0.5 4.5
+TH1F pngcer_good_mult 'SHMS Noble Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' P.ngcer.totNumGoodAdcHits 4 0.5 4.5
+TH1F pngcer_tot_npe 'SHMS Noble Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.ngcer.npeSum 200 0 100 P.ngcer.npeSum>0.0 
 
-#2D HISTOGRAMS
-TH2F pngcer_goodped_vs_cntr 'SHMS Noble Gas Cherenkov Good Pulse Pedestal vs. Counter Number; Counter Number; Raw Pulse Pedestal / 10 ADC Units' [I] P.ngcer.goodAdcPed 4 -0.5 3.5 1000 0 10000
-TH2F pngcer_goodpi_vs_cntr 'SHMS Noble Gas Cherenkov Good Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.ngcer.goodAdcPulseInt 4 -0.5 3.5 4000 0 40000
-TH2F pngcer_goodrawpi_vs_cntr 'SHMS Noble Gas Cherenkov Good Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.ngcer.goodAdcPulseIntRaw 4 -0.5 3.5 4000 0 40000
-TH2F pngcer_goodamp_vs_cntr 'SHMS Noble Gas Cherenkov Good Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' [I] P.ngcer.goodAdcPulseAmp 4 -0.5 3.5 410 0 4100
-TH2F pngcer_goodptime_vs_cntr 'SHMS Noble Gas Cherenkov Good Pulse Time vs. Counter Number; Counter Number;  Raw Pulse Time / 10 ADC Units' [I] P.ngcer.goodAdcPulseTime 4 -0.5 3.5 1000 0 10000
+#2D HISTOGRAMS  
+TH2F pngcer_npe 'SHMS Noble Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I] P.ngcer.npe 4 -0.5 3.5 200 0 100 P.ngcer.npe>0.0 
+TH2F pngcer_good_pped_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I] P.ngcer.goodAdcPed 4 -0.5 3.5 400 300 700
+TH2F pngcer_good_pi_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I] P.ngcer.goodAdcPulseInt 4 -0.5 3.5 600 0 30000 P.ngcer.goodAdcPulseInt>0.0
+TH2F pngcer_good_rawpi_vs_pmt 'SHMS Noble Gas Cherenkov Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I] P.ngcer.goodAdcPulseIntRaw 4 -0.5 3.5 600 0 30000 P.ngcer.goodAdcPulseIntRaw>0.0
+TH2F pngcer_good_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I] P.ngcer.goodAdcPulseAmp 4 -0.5 3.5 200 0 4000 P.ngcer.goodAdcPulseAmp>0.0
+TH2F pngcer_good_ptime_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I] P.ngcer.goodAdcPulseTime 4 -0.5 3.5 350 0 3500 P.ngcer.goodAdcPulseTime>0.0
 
 
 #1D Histos for Debugging 
-TH1F pngcer_occ 'SHMS Noble Gas Cherenkov ADC Hits Per PMT; Number of ADC Hits / PMT; Number of Entries' P.ngcer.numAdcHits 4 0.5 4.5
-TH1F pngcer_mult 'SHMS Noble Gas Cherenkov Total Number of ADC Hits; Total Number of ADC Hits; Number of Entries' P.ngcer.totNumAdcHits 4 0.5 4.5
+TH1F pngcer_raw_mult 'SHMS Noble Gas Cherenkov Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits / PMT' P.ngcer.totNumAdcHits 4 0.5 4.5
 
 #2d Histos for Debugging 
-TH2F pngcer_rawped_vs_cntr 'SHMS Noble Gas Cherenkov Raw Pulse Pedestal vs. Counter Number; Counter Number; Raw Pulse Pedestal / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPedRaw 4 0.5 4.5 1000 0 10000
-TH2F pngcer_rawpi_vs_cntr 'SHMS Noble Gas Cherenkov Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseIntRaw 4 0.5 4.5 4000 0 40000
-TH2F pngcer_rawamp_vs_cntr 'SHMS Noble Gas Cherenkov Raw Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseAmpRaw 4 0.5 4.5 410 0 4100
-TH2F pngcer_rawptime_vs_cntr 'SHMS Noble Gas Cherenkov Raw Pulse Time vs. Counter Number; Counter Number;  Raw Pulse Time / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseTimeRaw 4 0.5 4.5 1000 0 10000
-TH2F pngcer_ped_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number;  Pulse Pedestal / 1 ADC Units' P.ngcer.adcCounter P.ngcer.adcPed 4 0.5 4.5 1000 0 1000
-TH2F pngcer_pi_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Integral vs. Counter Number; Counter Number;  Pulse Integral / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseInt 4 0.5 4.5 4000 0 40000
-TH2F pngcer_amp_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Amplitude vs. Counter Number; Counter Number;  Pulse Amplitude / 1 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseAmp 4 0.5 4.5 4100 0 4100
-
+TH2F pngcer_raw_pped_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' P.ngcer.adcCounter P.ngcer.adcPedRaw 4 0.5 4.5 10000 0 10000
+TH2F pngcer_raw_pi_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseIntRaw 4 0.5 4.5 650 0 32500
+TH2F pngcer_raw_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseAmpRaw 4 0.5 4.5 410 0 8200
+TH2F pngcer_raw_ptime_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Time vs. PMT Number; PMT Number;  Raw Pulse Time / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseTimeRaw 4 0.5 4.5 650 0 6500
+TH2F pngcer_pped_vs_pmt 'SHMS Noble Gas Cherenkov Pulse Pedestal vs. PMT Number; PMT Number;  Pulse Pedestal / 1 ADC Units' P.ngcer.adcCounter P.ngcer.adcPed 4 0.5 4.5 400 300 700
+TH2F pngcer_pi_vs_pmt 'SHMS Noble Gas Cherenkov Pulse Integral vs. PMT Number; PMT Number;  Pulse Integral / 50 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseInt 4 0.5 4.5 600 0 30000
+TH2F pngcer_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Pulse Amplitude vs. PMT Number; PMT Number;  Pulse Amplitude / 20 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseAmp 4 0.5 4.5 400 0 8000
diff --git a/SCRIPTS/SHMS/replay_paero_test_stand.C b/SCRIPTS/SHMS/replay_paero_test_stand.C
index aabfbfa8befcb226d6a4a308a18d26f125716d35..61c4b49cd792f565aa7abf091696171b9b7d5ca4 100644
--- a/SCRIPTS/SHMS/replay_paero_test_stand.C
+++ b/SCRIPTS/SHMS/replay_paero_test_stand.C
@@ -35,6 +35,7 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Load the Hall C style detector map
   gHcDetectorMap = new THcDetectorMap();
   gHcDetectorMap->Load("MAPS/SHMS/DETEC/paero_ptrig.map");
+  gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
 
   // Set up the equipment to be analyzed.
   THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
diff --git a/onlineGUI/Config/SHMS/AERO/aero_stand.cfg b/onlineGUI/Config/SHMS/AERO/aero_stand.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..5ced87406b5ff2e370929607b69636dd5287fb52
--- /dev/null
+++ b/onlineGUI/Config/SHMS/AERO/aero_stand.cfg
@@ -0,0 +1,61 @@
+protorootfile ../ROOTfiles/paero_replay_XXXXX.root
+guicolor orange
+canvassize 1600 800
+#canvassize 800 800
+newpage 2 2
+title SHMS Aerogel Cherenkov Occupancy
+paero_raw_occ_pos -nostat
+paero_raw_occ_neg -nostat
+paero_good_occ_pos -nostat
+paero_good_occ_neg -nostat
+newpage 3 2
+title SHMS Aerogel Cherenkov Multiplicity
+paero_raw_mult_pos -nostat
+paero_raw_mult_neg -nostat
+paero_raw_mult -nostat
+paero_good_mult_pos -nostat
+paero_good_mult_neg -nostat
+paero_good_mult -nostat
+newpage 3 2 logz
+title SHMS Aerogel Number of Photoelectrons
+paero_tot_npe_pos -nostat
+paero_tot_npe_neg -nostat
+paero_tot_npe -nostat
+paero_npe_pos -nostat
+paero_npe_neg -nostat
+newpage 2 3 logz
+title SHMS +Aerogel Pulse Pedestals/Amplitudes
+paero_raw_pped_vs_pmt_pos -nostat
+paero_raw_pamp_vs_pmt_pos -nostat
+paero_pped_vs_pmt_pos -nostat
+paero_pamp_vs_pmt_pos -nostat
+paero_good_pped_vs_pmt_pos -nostat
+paero_good_pamp_vs_pmt_pos -nostat
+newpage 2 3 logz
+title SHMS -Aerogel Pulse Pedestals/Amplitudes
+paero_raw_pped_vs_pmt_neg -nostat
+paero_raw_pamp_vs_pmt_neg -nostat
+paero_pped_vs_pmt_neg -nostat
+paero_pamp_vs_pmt_neg -nostat
+paero_good_pped_vs_pmt_neg -nostat
+paero_good_pamp_vs_pmt_neg -nostat
+newpage 2 3 logz
+title SHMS +Aerogel Pulse Integrals/Times
+paero_raw_pi_vs_pmt_pos -nostat
+paero_raw_ptime_vs_pmt_pos -nostat
+paero_pi_vs_pmt_pos -nostat
+paero_good_ptime_vs_pmt_pos -nostat
+paero_good_pi_vs_pmt_pos -nostat
+paero_good_raw_pi_vs_pmt_pos
+newpage 2 3 logz
+title SHMS -Aerogel Pulse Integrals/Times
+paero_raw_pi_vs_pmt_neg -nostat
+paero_raw_ptime_vs_pmt_neg -nostat
+paero_pi_vs_pmt_neg -nostat
+paero_good_ptime_vs_pmt_neg -nostat
+paero_good_pi_vs_pmt_neg -nostat
+paero_good_raw_pi_vs_pmt_neg -nostat
+newpage 1 1
+title Error Flag
+paero_adcErrFlg_pos -nostat
+paero_adcErrFlg_neg -nostat
\ No newline at end of file
diff --git a/onlineGUI/Config/SHMS/HGCER/phgcer_stand.cfg b/onlineGUI/Config/SHMS/HGCER/phgcer_stand.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..1c2d13e8b224a6932682a397fe70b9c5676028cb
--- /dev/null
+++ b/onlineGUI/Config/SHMS/HGCER/phgcer_stand.cfg
@@ -0,0 +1,32 @@
+protorootfile ../ROOTfiles/phgcer_replay_XXXXX.root
+guicolor orange
+canvassize 1600 800
+#canvassize 800 800
+newpage 2 2
+title SHMS Heavy Gas Cherenkov
+phgcer_raw_occ -nostat
+phgcer_raw_mult -nostat
+phgcer_good_occ -nostat
+phgcer_good_mult -nostat
+newpage 2 3 logz
+title Pulse Pedestals/Amplitudes
+phgcer_raw_pped_vs_pmt -nostat
+phgcer_raw_pamp_vs_pmt -nostat
+phgcer_pped_vs_pmt -nostat
+phgcer_pamp_vs_pmt -nostat
+phgcer_good_pped_vs_pmt -nostat
+phgcer_good_pamp_vs_pmt -nostat
+newpage 2 3 logz
+title Pulse Integrals/Times
+phgcer_raw_pi_vs_pmt -nostat
+phgcer_raw_ptime_vs_pmt -nostat
+phgcer_pi_vs_pmt -nostat
+phgcer_good_ptime_vs_pmt -nostat
+phgcer_good_pi_vs_pmt -nostat
+newpage 1 2 logz
+title Number of PhotoElectrons
+phgcer_npe -nostat
+phgcer_tot_npe -nostat
+newpage 1 1
+title Error Flag
+phgcer_adcErrFlg -nostat
\ No newline at end of file
diff --git a/onlineGUI/Config/SHMS/NGCER/pngcer_stand.cfg b/onlineGUI/Config/SHMS/NGCER/pngcer_stand.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..8847c52cd858a70d075ebfdb5fad5841858a20a2
--- /dev/null
+++ b/onlineGUI/Config/SHMS/NGCER/pngcer_stand.cfg
@@ -0,0 +1,32 @@
+protorootfile ../ROOTfiles/pngcer_replay_XXXXX.root
+guicolor orange
+canvassize 1600 800
+#canvassize 800 800
+newpage 2 2
+title SHMS Noble Gas Cherenkov
+pngcer_raw_occ -nostat
+pngcer_raw_mult -nostat
+pngcer_good_occ -nostat
+pngcer_good_mult -nostat
+newpage 2 3 logz
+title Pulse Pedestals/Amplitudes
+pngcer_raw_pped_vs_pmt -nostat
+pngcer_raw_pamp_vs_pmt -nostat
+pngcer_pped_vs_pmt -nostat
+pngcer_pamp_vs_pmt -nostat
+pngcer_good_pped_vs_pmt -nostat
+pngcer_good_pamp_vs_pmt -nostat
+newpage 2 3 logz
+title Pulse Integrals/Times
+pngcer_raw_pi_vs_pmt -nostat
+pngcer_raw_ptime_vs_pmt -nostat
+pngcer_pi_vs_pmt -nostat
+pngcer_good_ptime_vs_pmt -nostat
+pngcer_good_pi_vs_pmt -nostat
+newpage 1 2 logz
+title Number of PhotoElectrons
+pngcer_npe -nostat
+pngcer_tot_npe -nostat
+newpage 1 1
+title Error Flag
+pngcer_adcErrFlg -nostat
\ No newline at end of file