From 1321191f5d8c8b961f6492e0fcd4426bb6c63923 Mon Sep 17 00:00:00 2001
From: John Matter <matter@virginia.edu>
Date: Fri, 20 Oct 2017 13:28:59 -0400
Subject: [PATCH] SHMS test stand update (#235)

* Add optional title to overlay2.C macro

* SHMS test stand update

* Fix SHMS calorimeter onlineGUI config
---
 .../SHMS/TEST_STANDS/AERO/paeroana_cuts.def   |   3 +-
 .../SHMS/TEST_STANDS/CAL/pcalana_cuts.def     |   1 +
 DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def |   1 +
 .../SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def |   3 +-
 .../SHMS/TEST_STANDS/HODO/phodoana_cuts.def   |   1 +
 .../SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def |   1 +
 DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def  | 120 ++++++++----
 .../SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def   |   1 +
 .../TEST_STANDS/replay_phgcer_test_stand.C    |   2 +-
 .../TEST_STANDS/replay_pngcer_test_stand.C    |   2 +-
 onlineGUI/CONFIG/SHMS/AERO/aero_stand.cfg     |  34 ++--
 onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg     |  31 +--
 onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg    |   7 +-
 onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg    |   7 +-
 onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg    | 182 ++++++++----------
 onlineGUI/CONFIG/SHMS/TRIG/ptrig_stand.cfg    |  87 +++++++++
 onlineGUI/UTIL/GEN/overlay2.C                 |   6 +-
 17 files changed, 314 insertions(+), 175 deletions(-)
 create mode 100644 onlineGUI/CONFIG/SHMS/TRIG/ptrig_stand.cfg

diff --git a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
index 264c1689..eecf0f00 100644
--- a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
@@ -1,5 +1,6 @@
 Block: RawDecode
 
+Pedestal_event      g.evtyp == 99
 SHMS_trig_1_event   g.evtyp == 1
 SHMS_trig_2_event   g.evtyp == 2
 SHMS_trig_3_event   g.evtyp == 3
@@ -18,4 +19,4 @@ Block: CoarseTracking
 CoarseTracking_master SHMS_event
 
 Block: CoarseReconstruct
-CourseReconstruct SHMS_event
\ No newline at end of file
+CourseReconstruct SHMS_event
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
index 37cd1bcf..eecf0f00 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
@@ -1,5 +1,6 @@
 Block: RawDecode
 
+Pedestal_event      g.evtyp == 99
 SHMS_trig_1_event   g.evtyp == 1
 SHMS_trig_2_event   g.evtyp == 2
 SHMS_trig_3_event   g.evtyp == 3
diff --git a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
index 37cd1bcf..eecf0f00 100644
--- a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
@@ -1,5 +1,6 @@
 Block: RawDecode
 
+Pedestal_event      g.evtyp == 99
 SHMS_trig_1_event   g.evtyp == 1
 SHMS_trig_2_event   g.evtyp == 2
 SHMS_trig_3_event   g.evtyp == 3
diff --git a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
index a5181ea7..eecf0f00 100644
--- a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
@@ -1,6 +1,7 @@
 Block: RawDecode
 
-HMS_trig_1_event   g.evtyp == 1
+Pedestal_event      g.evtyp == 99
+SHMS_trig_1_event   g.evtyp == 1
 SHMS_trig_2_event   g.evtyp == 2
 SHMS_trig_3_event   g.evtyp == 3
 SHMS_trig_4_event   g.evtyp == 4
diff --git a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
index 37cd1bcf..eecf0f00 100644
--- a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
@@ -1,5 +1,6 @@
 Block: RawDecode
 
+Pedestal_event      g.evtyp == 99
 SHMS_trig_1_event   g.evtyp == 1
 SHMS_trig_2_event   g.evtyp == 2
 SHMS_trig_3_event   g.evtyp == 3
diff --git a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
index 37cd1bcf..eecf0f00 100644
--- a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
@@ -1,5 +1,6 @@
 Block: RawDecode
 
+Pedestal_event      g.evtyp == 99
 SHMS_trig_1_event   g.evtyp == 1
 SHMS_trig_2_event   g.evtyp == 2
 SHMS_trig_3_event   g.evtyp == 3
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
index cfa66389..37189062 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
@@ -2,37 +2,89 @@
 #
 block T.shms.*
 
-TH1F ptrig_p1x_tdc 'SHMS p1x TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1X_tdcTime 250 0 2500
-TH1F ptrig_p1y_tdc 'SHMS p1y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1Y_tdcTime 250 0 2500
-TH1F ptrig_p2x_tdc 'SHMS p2x TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2X_tdcTime 250 0 2500
-TH1F ptrig_p2y_tdc 'SHMS p2y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2Y_tdcTime 250 0 2500
-
-TH1F ptrig_p1T_tdc 'SHMS p1x/p1y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1T_tdcTime 250 0 2500
-TH1F ptrig_p2T_tdc 'SHMS p2x/p2y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2T_tdcTime 250 0 2500
-
-TH1F ptrig_pT1_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 20, Channel 15); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT1_tdcTime 250 0 2500
-TH1F ptrig_pT2_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 31); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT2_tdcTime 250 0 2500
-TH1F ptrig_pT3_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 38); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT3_tdcTime 250 0 2500
-
-TH1F ptrig_hdc_ref1  'SHMS HDC Reference Time 1;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF1_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref2  'SHMS HDC Reference Time 2;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF2_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref3  'SHMS HDC Reference Time 3;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF3_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref4  'SHMS HDC Reference Time 4;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF4_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref5  'SHMS HDC Reference Time 5;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF5_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref6  'SHMS HDC Reference Time 6;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF6_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref7  'SHMS HDC Reference Time 7;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF7_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref8  'SHMS HDC Reference Time 8;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF8_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref9  'SHMS HDC Reference Time 9;  Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF9_tdcTime  1500 0 15000
-TH1F ptrig_hdc_ref10 'SHMS HDC Reference Time 10; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF10_tdcTime 1500 0 15000
-
-TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pNGCSUM_adcPed 2000 0 2000
-TH1F ptrig_pngc_sum_pint 'SHMS Noble Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pNGCSUM_adcPulseInt 4000 0 40000
-TH1F ptrig_pngc_sum_pamp 'SHMS Noble Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pNGCSUM_adcPulseAmp 4100 0 4100
-TH1F ptrig_pngc_sum_ptime 'SHMS Noble Gas Sum FADC Pulse Time; Pulse Time; Number of Entries / 10 ADC Units' T.shms.pNGCSUM_adcPulseTimeRaw 1000 0 10000
-TH1F ptrig_pngc_sum_tdc 'SHMS Noble Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units' T.shms.pNGCSUM_tdcTime 700 -3500 3500
-
-TH1F ptrig_phgc_sum_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pHGCSUM_adcPed 2000 0 2000
-TH1F ptrig_phgc_sum_pint 'SHMS Heavy Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pHGCSUM_adcPulseInt 4000 0 40000
-TH1F ptrig_phgc_sum_pamp 'SHMS Heavy Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pHGCSUM_adcPulseAmp 4100 0 4100
-TH1F ptrig_phgc_sum_ptime 'SHMS Heavy Gas Sum FADC Pulse Time; Pulse Time; Number of Entries / 10 ADC Units' T.shms.pHGCSUM_adcPulseTimeRaw 1000 0 10000
-TH1F ptrig_phgc_sum_tdc 'SHMS Heavy Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units' T.shms.pHGCSUM_tdcTime 700 -3500 3500
+#-----------------
+# SHMS HODO plane
+#-----------------
+TH1F ptrig_p1x_tdc_raw 'SHMS p1x Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1X_tdcTimeRaw 250 1 4000
+TH1F ptrig_p1y_tdc_raw 'SHMS p1y Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1Y_tdcTimeRaw 250 1 4000
+TH1F ptrig_p2x_tdc_raw 'SHMS p2x Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2X_tdcTimeRaw 250 1 4000
+TH1F ptrig_p2y_tdc_raw 'SHMS p2y Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2Y_tdcTimeRaw 250 1 4000
+
+TH1F ptrig_p1x_tdc 'SHMS p1x TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1X_tdcTime 250 1 400
+TH1F ptrig_p1y_tdc 'SHMS p1y TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1Y_tdcTime 250 1 400
+TH1F ptrig_p2x_tdc 'SHMS p2x TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2X_tdcTime 250 1 400
+TH1F ptrig_p2y_tdc 'SHMS p2y TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2Y_tdcTime 250 1 400
+
+
+#-----------------------
+# SHMS HODO Coincidence
+#-----------------------
+TH1F ptrig_p1T_tdc_raw 'SHMS p1x/p1y Coincidence Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1T_tdcTimeRaw 250 1 4000
+TH1F ptrig_p2T_tdc_raw 'SHMS p2x/p2y Coincidence Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2T_tdcTimeRaw 250 1 4000
+
+TH1F ptrig_p1T_tdc 'SHMS p1x/p1y Coincidence TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p1T_tdcTime 250 1 400
+TH1F ptrig_p2T_tdc 'SHMS p2x/p2y Coincidence TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.p2T_tdcTime 250 1 400
+
+
+#--------------
+# SHMS TRIGGER
+#--------------
+TH1F ptrig_pT1_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 20, Channel 15); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT1_tdcTimeRaw 250 1 4000
+TH1F ptrig_pT2_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 19, Channel 31); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT2_tdcTimeRaw 250 1 4000
+TH1F ptrig_pT3_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 19, Channel 38); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT3_tdcTimeRaw 250 1 4000
+
+TH1F ptrig_pT1_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 20, Channel 15); TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT1_tdcTime 250 0 1500
+TH1F ptrig_pT2_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 31); TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT2_tdcTime 250 0 1500
+TH1F ptrig_pT3_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 38); TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pT3_tdcTime 250 0 1500
+
+
+#---------
+# SHMS DC
+#---------
+TH1F ptrig_pdc_raw_ref1  'SHMS PDC Raw Reference Time 1; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF1_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref2  'SHMS PDC Raw Reference Time 2; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF2_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref3  'SHMS PDC Raw Reference Time 3; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF3_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref4  'SHMS PDC Raw Reference Time 4; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF4_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref5  'SHMS PDC Raw Reference Time 5; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF5_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref6  'SHMS PDC Raw Reference Time 6; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF6_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref7  'SHMS PDC Raw Reference Time 7; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF7_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref8  'SHMS PDC Raw Reference Time 8; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF8_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref9  'SHMS PDC Raw Reference Time 9; Raw TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF9_tdcTimeRaw  1500 1 25000
+TH1F ptrig_pdc_raw_ref10 'SHMS PDC Raw Reference Time 10; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF10_tdcTimeRaw 1500 1 25000
+
+TH1F ptrig_pdc_ref1  'SHMS PDC Reference Time 1; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF1_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref2  'SHMS PDC Reference Time 2; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF2_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref3  'SHMS PDC Reference Time 3; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF3_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref4  'SHMS PDC Reference Time 4; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF4_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref5  'SHMS PDC Reference Time 5; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF5_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref6  'SHMS PDC Reference Time 6; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF6_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref7  'SHMS PDC Reference Time 7; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF7_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref8  'SHMS PDC Reference Time 8; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF8_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref9  'SHMS PDC Reference Time 9; TDC Time (TDC Units); Counts / 10 TDC Units;'  T.shms.pDCREF9_tdcTime  1500 0 4000
+TH1F ptrig_pdc_ref10 'SHMS PDC Reference Time 10; TDC Time (TDC Units); Counts / 10 TDC Units;' T.shms.pDCREF10_tdcTime 1500 0 4000
+
+#------------
+# SHMS NGCER
+#------------
+TH1F ptrig_pngc_sum_pped      'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units'       T.shms.pNGCSUM_adcPed          200  0 2000
+TH1F ptrig_pngc_sum_pped_raw  'SHMS Noble Gas Sum FADC Raw Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units'   T.shms.pNGCSUM_adcPedRaw       200  0 4000
+TH1F ptrig_pngc_sum_pint      'SHMS Noble Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units'      T.shms.pNGCSUM_adcPulseInt     400  -4000 12000
+TH1F ptrig_pngc_sum_pint_raw  'SHMS Noble Gas Sum FADC Raw Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units'  T.shms.pNGCSUM_adcPulseIntRaw  4000 12000 30000
+TH1F ptrig_pngc_sum_pamp      'SHMS Noble Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units'     T.shms.pNGCSUM_adcPulseAmp     400 -2000 4100
+TH1F ptrig_pngc_sum_pamp_raw  'SHMS Noble Gas Sum FADC Raw Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pNGCSUM_adcPulseAmpRaw  400  0 4100
+TH1F ptrig_pngc_sum_ptime_raw 'SHMS Noble Gas Sum FADC Raw Pulse Time; Pulse Time; Number of Entries / 10 ADC Units'          T.shms.pNGCSUM_adcPulseTimeRaw 1000 0 10000
+TH1F ptrig_pngc_sum_tdc       'SHMS Noble Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units'                       T.shms.pNGCSUM_tdcTime         200  0 400
+TH1F ptrig_pngc_sum_tdc_raw   'SHMS Noble Gas Sum Raw TDC Time; TDC Time; Number of Entries / 10 TDC Units'                   T.shms.pNGCSUM_tdcTimeRaw      400  0 4000
+
+#------------
+# SHMS HGCER
+#------------
+TH1F ptrig_phgc_sum_pped      'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units'       T.shms.pHGCSUM_adcPed          200  0 2000
+TH1F ptrig_phgc_sum_pped_raw  'SHMS Heavy Gas Sum FADC Raw Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units'   T.shms.pHGCSUM_adcPedRaw       200  0 4000
+TH1F ptrig_phgc_sum_pint      'SHMS Heavy Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units'      T.shms.pHGCSUM_adcPulseInt     400  -1000 6000
+TH1F ptrig_phgc_sum_pint_raw  'SHMS Heavy Gas Sum FADC Raw Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units'  T.shms.pHGCSUM_adcPulseIntRaw  4000 12000 30000
+TH1F ptrig_phgc_sum_pamp      'SHMS Heavy Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units'     T.shms.pHGCSUM_adcPulseAmp     400 -2000  4100
+TH1F ptrig_phgc_sum_pamp_raw  'SHMS Heavy Gas Sum FADC Raw Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pHGCSUM_adcPulseAmpRaw  400  0 4100
+TH1F ptrig_phgc_sum_ptime_raw 'SHMS Heavy Gas Sum FADC Raw Pulse Time; Pulse Time; Number of Entries / 10 ADC Units'          T.shms.pHGCSUM_adcPulseTimeRaw 1000 0 10000
+TH1F ptrig_phgc_sum_tdc       'SHMS Heavy Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units'                       T.shms.pHGCSUM_tdcTime         200  0 400
+TH1F ptrig_phgc_sum_tdc_raw   'SHMS Heavy Gas Sum Raw TDC Time; TDC Time; Number of Entries / 10 TDC Units'                   T.shms.pHGCSUM_tdcTimeRaw      400  0 4000
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
index 37cd1bcf..eecf0f00 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
@@ -1,5 +1,6 @@
 Block: RawDecode
 
+Pedestal_event      g.evtyp == 99
 SHMS_trig_1_event   g.evtyp == 1
 SHMS_trig_2_event   g.evtyp == 2
 SHMS_trig_3_event   g.evtyp == 3
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
index fcb943a4..3d790723 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
@@ -39,7 +39,7 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
   // Load the Hall C style detector map
   gHcDetectorMap = new THcDetectorMap();
-  gHcDetectorMap->Load("MAPS/SHMS/DETEC/HGC/phgcer_ptrig.map");
+  gHcDetectorMap->Load("MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map");
 
   // Set up the equipment to be analyzed.
   THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
index 19b3c10c..ded2f609 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
@@ -39,7 +39,7 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
   // Load the Hall C style detector map
   gHcDetectorMap = new THcDetectorMap();
-  gHcDetectorMap->Load("MAPS/SHMS/DETEC/NGC/pngcer_ptrig.map");
+  gHcDetectorMap->Load("MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map");
 
   // 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
index 7ed5a127..c68805a9 100644
--- a/onlineGUI/CONFIG/SHMS/AERO/aero_stand.cfg
+++ b/onlineGUI/CONFIG/SHMS/AERO/aero_stand.cfg
@@ -1,21 +1,20 @@
 protorootfile ../ROOTfiles/paero_replay_XXXXX.root
 guicolor orange
-canvassize 1600 800
-#canvassize 800 800
-newpage 2 2 
+#canvassize 1600 800
+canvassize 800 800
+
+newpage 2 1 
 title SHMS Aero Occ.
-paero_raw_occ_pos 
-paero_raw_occ_neg 
-paero_good_occ_pos 
-paero_good_occ_neg 
-newpage 3 2
+macro 'UTIL/GEN/overlay2.C("paero_raw_occ_pos","paero_raw_occ_neg","AERO+","AERO-","SHMS Aero Raw Occupancy")'
+macro 'UTIL/GEN/overlay2.C("paero_good_occ_pos","paero_good_occ_neg","AERO+","AERO-","SHMS Aero Good Occupancy")'
+
+newpage 2 2
 title SHMS Aero Mult.
-paero_raw_mult_pos 
-paero_raw_mult_neg 
-paero_raw_mult 
-paero_good_mult_pos 
-paero_good_mult_neg 
-paero_good_mult 
+macro 'UTIL/GEN/overlay2.C("paero_raw_mult_pos","paero_raw_mult_neg","AERO+","AERO-","SHMS Aero Raw Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("paero_good_mult_pos","paero_good_mult_neg","AERO+","AERO-","SHMS Aero Good Multiplicity")'
+paero_raw_mult -nostat
+paero_good_mult -nostat
+
 newpage 3 2 logz
 title SHMS Aero N.P.E.
 paero_tot_npe_pos -nostat
@@ -23,6 +22,7 @@ paero_tot_npe_neg -nostat
 paero_tot_npe -nostat
 paero_npe_pos -nostat
 paero_npe_neg -nostat
+
 newpage 2 3 logz
 title SHMS Aero Pulse Ped.
 paero_raw_pped_vs_pmt_pos -nostat
@@ -31,6 +31,7 @@ paero_pped_vs_pmt_pos -nostat
 paero_pped_vs_pmt_neg -nostat
 paero_good_pped_vs_pmt_pos -nostat
 paero_good_pped_vs_pmt_neg -nostat
+
 newpage 2 3 logz
 title SHMS Aero Pulse Amp.
 paero_raw_pamp_vs_pmt_pos -nostat
@@ -39,6 +40,7 @@ paero_pamp_vs_pmt_pos -nostat
 paero_pamp_vs_pmt_neg -nostat
 paero_good_pamp_vs_pmt_pos -nostat
 paero_good_pamp_vs_pmt_neg -nostat
+
 newpage 2 3 logz
 title SHMS Aero Pulse Int.
 paero_raw_pi_vs_pmt_pos -nostat
@@ -47,13 +49,15 @@ paero_pi_vs_pmt_pos -nostat
 paero_pi_vs_pmt_neg -nostat
 paero_good_pi_vs_pmt_pos -nostat
 paero_good_pi_vs_pmt_neg -nostat
+
 newpage 2 2 logz
 title SHMS Aero Pulse Times
 paero_raw_ptime_vs_pmt_pos -nostat
 paero_raw_ptime_vs_pmt_neg -nostat
 paero_good_ptime_vs_pmt_pos -nostat
 paero_good_ptime_vs_pmt_neg -nostat
+
 newpage 2 1
 title SHMS Aero Error Flag
 paero_adcErrFlg2D_pos -nostat
-paero_adcErrFlg2D_neg -nostat
\ No newline at end of file
+paero_adcErrFlg2D_neg -nostat
diff --git a/onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg b/onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg
index e5742177..12961969 100644
--- a/onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg
+++ b/onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg
@@ -1,21 +1,20 @@
 protorootfile ../ROOTfiles/pcal_replay_XXXXX.root
 guicolor orange
-canvassize 1600 800
-#canvassize 800 800
-newpage 2 2 
+#canvassize 1600 800
+canvassize 800 800
+
+newpage 2 1 
 title SHMS PreSH Occ.
-pcal_prshwr_raw_occ_pos -nostat
-pcal_prshwr_raw_occ_neg -nostat
-pcal_prshwr_good_occ_pos -nostat
-pcal_prshwr_good_occ_neg -nostat
-newpage 3 2
+macro 'UTIL/GEN/overlay2.C("pcal_prshwr_raw_occ_pos","pcal_prshwr_raw_occ_neg","PreShower+","PreShower-","SHMS PreShower Raw Occupancy")'
+macro 'UTIL/GEN/overlay2.C("pcal_prshwr_good_occ_pos","pcal_prshwr_good_occ_neg","PreShower+","PreShower-","SHMS PreShower Good Occupancy")'
+
+newpage 2 2
 title SHMS PreSH Mult.
-pcal_prshwr_raw_mult_pos -nostat
-pcal_prshwr_raw_mult_neg -nostat
+macro UTIL/GEN/overlay2.C("pcal_prshwr_raw_mult_pos","pcal_prshwr_raw_mult_neg","PreShower+","PreShower-","SHMS PreShower Raw Multiplicity")'
+macro UTIL/GEN/overlay2.C("pcal_prshwr_good_mult_pos","pcal_prshwr_good_mult_neg","PreShower+","PreShower-","SHMS PreShower Raw Multiplicity")'
 pcal_prshwr_raw_mult -nostat
-pcal_prshwr_good_mult_pos -nostat
-pcal_prshwr_good_mult_neg -nostat
 pcal_prshwr_good_mult -nostat
+
 newpage 2 3 logz
 title SHMS PreSH Pulse Ped.
 pcal_prshwr_raw_pped_vs_pmt_pos -nostat
@@ -24,6 +23,7 @@ pcal_prshwr_pped_vs_pmt_pos -nostat
 pcal_prshwr_pped_vs_pmt_neg -nostat
 pcal_prshwr_good_pped_vs_pmt_pos -nostat
 pcal_prshwr_good_pped_vs_pmt_neg -nostat
+
 newpage 2 3 logz
 title SHMS PreSH Pulse Amp.
 pcal_prshwr_raw_pamp_vs_pmt_pos -nostat
@@ -32,6 +32,7 @@ pcal_prshwr_pamp_vs_pmt_pos -nostat
 pcal_prshwr_pamp_vs_pmt_neg -nostat
 pcal_prshwr_good_pamp_vs_pmt_pos -nostat
 pcal_prshwr_good_pamp_vs_pmt_neg -nostat
+
 newpage 2 3 logz
 title SHMS PreSH Pulse Int.
 pcal_prshwr_raw_pi_vs_pmt_pos -nostat
@@ -40,22 +41,26 @@ pcal_prshwr_pi_vs_pmt_pos -nostat
 pcal_prshwr_pi_vs_pmt_neg -nostat
 pcal_prshwr_good_pi_vs_pmt_pos -nostat
 pcal_prshwr_good_pi_vs_pmt_neg -nostat
+
 newpage 2 2 logz
 title SHMS PreSH Pulse Times
 pcal_prshwr_raw_ptime_vs_pmt_pos -nostat
 pcal_prshwr_raw_ptime_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 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 PreSH Tot. Energy Dep. 
 pcal_prshwr_Eplane_pos -nostat
 pcal_prshwr_Eplane_neg -nostat
 pcal_prshwr_Eplane -nostat
+
 newpage 2 1
 title SHMS PreSH Error Flag
 pcal_prshwr_adcErrFlg2D_pos -nostat
@@ -88,9 +93,11 @@ pcal_shwr_good_pamp_vs_pmt -nostat
 newpage 1 1 logz
 title SHMS Shower Energy Dep./PMT
 pcal_shwr_E_vs_pmt -nostat
+
 newpage 1 1
 title SHMS Shower Tot. Energy Dep. 
 pcal_shwr_Earray -nostat
+
 newpage 1 1
 title SHMS Shower Error Flag
 pcal_shwr_adcErrFlg2D -nostat
diff --git a/onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg b/onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg
index 546182f6..f8303ded 100644
--- a/onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg
+++ b/onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg
@@ -2,12 +2,14 @@ protorootfile ../ROOTfiles/phgcer_replay_XXXXX.root
 guicolor orange
 canvassize 1600 800
 #canvassize 800 800
+
 newpage 2 2
 title SHMS HGC Occ./Mult.
 phgcer_raw_occ -nostat
 phgcer_raw_mult -nostat
 phgcer_good_occ -nostat
 phgcer_good_mult -nostat
+
 newpage 2 3 logz
 title SHMS HGC Pulse Ped./Amp.
 phgcer_raw_pped_vs_pmt -nostat
@@ -16,6 +18,7 @@ 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 SHMS HGC Pulse Int./Times
 phgcer_raw_pi_vs_pmt -nostat
@@ -23,10 +26,12 @@ 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 SHMS HGC N.P.E.
 phgcer_npe -nostat
 phgcer_tot_npe -nostat
+
 newpage 1 1
 title SHMS HGC Error Flag
-phgcer_adcErrFlg2D -nostat
\ No newline at end of file
+phgcer_adcErrFlg2D -nostat
diff --git a/onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg b/onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg
index 87193bbd..1f8d8679 100644
--- a/onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg
+++ b/onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg
@@ -2,12 +2,14 @@ protorootfile ../ROOTfiles/pngcer_replay_XXXXX.root
 guicolor orange
 canvassize 1600 800
 #canvassize 800 800
+
 newpage 2 2
 title SHMS NGC Occ./Mult.
 pngcer_raw_occ -nostat
 pngcer_raw_mult -nostat
 pngcer_good_occ -nostat
 pngcer_good_mult -nostat
+
 newpage 2 3 logz
 title SHMS NGC Pulse Ped./Amp.
 pngcer_raw_pped_vs_pmt -nostat
@@ -16,6 +18,7 @@ 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 SHMS NGC Pulse Int./Times
 pngcer_raw_pi_vs_pmt -nostat
@@ -23,10 +26,12 @@ 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 SHMS NGC N.P.E.
 pngcer_npe -nostat
 pngcer_tot_npe -nostat
+
 newpage 1 1
 title SHMS NGC Error Flag
-pngcer_adcErrFlg2D -nostat
\ No newline at end of file
+pngcer_adcErrFlg2D -nostat
diff --git a/onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg b/onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg
index 9fb7804e..9c456474 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg
@@ -1,110 +1,78 @@
 protorootfile ../ROOTfiles/phodo_replay_XXXXX.root
 guicolor orange
-canvassize 1600 800
-newpage 4 2 
-title SHMS Hodo S1X/S1Y ADC Occ.
-phodo_1x_raw_adc_occ_pos -nostat
-phodo_1x_raw_adc_occ_neg -nostat
-phodo_1y_raw_adc_occ_pos -nostat
-phodo_1y_raw_adc_occ_neg -nostat
-phodo_1x_good_adc_occ_pos -nostat
-phodo_1x_good_adc_occ_neg -nostat
-phodo_1y_good_adc_occ_pos -nostat
-phodo_1y_good_adc_occ_neg -nostat
+#canvassize 1600 800
+canvassize 800 800
+
+newpage 2 2 
+title SHMS Hodo S1/S2 ADC Raw Occ.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_raw_adc_occ_pos","phodo_1x_raw_adc_occ_neg","S1X+","S1X-","SHMS Hodo 1X Raw Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_raw_adc_occ_pos","phodo_1y_raw_adc_occ_neg","S1Y+","S1Y-","SHMS Hodo 1Y Raw Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_raw_adc_occ_pos","phodo_2x_raw_adc_occ_neg","S2X+","S2X-","SHMS Hodo 2X Raw Occupancy")' -nostat 
+macro 'UTIL/GEN/overlay2.C("phodo_2y_raw_adc_occ_pos","phodo_2y_raw_adc_occ_neg","S2Y+","S2Y-","SHMS Hodo 2X Raw Occupancy")' -nostat
+
+newpage 2 2 
+title SHMS Hodo S1/S2 ADC Good Occ.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_good_adc_occ_pos","phodo_1x_good_adc_occ_neg","S1X+","S1X-","SHMS Hodo 1X Good Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_good_adc_occ_pos","phodo_1y_good_adc_occ_neg","S1Y+","S1Y-","SHMS Hodo 1Y Good Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_good_adc_occ_pos","phodo_2x_good_adc_occ_neg","S2X+","S2X-","SHMS Hodo 2X Good Occupancy")' -nostat 
+macro 'UTIL/GEN/overlay2.C("phodo_2y_good_adc_occ_pos","phodo_2y_good_adc_occ_neg","S2Y+","S2Y-","SHMS Hodo 2Y Good Occupancy")' -nostat
+
 newpage 4 2 
-title SHMS Hodo S2X/S2Y ADC Occ.
-phodo_2x_raw_adc_occ_pos -nostat
-phodo_2x_raw_adc_occ_neg -nostat
-phodo_2y_raw_adc_occ_pos -nostat
-phodo_2y_raw_adc_occ_neg -nostat
-phodo_2x_good_adc_occ_pos -nostat
-phodo_2x_good_adc_occ_neg -nostat
-phodo_2y_good_adc_occ_pos -nostat
-phodo_2y_good_adc_occ_neg -nostat
-newpage 3 2 
-title SHMS Hodo S1X ADC Mult.
-phodo_1x_raw_adc_mult_pos -nostat
-phodo_1x_raw_adc_mult_neg -nostat
+title SHMS Hodo S1/S2 ADC Raw Mult.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_raw_adc_mult_pos","phodo_1x_raw_adc_mult_neg","S1X+","S1X-","SHMS Hodo 1X Raw Multiplicity")' -nostat
 phodo_1x_raw_adc_mult -nostat
-phodo_1x_good_adc_mult_pos -nostat
-phodo_1x_good_adc_mult_neg -nostat
-phodo_1x_good_adc_mult -nostat
-newpage 3 2 
-title SHMS Hodo S1Y ADC Mult.
-phodo_1y_raw_adc_mult_pos -nostat
-phodo_1y_raw_adc_mult_neg -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_raw_adc_mult_pos","phodo_1y_raw_adc_mult_neg","S1Y+","S1Y-","SHMS Hodo 1Y Raw Multiplicity")' -nostat
 phodo_1y_raw_adc_mult -nostat
-phodo_1y_good_adc_mult_pos -nostat
-phodo_1y_good_adc_mult_neg -nostat
-phodo_1y_good_adc_mult -nostat
-newpage 3 2 
-title SHMS Hodo S2X ADC Mult.
-phodo_2x_raw_adc_mult_pos -nostat
-phodo_2x_raw_adc_mult_neg -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_raw_adc_mult_pos","phodo_2x_raw_adc_mult_neg","S2X+","S2X-","SHMS Hodo 2X Raw Multiplicity")' -nostat
 phodo_2x_raw_adc_mult -nostat
-phodo_2x_good_adc_mult_pos -nostat
-phodo_2x_good_adc_mult_neg -nostat
-phodo_2x_good_adc_mult -nostat
-newpage 3 2 
-title SHMS Hodo S2Y ADC Mult.
-phodo_2y_raw_adc_mult_pos -nostat
-phodo_2y_raw_adc_mult_neg -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2y_raw_adc_mult_pos","phodo_2y_raw_adc_mult_neg","S2Y+","S2Y-","SHMS Hodo 2Y Raw Multiplicity")' -nostat
 phodo_2y_raw_adc_mult -nostat
-phodo_2y_good_adc_mult_pos -nostat
-phodo_2y_good_adc_mult_neg -nostat
-phodo_2y_good_adc_mult -nostat
 
 newpage 4 2 
-title SHMS Hodo S1X/S1Y TDC Occ.
-phodo_1x_raw_tdc_occ_pos -nostat
-phodo_1x_raw_tdc_occ_neg -nostat
-phodo_1y_raw_tdc_occ_pos -nostat
-phodo_1y_raw_tdc_occ_neg -nostat
-phodo_1x_good_tdc_occ_pos -nostat
-phodo_1x_good_tdc_occ_neg -nostat
-phodo_1y_good_tdc_occ_pos -nostat
-phodo_1y_good_tdc_occ_neg -nostat
+title SHMS Hodo S1/S2 ADC Good Mult.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_good_adc_mult_pos","phodo_1x_good_adc_mult_neg","S1X+","S1X-","SHMS Hodo 1X Good Multiplicity")' -nostat
+phodo_1x_good_adc_mult -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_good_adc_mult_pos","phodo_1y_good_adc_mult_neg","S1Y+","S1Y-","SHMS Hodo 1Y Good Multiplicity")' -nostat
+phodo_1y_good_adc_mult -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_good_adc_mult_pos","phodo_2x_good_adc_mult_neg","S2X+","S2X-","SHMS Hodo 2X Good Multiplicity")' -nostat
+phodo_2x_good_adc_mult -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2y_good_adc_mult_pos","phodo_2y_good_adc_mult_neg","S2Y+","S2Y-","SHMS Hodo 2Y Good Multiplicity")' -nostat
+phodo_2y_good_adc_mult -nostat
+
+newpage 2 2 
+title SHMS Hodo S1/S2 TDC Raw Occ.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_raw_tdc_occ_pos","phodo_1x_raw_tdc_occ_neg","S1X+","S1X-","SHMS Hodo 1X Raw Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_raw_tdc_occ_pos","phodo_1y_raw_tdc_occ_neg","S1Y+","S1Y-","SHMS Hodo 1Y Raw Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_raw_tdc_occ_pos","phodo_2x_raw_tdc_occ_neg","S2X+","S2X-","SHMS Hodo 2X Raw Occupancy")' -nostat 
+macro 'UTIL/GEN/overlay2.C("phodo_2y_raw_tdc_occ_pos","phodo_2y_raw_tdc_occ_neg","S2Y+","S2Y-","SHMS Hodo 2Y Raw Occupancy")' -nostat
+
+newpage 2 2 
+title SHMS Hodo S1/S2 TDC Good Occ.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_good_tdc_occ_pos","phodo_1x_good_tdc_occ_neg","S1X+","S1X-","SHMS Hodo 1X Good Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_good_tdc_occ_pos","phodo_1y_good_tdc_occ_neg","S1Y+","S1Y-","SHMS Hodo 1Y Good Occupancy")' -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_good_tdc_occ_pos","phodo_2x_good_tdc_occ_neg","S2X+","S2X-","SHMS Hodo 2X Good Occupancy")' -nostat 
+macro 'UTIL/GEN/overlay2.C("phodo_2y_good_tdc_occ_pos","phodo_2y_good_tdc_occ_neg","S2Y+","S2Y-","SHMS Hodo 2Y Good Occupancy")' -nostat
+
 newpage 4 2 
-title SHMS Hodo S2X/S2Y TDC Occ.
-phodo_2x_raw_tdc_occ_pos -nostat
-phodo_2x_raw_tdc_occ_neg -nostat
-phodo_2y_raw_tdc_occ_pos -nostat
-phodo_2y_raw_tdc_occ_neg -nostat
-phodo_2x_good_tdc_occ_pos -nostat
-phodo_2x_good_tdc_occ_neg -nostat
-phodo_2y_good_tdc_occ_pos -nostat
-phodo_2y_good_tdc_occ_neg -nostat
-newpage 3 2 
-title SHMS Hodo S1X TDC Mult.
-phodo_1x_raw_tdc_mult_pos -nostat
-phodo_1x_raw_tdc_mult_neg -nostat
+title SHMS Hodo S1/S2 TDC Raw Mult.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_raw_tdc_mult_pos","phodo_1x_raw_tdc_mult_neg","S1X+","S1X-","SHMS Hodo 1X Raw Multiplicity")' -nostat
 phodo_1x_raw_tdc_mult -nostat
-phodo_1x_good_tdc_mult_pos -nostat
-phodo_1x_good_tdc_mult_neg -nostat
-phodo_1x_good_tdc_mult -nostat
-newpage 3 2 
-title SHMS Hodo S1Y TDC Mult.
-phodo_1y_raw_tdc_mult_pos -nostat
-phodo_1y_raw_tdc_mult_neg -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_raw_tdc_mult_pos","phodo_1y_raw_tdc_mult_neg","S1Y+","S1Y-","SHMS Hodo 1Y Raw Multiplicity")' -nostat
 phodo_1y_raw_tdc_mult -nostat
-phodo_1y_good_tdc_mult_pos -nostat
-phodo_1y_good_tdc_mult_neg -nostat
-phodo_1y_good_tdc_mult -nostat
-newpage 3 2 
-title SHMS Hodo S2X TDC Mult.
-phodo_2x_raw_tdc_mult_pos -nostat
-phodo_2x_raw_tdc_mult_neg -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_raw_tdc_mult_pos","phodo_2x_raw_tdc_mult_neg","S2X+","S2X-","SHMS Hodo 2X Raw Multiplicity")' -nostat
 phodo_2x_raw_tdc_mult -nostat
-phodo_2x_good_tdc_mult_pos -nostat
-phodo_2x_good_tdc_mult_neg -nostat
-phodo_2x_good_tdc_mult -nostat
-newpage 3 2 
-title SHMS Hodo S2Y TDC Mult.
-phodo_2y_raw_tdc_mult_pos -nostat
-phodo_2y_raw_tdc_mult_neg -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2y_raw_tdc_mult_pos","phodo_2y_raw_tdc_mult_neg","S2Y+","S2Y-","SHMS Hodo 2Y Raw Multiplicity")' -nostat
 phodo_2y_raw_tdc_mult -nostat
-phodo_2y_good_tdc_mult_pos -nostat
-phodo_2y_good_tdc_mult_neg -nostat
+
+newpage 4 2 
+title SHMS Hodo S1/S2 TDC Good Mult.
+macro 'UTIL/GEN/overlay2.C("phodo_1x_good_tdc_mult_pos","phodo_1x_good_tdc_mult_neg","S1X+","S1X-","SHMS Hodo 1X Good Multiplicity")' -nostat
+phodo_1x_good_tdc_mult -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_1y_good_tdc_mult_pos","phodo_1y_good_tdc_mult_neg","S1Y+","S1Y-","SHMS Hodo 1Y Good Multiplicity")' -nostat
+phodo_1y_good_tdc_mult -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2x_good_tdc_mult_pos","phodo_2x_good_tdc_mult_neg","S2X+","S2X-","SHMS Hodo 2X Good Multiplicity")' -nostat
+phodo_2x_good_tdc_mult -nostat
+macro 'UTIL/GEN/overlay2.C("phodo_2y_good_tdc_mult_pos","phodo_2y_good_tdc_mult_neg","S2Y+","S2Y-","SHMS Hodo 2Y Good Multiplicity")' -nostat
 phodo_2y_good_tdc_mult -nostat
 
 newpage 4 3 logz
@@ -121,6 +89,7 @@ phodo_1x_good_pped_vs_pmt_pos -nostat
 phodo_1x_good_pped_vs_pmt_neg -nostat
 phodo_1y_good_pped_vs_pmt_pos -nostat
 phodo_1y_good_pped_vs_pmt_neg -nostat
+
 newpage 4 3 logz
 title SHMS Hodo S2 Pulse Ped.
 phodo_2x_raw_pped_vs_pmt_pos -nostat
@@ -136,7 +105,6 @@ phodo_2x_good_pped_vs_pmt_neg -nostat
 phodo_2y_good_pped_vs_pmt_pos -nostat
 phodo_2y_good_pped_vs_pmt_neg -nostat
 
-
 newpage 4 3 logz
 title SHMS Hodo S1 Pulse Int.
 phodo_1x_raw_pi_vs_pmt_pos -nostat
@@ -151,6 +119,7 @@ phodo_1x_good_pi_vs_pmt_pos -nostat
 phodo_1x_good_pi_vs_pmt_neg -nostat
 phodo_1y_good_pi_vs_pmt_pos -nostat
 phodo_1y_good_pi_vs_pmt_neg -nostat
+
 newpage 4 3 logz
 title SHMS Hodo S2 Pulse Int.
 phodo_2x_raw_pi_vs_pmt_pos -nostat
@@ -180,6 +149,7 @@ phodo_1x_good_pamp_vs_pmt_pos -nostat
 phodo_1x_good_pamp_vs_pmt_neg -nostat
 phodo_1y_good_pamp_vs_pmt_pos -nostat
 phodo_1y_good_pamp_vs_pmt_neg -nostat
+
 newpage 4 3 logz
 title SHMS Hodo S2 Pulse Amp.
 phodo_2x_raw_pamp_vs_pmt_pos -nostat
@@ -195,7 +165,6 @@ phodo_2x_good_pamp_vs_pmt_neg -nostat
 phodo_2y_good_pamp_vs_pmt_pos -nostat
 phodo_2y_good_pamp_vs_pmt_neg -nostat
 
-
 newpage 4 2 logz
 title SHMS Hodo S1 Pulse Times
 phodo_1x_raw_ptime_vs_pmt_pos -nostat
@@ -206,6 +175,7 @@ phodo_1x_good_ptime_vs_pmt_pos -nostat
 phodo_1x_good_ptime_vs_pmt_neg -nostat
 phodo_1y_good_ptime_vs_pmt_pos -nostat
 phodo_1y_good_ptime_vs_pmt_neg -nostat
+
 newpage 4 2 logz
 title SHMS Hodo S2 Pulse Times
 phodo_2x_raw_ptime_vs_pmt_pos -nostat
@@ -227,16 +197,6 @@ phodo_1x_tdctime_vs_pmt_pos -nostat
 phodo_1x_tdctime_vs_pmt_neg -nostat
 phodo_1y_tdctime_vs_pmt_pos -nostat
 phodo_1y_tdctime_vs_pmt_neg -nostat
-newpage 4 2 logz
-title SHMS Hodo S2 TDC Times
-phodo_2x_raw_tdctime_vs_pmt_pos -nostat
-phodo_2x_raw_tdctime_vs_pmt_neg -nostat
-phodo_2y_raw_tdctime_vs_pmt_pos -nostat
-phodo_2y_raw_tdctime_vs_pmt_neg -nostat
-phodo_2x_tdctime_vs_pmt_pos -nostat
-phodo_2x_tdctime_vs_pmt_neg -nostat
-phodo_2y_tdctime_vs_pmt_pos -nostat
-phodo_2y_tdctime_vs_pmt_neg -nostat
 
 newpage 4 3 logz
 title SHMS Hodo S1 Good TDC Times
@@ -252,6 +212,18 @@ phodo_1x_good_tdctime_tofcorr_vs_pmt_pos -nostat
 phodo_1x_good_tdctime_tofcorr_vs_pmt_neg -nostat
 phodo_1y_good_tdctime_tofcorr_vs_pmt_pos -nostat
 phodo_1y_good_tdctime_tofcorr_vs_pmt_neg -nostat
+
+newpage 4 2 logz
+title SHMS Hodo S2 TDC Times
+phodo_2x_raw_tdctime_vs_pmt_pos -nostat
+phodo_2x_raw_tdctime_vs_pmt_neg -nostat
+phodo_2y_raw_tdctime_vs_pmt_pos -nostat
+phodo_2y_raw_tdctime_vs_pmt_neg -nostat
+phodo_2x_tdctime_vs_pmt_pos -nostat
+phodo_2x_tdctime_vs_pmt_neg -nostat
+phodo_2y_tdctime_vs_pmt_pos -nostat
+phodo_2y_tdctime_vs_pmt_neg -nostat
+
 newpage 4 3 logz
 title SHMS Hodo S2 Good TDC Times
 phodo_2x_good_tdctime_uncorr_vs_pmt_pos -nostat
diff --git a/onlineGUI/CONFIG/SHMS/TRIG/ptrig_stand.cfg b/onlineGUI/CONFIG/SHMS/TRIG/ptrig_stand.cfg
new file mode 100644
index 00000000..59485bbc
--- /dev/null
+++ b/onlineGUI/CONFIG/SHMS/TRIG/ptrig_stand.cfg
@@ -0,0 +1,87 @@
+protorootfile ../ROOTfiles/ptrig_replay_XXXXX.root
+guicolor orange 
+#canvassize 1600 800
+canvassize 800 800
+
+newpage 3 3
+title SHMS Raw Trigger Times
+ptrig_p1x_tdc_raw
+ptrig_p1y_tdc_raw
+ptrig_p2x_tdc_raw
+ptrig_p2y_tdc_raw
+ptrig_p1T_tdc_raw
+ptrig_p2T_tdc_raw
+ptrig_pT1_tdc_raw
+ptrig_pT2_tdc_raw
+ptrig_pT3_tdc_raw
+
+newpage 3 3
+title SHMS Trigger Times
+ptrig_p1x_tdc
+ptrig_p1y_tdc
+ptrig_p2x_tdc
+ptrig_p2y_tdc
+ptrig_p1T_tdc
+ptrig_p2T_tdc
+ptrig_pT1_tdc
+ptrig_pT2_tdc
+ptrig_pT3_tdc
+
+newpage 3 4
+title SHMS P.DC Raw Reference Times
+ptrig_pdc_raw_ref1
+ptrig_pdc_raw_ref2
+ptrig_pdc_raw_ref3
+ptrig_pdc_raw_ref4
+ptrig_pdc_raw_ref5
+ptrig_pdc_raw_ref6
+ptrig_pdc_raw_ref7
+ptrig_pdc_raw_ref8
+ptrig_pdc_raw_ref9
+ptrig_pdc_raw_ref10
+
+newpage 3 4
+title SHMS P.DC Reference Times
+ptrig_pdc_ref1
+ptrig_pdc_ref2
+ptrig_pdc_ref3
+ptrig_pdc_ref4
+ptrig_pdc_ref5
+ptrig_pdc_ref6
+ptrig_pdc_ref7
+ptrig_pdc_ref8
+ptrig_pdc_ref9
+ptrig_pdc_ref10
+
+newpage 3 2 logy
+title SHMS NGCER Raw
+ptrig_pngc_sum_pped_raw
+ptrig_pngc_sum_pint_raw
+ptrig_pngc_sum_pamp_raw
+ptrig_pngc_sum_ptime_raw
+ptrig_pngc_sum_tdc_raw
+
+
+newpage 3 2 logy
+title SHMS NGCER 
+ptrig_pngc_sum_pped
+ptrig_pngc_sum_pint
+ptrig_pngc_sum_pamp
+ptrig_pngc_sum_ptime_raw
+ptrig_pngc_sum_tdc
+
+newpage 3 2 logy
+title SHMS HGCER Raw
+ptrig_phgc_sum_pped_raw
+ptrig_phgc_sum_pint_raw
+ptrig_phgc_sum_pamp_raw
+ptrig_phgc_sum_ptime_raw
+ptrig_phgc_sum_tdc_raw
+
+newpage 3 2 logy
+title SHMS HGCER
+ptrig_phgc_sum_pped
+ptrig_phgc_sum_pint
+ptrig_phgc_sum_pamp
+ptrig_phgc_sum_ptime_raw
+ptrig_phgc_sum_tdc
diff --git a/onlineGUI/UTIL/GEN/overlay2.C b/onlineGUI/UTIL/GEN/overlay2.C
index cd6222fc..ae409c0f 100755
--- a/onlineGUI/UTIL/GEN/overlay2.C
+++ b/onlineGUI/UTIL/GEN/overlay2.C
@@ -8,7 +8,7 @@
  * hszumila@jlab.org
  *******************************/
 
-void overlay2(TString hist1name, TString hist2name, TString label1="", TString label2="", Bool_t golden=false,TString samestr=""){
+void overlay2(TString hist1name, TString hist2name, TString label1="", TString label2="", TString htitle="", Bool_t golden=false,TString samestr=""){
   TH1F* H1;
   TH1F* H2;
   
@@ -31,8 +31,8 @@ void overlay2(TString hist1name, TString hist2name, TString label1="", TString l
     H2->SetStats(0);
     H1->SetMinimum(0);
     H2->SetMinimum(0);
-    H1->SetTitle("");
-    H2->SetTitle("");
+    H1->SetTitle(htitle);
+    H2->SetTitle(htitle);
     H1->GetXaxis()->SetTitleSize(0.05);
     H1->GetYaxis()->SetTitleSize(0.045);
     H2->GetXaxis()->SetTitleSize(0.05);
-- 
GitLab