diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_kpp.def b/DEF-files/HMS/PRODUCTION/hstackana_production_kpp.def
index 77240108a8073397b9a0ac38d8f622458315e6f9..99e83e8dbd02f0149c89e907cc2cd80dcde8a94b 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production_kpp.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production_kpp.def
@@ -549,8 +549,8 @@ TH1F htrig_hpreShwr_adc_pamp 'HMS Pre-Shower Pulse Amplitude; Pulse Amplitude (
# HMS PreShower TRIG LOW/HIGH
#-----------------------------
-TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRLO_tdcTimeRaw 4000 0 40000
-TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRHI_tdcTimeRaw 4000 0 40000
+TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRLO_tdcTimeRaw 4000 0 40000
+TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRHI_tdcTimeRaw 4000 0 40000
#----------------------------------
@@ -566,10 +566,10 @@ TH1F htrig_hshwr_tdc 'HMS Shower TDC Time; TDC Time (TDC Units); Counts / 10 TD
# HMS Gas Cherenkov TRIG Pulse Profile
#---------------------------------------
-TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCERSUM_adcPed 5000 0 5000
-TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCERSUM_adcPulseInt 800 0 40000
-TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCERSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCERSUM_tdcTime 4000 0 40000
+TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCER_adcPed 5000 0 5000
+TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCER_adcPulseInt 800 0 40000
+TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCER_adcPulseAmp 205 0 4100
+TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCER_tdcTime 4000 0 40000
diff --git a/DEF-files/HMS/STACK/TRIG/htrig_histos.def b/DEF-files/HMS/STACK/TRIG/htrig_histos.def
index 85f7ab0d722b9a7f53453e341eb0620fef5d10b8..8b9f07b2da8321f50a9e7fd0acc1894b69dc0eb8 100644
--- a/DEF-files/HMS/STACK/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/STACK/TRIG/htrig_histos.def
@@ -72,8 +72,8 @@ TH1F htrig_hpreShwr_adc_pamp 'HMS Pre-Shower Pulse Amplitude; Pulse Amplitude (
# HMS PreShower TRIG LOW/HIGH
#-----------------------------
-TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRLO_tdcTimeRaw 4000 0 40000
-TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRHI_tdcTimeRaw 4000 0 40000
+TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRLO_tdcTimeRaw 4000 0 40000
+TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRHI_tdcTimeRaw 4000 0 40000
#----------------------------------
@@ -89,20 +89,20 @@ TH1F htrig_hshwr_tdc 'HMS Shower TDC Time; TDC Time (TDC Units); Counts / 10 TD
# HMS Gas Cherenkov TRIG Pulse Profile
#---------------------------------------
-TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCERSUM_adcPed 5000 0 5000
-TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCERSUM_adcPulseInt 800 0 40000
-TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCERSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCERSUM_tdcTime 4000 0 40000
+TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCER_adcPed 5000 0 5000
+TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCER_adcPulseInt 800 0 40000
+TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCER_adcPulseAmp 205 0 4100
+TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCER_tdcTime 4000 0 40000
#------------------------------------------
# HMS Aerogel TRIG Pulse Profile
#------------------------------------------
-TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hAERSUM_adcPed 5000 0 5000
-TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAERSUM_adcPulseInt 800 0 40000
-TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hAERSUM_adcPulseAmp 205 0 4100
-TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAERSUM_tdcTime 4000 0 40000
+TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hAER_adcPed 5000 0 5000
+TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAER_adcPulseInt 800 0 40000
+TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hAER_adcPulseAmp 205 0 4100
+TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAER_tdcTime 4000 0 40000
#-------------
diff --git a/DEF-files/HMS/STACK/hstackana.def b/DEF-files/HMS/STACK/hstackana.def
index 6378b365f0dc1a55f48ff92dfd7abf0439795c34..9cfee44ba941bd614ad600cf2789d29943974101 100644
--- a/DEF-files/HMS/STACK/hstackana.def
+++ b/DEF-files/HMS/STACK/hstackana.def
@@ -542,8 +542,8 @@ TH1F htrig_hpreShwr_adc_pamp 'HMS Pre-Shower Pulse Amplitude; Pulse Amplitude (
# HMS PreShower TRIG LOW/HIGH
#-----------------------------
-TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRLO_tdcTimeRaw 4000 0 40000
-TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRHI_tdcTimeRaw 4000 0 40000
+TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRLO_tdcTimeRaw 4000 0 40000
+TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRHI_tdcTimeRaw 4000 0 40000
#----------------------------------
@@ -559,20 +559,20 @@ TH1F htrig_hshwr_tdc 'HMS Shower TDC Time; TDC Time (TDC Units); Counts / 10 TD
# HMS Gas Cherenkov TRIG Pulse Profile
#---------------------------------------
-TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCERSUM_adcPed 5000 0 5000
-TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCERSUM_adcPulseInt 800 0 40000
-TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCERSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCERSUM_tdcTime 4000 0 40000
+TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCER_adcPed 5000 0 5000
+TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCER_adcPulseInt 800 0 40000
+TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCER_adcPulseAmp 205 0 4100
+TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCER_tdcTime 4000 0 40000
#------------------------------------------
# HMS Aerogel TRIG Pulse Profile
#------------------------------------------
-TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hAERSUM_adcPed 5000 0 5000
-TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAERSUM_adcPulseInt 800 0 40000
-TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hAERSUM_adcPulseAmp 205 0 4100
-TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAERSUM_tdcTime 4000 0 40000
+TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hAER_adcPed 5000 0 5000
+TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAER_adcPulseInt 800 0 40000
+TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hAER_adcPulseAmp 205 0 4100
+TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAER_tdcTime 4000 0 40000
#-------------
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def
index 03af7e008737c87484824507c93d488444b858f5..7a9c0ed74f6609e2eb67d1b26d44b0022dbe7691 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def
@@ -89,8 +89,8 @@ TH1F htrig_hpreShwr_adc_rawptime 'HMS Pre-Shower Raw Pulse Time; Raw Pulse Time
TH1F htrig_hpreShwr_adc_ptime 'HMS Pre-Shower Pulse Time; Pulse Time (ns); Counts ;' T.hms.hPSHWR_adcPulseTime 400 0 400
#TH1F htrig_hpreShwr_rawtdc 'HMS Pre-Shower Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWR_tdcTimeRaw 410 0 4100
-TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRLO_tdcTimeRaw 410 0 4100
-TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRHI_tdcTimeRaw 410 0 4100
+TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRLO_tdcTimeRaw 410 0 4100
+TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRHI_tdcTimeRaw 410 0 4100
#-----------------------------------
# HMS Shower TRIG Raw Pulse Profile
@@ -150,38 +150,38 @@ TH1F htrig_hshwr_tdc 'HMS Shower TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.h
# HMS Gas Cherenkov TRIG Raw Pulse Profile
#------------------------------------------
-TH1F htrig_hcersum_adc_rawpped 'HMS Cherenkov Sum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hCERSUM_adcPedRaw 410 0 4100
-TH1F htrig_hcersum_adc_rawpi 'HMS Cherenkov Sum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCERSUM_adcPulseIntRaw 800 0 40000
-TH1F htrig_hcersum_adc_rawpamp 'HMS Cherenkov Sum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hCERSUM_adcPulseAmpRaw 410 0 4100
-TH1F htrig_hcersum_adc_rawptime 'HMS Cherenkov Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 20 ADC Units;' T.hms.hCERSUM_adcPulseTimeRaw 205 0 4100
-TH1F htrig_hcersum_adc_ptime 'HMS Cherenkov Sum Pulse Time; Pulse Time (ns); Counts;' T.hms.hCERSUM_adcPulseTime 400 0 400
-TH1F htrig_hcersum_rawtdc 'HMS Cherenkov Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCERSUM_tdcTimeRaw 410 0 4100
+TH1F htrig_hcersum_adc_rawpped 'HMS Cherenkov Sum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hCER_adcPedRaw 410 0 4100
+TH1F htrig_hcersum_adc_rawpi 'HMS Cherenkov Sum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCER_adcPulseIntRaw 800 0 40000
+TH1F htrig_hcersum_adc_rawpamp 'HMS Cherenkov Sum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hCER_adcPulseAmpRaw 410 0 4100
+TH1F htrig_hcersum_adc_rawptime 'HMS Cherenkov Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 20 ADC Units;' T.hms.hCER_adcPulseTimeRaw 205 0 4100
+TH1F htrig_hcersum_adc_ptime 'HMS Cherenkov Sum Pulse Time; Pulse Time (ns); Counts;' T.hms.hCER_adcPulseTime 400 0 400
+TH1F htrig_hcersum_rawtdc 'HMS Cherenkov Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCER_tdcTimeRaw 410 0 4100
#---------------------------------------
# HMS Gas Cherenkov TRIG Pulse Profile
#---------------------------------------
-TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hCERSUM_adcPed 500 0 1000
-TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (pC); Counts / 0.25 pC;' T.hms.hCERSUM_adcPulseInt 320 0 80
-TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (mV); Counts / 2 mV;' T.hms.hCERSUM_adcPulseAmp 500 0 1000
-TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hCERSUM_tdcTime 400 0 4000
+TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hCER_adcPed 500 0 1000
+TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (pC); Counts / 0.25 pC;' T.hms.hCER_adcPulseInt 320 0 80
+TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (mV); Counts / 2 mV;' T.hms.hCER_adcPulseAmp 500 0 1000
+TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hCER_tdcTime 400 0 4000
#------------------------------------------
# HMS Aerogel TRIG Raw Pulse Profile
#------------------------------------------
-TH1F htrig_haersum_adc_rawpped 'HMS Aerogel Sum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hAERSUM_adcPedRaw 410 0 4100
-TH1F htrig_haersum_adc_rawpi 'HMS Aerogel Sum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAERSUM_adcPulseIntRaw 800 0 40000
-TH1F htrig_haersum_adc_rawpamp 'HMS Aerogel Sum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hAERSUM_adcPulseAmpRaw 410 0 4100
-TH1F htrig_haersum_adc_rawptime 'HMS Aerogel Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 20 ADC Units;' T.hms.hAERSUM_adcPulseTimeRaw 205 0 4100
-TH1F htrig_haersum_adc_ptime 'HMS Aerogel Sum Pulse Time; Raw Pulse Time (ns); Counts;' T.hms.hAERSUM_adcPulseTime 400 0 400
-#TH1F htrig_haersum_rawtdc 'HMS Aerogel Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAERSUM_tdcTimeRaw 410 0 4100
+TH1F htrig_haersum_adc_rawpped 'HMS Aerogel Sum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hAER_adcPedRaw 410 0 4100
+TH1F htrig_haersum_adc_rawpi 'HMS Aerogel Sum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAER_adcPulseIntRaw 800 0 40000
+TH1F htrig_haersum_adc_rawpamp 'HMS Aerogel Sum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hAER_adcPulseAmpRaw 410 0 4100
+TH1F htrig_haersum_adc_rawptime 'HMS Aerogel Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 20 ADC Units;' T.hms.hAER_adcPulseTimeRaw 205 0 4100
+TH1F htrig_haersum_adc_ptime 'HMS Aerogel Sum Pulse Time; Raw Pulse Time (ns); Counts;' T.hms.hAER_adcPulseTime 400 0 400
+#TH1F htrig_haersum_rawtdc 'HMS Aerogel Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAER_tdcTimeRaw 410 0 4100
#------------------------------------------
# HMS Aerogel TRIG Pulse Profile
#------------------------------------------
-TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hAERSUM_adcPed 500 0 1000
-TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (pC); Counts / 0.25 pC;' T.hms.hAERSUM_adcPulseInt 320 0 80
-TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (mV); Counts / 2 mV;' T.hms.hAERSUM_adcPulseAmp 500 0 1000
-#TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hAERSUM_tdcTime 4000 0 400
\ No newline at end of file
+TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hAER_adcPed 500 0 1000
+TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (pC); Counts / 0.25 pC;' T.hms.hAER_adcPulseInt 320 0 80
+TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (mV); Counts / 2 mV;' T.hms.hAER_adcPulseAmp 500 0 1000
+#TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hAER_tdcTime 4000 0 400
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/TRIG/ptrig_histos.def b/DEF-files/SHMS/STACK/TRIG/ptrig_histos.def
index a045cba2648e7abe4a3335eb119681610a2d311e..27479ef615bc6b63505f762743ce0e508d21eece 100644
--- a/DEF-files/SHMS/STACK/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/STACK/TRIG/ptrig_histos.def
@@ -2,17 +2,17 @@
# Trigger Apparatus *
#********************
-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
+TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pNGCER_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.pNGCER_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.pNGCER_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.pNGCER_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.pNGCER_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.pHGCER_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.pHGCER_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.pHGCER_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.pHGCER_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.pHGCER_tdcTime 700 -3500 3500
TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1X_tdcMultiplicity 11 0 11
TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1Y_tdcMultiplicity 11 0 11
diff --git a/DEF-files/SHMS/STACK/pstackana.def b/DEF-files/SHMS/STACK/pstackana.def
index 160b42154c38eecebea17c600af744fce475640e..8228e52d8dbb6715708f3cc96b37cea5d949056d 100644
--- a/DEF-files/SHMS/STACK/pstackana.def
+++ b/DEF-files/SHMS/STACK/pstackana.def
@@ -595,17 +595,17 @@ TH1F pcal_xtrack2 'SHMS Cal X pos of track no matching clust number of cluster=1
# Trigger Apparatus *
#********************
-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
+TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pNGCER_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.pNGCER_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.pNGCER_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.pNGCER_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.pNGCER_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.pHGCER_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.pHGCER_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.pHGCER_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.pHGCER_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.pHGCER_tdcTime 700 -3500 3500
TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1X_tdcMultiplicity 11 0 11
TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1Y_tdcMultiplicity 11 0 11
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_histos.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_histos.def
index e016bc5cbcc01600183dde4d09bc5f16f5eba700..b595a7909fd1b61e43aae179ae5f6ba1b8e546b3 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_histos.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_histos.def
@@ -64,27 +64,27 @@ TH1F ptrig_pdc_ref10 'SHMS PDC Reference Time 10; TDC Time (ns); Counts / 1 ns;'
#------------
# SHMS NGCER
#------------
-TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pNGCSUM_adcPed 500 0 1000
-TH1F ptrig_pngc_sum_pped_raw 'SHMS Noble Gas Sum FADC Raw Pulse Pedestal; Pulse Pedestal; Number of Entries / 10 ADC Units' T.shms.pNGCSUM_adcPedRaw 410 0 4100
-TH1F ptrig_pngc_sum_pint 'SHMS Noble Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 0.25 pC' T.shms.pNGCSUM_adcPulseInt 3200 -400 400
-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 3000 0 30000
-TH1F ptrig_pngc_sum_pamp 'SHMS Noble Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 2 mV' T.shms.pNGCSUM_adcPulseAmp 700 -400 1000
-TH1F ptrig_pngc_sum_pamp_raw 'SHMS Noble Gas Sum FADC Raw Pulse Amplitude; Pulse Amplitude; Number of Entries / 10 ADC Units' T.shms.pNGCSUM_adcPulseAmpRaw 450 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 410 0 4100
-TH1F ptrig_pngc_sum_ptime 'SHMS Noble Gas Sum FADC Pulse Time; Pulse Time (ns); Number of Entries ' T.shms.pNGCSUM_adcPulseTimeRaw 410 0 410
-TH1F ptrig_pngc_sum_tdc 'SHMS Noble Gas Sum TDC Time; TDC Time; Number of Entries / 0.1 ns' T.shms.pNGCSUM_tdcTime 4000 0 400
-TH1F ptrig_pngc_sum_tdc_raw 'SHMS Noble Gas Sum Raw TDC Time; TDC Time; Number of Entries / 1 TDC Units' T.shms.pNGCSUM_tdcTimeRaw 4000 0 4000
+TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pNGCER_adcPed 500 0 1000
+TH1F ptrig_pngc_sum_pped_raw 'SHMS Noble Gas Sum FADC Raw Pulse Pedestal; Pulse Pedestal; Number of Entries / 10 ADC Units' T.shms.pNGCER_adcPedRaw 410 0 4100
+TH1F ptrig_pngc_sum_pint 'SHMS Noble Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 0.25 pC' T.shms.pNGCER_adcPulseInt 3200 -400 400
+TH1F ptrig_pngc_sum_pint_raw 'SHMS Noble Gas Sum FADC Raw Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pNGCER_adcPulseIntRaw 3000 0 30000
+TH1F ptrig_pngc_sum_pamp 'SHMS Noble Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 2 mV' T.shms.pNGCER_adcPulseAmp 700 -400 1000
+TH1F ptrig_pngc_sum_pamp_raw 'SHMS Noble Gas Sum FADC Raw Pulse Amplitude; Pulse Amplitude; Number of Entries / 10 ADC Units' T.shms.pNGCER_adcPulseAmpRaw 450 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.pNGCER_adcPulseTimeRaw 410 0 4100
+TH1F ptrig_pngc_sum_ptime 'SHMS Noble Gas Sum FADC Pulse Time; Pulse Time (ns); Number of Entries ' T.shms.pNGCER_adcPulseTimeRaw 410 0 410
+TH1F ptrig_pngc_sum_tdc 'SHMS Noble Gas Sum TDC Time; TDC Time; Number of Entries / 0.1 ns' T.shms.pNGCER_tdcTime 4000 0 400
+TH1F ptrig_pngc_sum_tdc_raw 'SHMS Noble Gas Sum Raw TDC Time; TDC Time; Number of Entries / 1 TDC Units' T.shms.pNGCER_tdcTimeRaw 4000 0 4000
#------------
# SHMS HGCER
#------------
-TH1F ptrig_phgc_sum_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pHGCSUM_adcPed 500 0 1000
-TH1F ptrig_phgc_sum_pped_raw 'SHMS Heavy Gas Sum FADC Raw Pulse Pedestal; Pulse Pedestal; Number of Entries / 10 ADC Units' T.shms.pHGCSUM_adcPedRaw 410 0 4100
-TH1F ptrig_phgc_sum_pint 'SHMS Heavy Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 0.25 pC' T.shms.pHGCSUM_adcPulseInt 3200 -400 400
-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 3000 0 30000
-TH1F ptrig_phgc_sum_pamp 'SHMS Heavy Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 2 mV' T.shms.pHGCSUM_adcPulseAmp 700 -400 1000
-TH1F ptrig_phgc_sum_pamp_raw 'SHMS Heavy Gas Sum FADC Raw Pulse Amplitude; Pulse Amplitude; Number of Entries / 10 ADC Units' T.shms.pHGCSUM_adcPulseAmpRaw 450 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 410 0 4100
-TH1F ptrig_phgc_sum_ptime 'SHMS Heavy Gas Sum FADC Pulse Time; Pulse Time ; Number of Entries ' T.shms.pHGCSUM_adcPulseTimeRaw 410 0 410
-TH1F ptrig_phgc_sum_tdc 'SHMS Heavy Gas Sum TDC Time; TDC Time; Number of Entries / 0.1 ns' T.shms.pHGCSUM_tdcTime 4000 0 400
-TH1F ptrig_phgc_sum_tdc_raw 'SHMS Heavy Gas Sum Raw TDC Time; TDC Time; Number of Entries / 1 TDC Units' T.shms.pHGCSUM_tdcTimeRaw 4000 0 4000
+TH1F ptrig_phgc_sum_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pHGCER_adcPed 500 0 1000
+TH1F ptrig_phgc_sum_pped_raw 'SHMS Heavy Gas Sum FADC Raw Pulse Pedestal; Pulse Pedestal; Number of Entries / 10 ADC Units' T.shms.pHGCER_adcPedRaw 410 0 4100
+TH1F ptrig_phgc_sum_pint 'SHMS Heavy Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 0.25 pC' T.shms.pHGCER_adcPulseInt 3200 -400 400
+TH1F ptrig_phgc_sum_pint_raw 'SHMS Heavy Gas Sum FADC Raw Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pHGCER_adcPulseIntRaw 3000 0 30000
+TH1F ptrig_phgc_sum_pamp 'SHMS Heavy Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 2 mV' T.shms.pHGCER_adcPulseAmp 700 -400 1000
+TH1F ptrig_phgc_sum_pamp_raw 'SHMS Heavy Gas Sum FADC Raw Pulse Amplitude; Pulse Amplitude; Number of Entries / 10 ADC Units' T.shms.pHGCER_adcPulseAmpRaw 450 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.pHGCER_adcPulseTimeRaw 410 0 4100
+TH1F ptrig_phgc_sum_ptime 'SHMS Heavy Gas Sum FADC Pulse Time; Pulse Time ; Number of Entries ' T.shms.pHGCER_adcPulseTimeRaw 410 0 410
+TH1F ptrig_phgc_sum_tdc 'SHMS Heavy Gas Sum TDC Time; TDC Time; Number of Entries / 0.1 ns' T.shms.pHGCER_tdcTime 4000 0 400
+TH1F ptrig_phgc_sum_tdc_raw 'SHMS Heavy Gas Sum Raw TDC Time; TDC Time; Number of Entries / 1 TDC Units' T.shms.pHGCER_tdcTimeRaw 4000 0 4000
diff --git a/MAPS/HMS/DETEC/AERO/haero_htrig.map b/MAPS/HMS/DETEC/AERO/haero_htrig.map
index 13b36e4add7f6148e582d22fa40f1745179cd3f0..92879f4fe59a2c1e9d2e08d5e13fead8c30ebca2 100644
--- a/MAPS/HMS/DETEC/AERO/haero_htrig.map
+++ b/MAPS/HMS/DETEC/AERO/haero_htrig.map
@@ -14,8 +14,8 @@ REFINDEX=3
11, 1, 4, 0 ! hDSUM
12, 1, 5, 0 ! hPSHWR
13, 1, 6, 0 ! hSHWR
- 14, 1, 7, 0 ! hAERSUM
- 15, 1, 8, 0 ! hCERSUM
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
SLOT=18
REFINDEX=3
@@ -36,11 +36,11 @@ REFINDEX=0
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
10, 2, 11, 1 ! hDSUM
- 11, 2, 12, 1 ! hPSHWRLO
- 12, 2, 13, 1 ! hPSHWRHI
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
13, 2, 14, 1 ! hSHWR
14, 2, 15, 1 ! hEDTM
- 15, 2, 16, 1 ! hCERSUM
+ 15, 2, 16, 1 ! hCER
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
28, 2, 24, 1 ! hTRIG3
diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
index 47c46a48c93960b41b3a410f4677281cbf94283d..b2736a8d8bb63e368aa471d78b0143826b90a420 100644
--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -14,8 +14,8 @@ REFINDEX=3
11, 1, 4, 0 ! hDSUM
12, 1, 5, 0 ! hPSHWR
13, 1, 6, 0 ! hSHWR
- 14, 1, 7, 0 ! hAERSUM
- 15, 1, 8, 0 ! hCERSUM
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
SLOT=18
REFINDEX=3
@@ -36,11 +36,11 @@ REFINDEX=0
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
10, 2, 11, 1 ! hDSUM
- 11, 2, 12, 1 ! hPSHWRLO
- 12, 2, 13, 1 ! hPSHWRHI
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
13, 2, 14, 1 ! hSHWR
14, 2, 15, 1 ! hEDTM
- 15, 2, 16, 1 ! hCERSUM
+ 15, 2, 16, 1 ! hCER
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
28, 2, 24, 1 ! hTRIG3
diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map
index b3b5827bc6aef53b69f4b5f3a09f20c9dfcec292..706a55f9c5e733674de2d106a83357dfab356190 100644
--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -14,8 +14,8 @@ REFINDEX=3
11, 1, 4, 0 ! hDSUM
12, 1, 5, 0 ! hPSHWR
13, 1, 6, 0 ! hSHWR
- 14, 1, 7, 0 ! hAERSUM
- 15, 1, 8, 0 ! hCERSUM
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
SLOT=18
REFINDEX=3
@@ -36,11 +36,11 @@ REFINDEX=0
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
10, 2, 11, 1 ! hDSUM
- 11, 2, 12, 1 ! hPSHWRLO
- 12, 2, 13, 1 ! hPSHWRHI
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
13, 2, 14, 1 ! hSHWR
14, 2, 15, 1 ! hEDTM
- 15, 2, 16, 1 ! hCERSUM
+ 15, 2, 16, 1 ! hCER
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
28, 2, 24, 1 ! hTRIG3
diff --git a/MAPS/HMS/DETEC/DC/hdc_htrig.map b/MAPS/HMS/DETEC/DC/hdc_htrig.map
index 53455c311ccdaf303e0fc783880c7d69a2e38346..cbeb9d49e58c307a02841d0ed2c86adae7a6d67f 100644
--- a/MAPS/HMS/DETEC/DC/hdc_htrig.map
+++ b/MAPS/HMS/DETEC/DC/hdc_htrig.map
@@ -14,8 +14,8 @@ REFINDEX=3
11, 1, 4, 0 ! hDSUM
12, 1, 5, 0 ! hPSHWR
13, 1, 6, 0 ! hSHWR
- 14, 1, 7, 0 ! hAERSUM
- 15, 1, 8, 0 ! hCERSUM
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
SLOT=18
REFINDEX=3
@@ -36,11 +36,11 @@ REFINDEX=0
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
10, 2, 11, 1 ! hDSUM
- 11, 2, 12, 1 ! hPSHWRLO
- 12, 2, 13, 1 ! hPSHWRHI
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
13, 2, 14, 1 ! hSHWR
14, 2, 15, 1 ! hEDTM
- 15, 2, 16, 1 ! hCERSUM
+ 15, 2, 16, 1 ! hCER
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
28, 2, 24, 1 ! hTRIG3
diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
index 106cb040c418c9732972599bfa0092169295c255..8da9bd3b42d52d469f3a051b2cba36d6a7cec153 100644
--- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
@@ -14,8 +14,8 @@ REFINDEX=3
11, 1, 4, 0 ! hDSUM
12, 1, 5, 0 ! hPSHWR
13, 1, 6, 0 ! hSHWR
- 14, 1, 7, 0 ! hAERSUM
- 15, 1, 8, 0 ! hCERSUM
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
SLOT=18
REFINDEX=3
@@ -36,11 +36,11 @@ REFINDEX=0
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
10, 2, 11, 1 ! hDSUM
- 11, 2, 12, 1 ! hPSHWRLO
- 12, 2, 13, 1 ! hPSHWRHI
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
13, 2, 14, 1 ! hSHWR
14, 2, 15, 1 ! hEDTM
- 15, 2, 16, 1 ! hCERSUM
+ 15, 2, 16, 1 ! hCER
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
28, 2, 24, 1 ! hTRIG3
diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map
index 7e2c5d39525e079bac0e58e9d75c52f40cff3339..d9632c5bd07a70b8ee5c8608913a8b626c0851c7 100644
--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -18,8 +18,8 @@ REFINDEX=3
11, 1, 4, 0 ! hDSUM
12, 1, 5, 0 ! hPSHWR
13, 1, 6, 0 ! hSHWR
- 14, 1, 7, 0 ! hAERSUM
- 15, 1, 8, 0 ! hCERSUM
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
SLOT=18
REFINDEX=3
@@ -40,11 +40,11 @@ REFINDEX=0
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
10, 2, 11, 1 ! hDSUM
- 11, 2, 12, 1 ! hPSHWRLO
- 12, 2, 13, 1 ! hPSHWRHI
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
13, 2, 14, 1 ! hSHWR
14, 2, 15, 1 ! hEDTM
- 15, 2, 16, 1 ! hCERSUM
+ 15, 2, 16, 1 ! hCER
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
28, 2, 24, 1 ! hTRIG3
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index 1a7a05c249a7acc7f2a9483358fbd818ede2b30c..d083d1480230c1024025127a84474a13c1cfb6e4 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -18,8 +18,8 @@ REFINDEX=3
11, 1, 4, 0! hDSUM
12, 1, 5, 0! hPSHWR
13, 1, 6, 0! hSHWR
- 14, 1, 7, 0! hAERSUM
- 15, 1, 8, 0! hCERSUM
+ 14, 1, 7, 0! hAER
+ 15, 1, 8, 0! hCER
SLOT=18
REFINDEX=3
@@ -44,11 +44,11 @@ REFINDEX=0
8, 2, 9, 1! hBSUM
9, 2, 10, 1! hCSUM
10, 2, 11, 1! hDSUM
- 11, 2, 12, 1! hPSHWRLO
- 12, 2, 13, 1! hPSHWRHI
+ 11, 2, 12, 1! hPRLO
+ 12, 2, 13, 1! hPRHI
13, 2, 14, 1! hSHWR
14, 2, 15, 1! hEDTM
- 15, 2, 16, 1! hCERSUM
+ 15, 2, 16, 1! hCER
! A1
26, 2, 22, 1! hTRIG1
27, 2, 23, 1! hTRIG2
diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
index a1a4974462a571b7a06dce0881c6d421227a8481..3fb4298e2f4d7a364c11315ab1bad490e049b848 100644
--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -9,9 +9,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -30,12 +31,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
index b425d26cf93a27a02d53e3d1854f2eca50e95c16..cc79d53776a118fe639108e66959d1e6d4f8c34e 100644
--- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
+++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
@@ -9,9 +9,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -30,12 +31,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
index a69c36d455814167ce2b7b6e0f42bd8531dd32f4..b598bca4abd6b4e88536307920d0e0f0e224eb17 100644
--- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
+++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
@@ -9,9 +9,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -30,12 +31,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
index 08b08ef837c94fdba5965099ab159a163b4f358f..640313fc48fa847ff0662b69d39541938a302779 100644
--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -9,9 +9,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -30,12 +31,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
index d4e58afd3fb887575c9567cdce658255c35c09f8..d480ac1ecb94b83f4d6c7ea3bf446c818466309b 100644
--- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
@@ -9,9 +9,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -30,12 +31,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
index d1913eab4ba7c5c194af0da67e5a357c9adf08c4..2f6376f5b2f4191146f938b7ef536522013c8e2f 100644
--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -9,9 +9,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -30,12 +31,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map
index 9d94b46cb235be35acd9c2c34b9515f951058692..6b2b68a582560d1d3f5179638cc1e2ebaf21a200 100644
--- a/MAPS/SHMS/DETEC/STACK/shms_stack.map
+++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map
@@ -15,9 +15,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -36,12 +37,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map
index 32bf4f699d4eb95f6646737d55b8b5930a8da6b1..69f620c38383dcdcf35e32c407126de62e8b77d7 100644
--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -7,9 +7,10 @@ ROC=2
SLOT=14
REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAERSUM
- 1, 1, 2, 0 ! pHGCERSUM
- 2, 1, 3, 0 ! pNGCERSUM
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20
@@ -28,12 +29,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAERSUM
- 40, 2, 11, 1 ! pHGCERSUM
- 41, 2, 12, 1 ! pNGCERSUM
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRSHWRLO
- 44, 2, 25, 1 ! pPRSHWRHI
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3
diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param
index c3192d25b431356a8e0ac3e1f6d036103578486f..e349f1f5721aed03d6fd580817c933da0d0c834d 100644
--- a/PARAM/TRIG/tcoin.param
+++ b/PARAM/TRIG/tcoin.param
@@ -1,11 +1,11 @@
-t_coin_numAdc = 13
+t_coin_numAdc = 14
t_coin_numTdc = 94
t_coin_tdcoffset = 300.
t_coin_adc_tdc_offset = 200.
t_coin_tdcchanperns = 0.1
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13
-t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM hFADC_TREF_ROC1 pAERSUM pHGCSUM pNGCSUM pFADC_TREF_ROC2"
+; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14
+t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1 pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
-t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hEDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRSHWRLO pPRSHWRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1"
+; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
+t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1"
diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param
index 66c6615db61f0e704f26f2946f7847e537dc6b55..7f527ef6661b366d9bc7815a096f4513d360e892 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -4,8 +4,8 @@ t_hms_tdcoffset=300.
t_hms_adc_tdc_offset=300.
t_hms_tdcchanperns=0.1
-; bar num: 1 2 3 4 5 6 7 8 9
-t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM hFADC_TREF_ROC1"
+; bar num: 1 2 3 4 5 6 7 8 9
+t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1"
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
-t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hEDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN"
\ No newline at end of file
+; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
+t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN"
\ No newline at end of file
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index c332262a7fa1cf8ae6725ff9421df5798a49d1c3..07c8c6765d5d53ca17f30496e7c66e94b586e345 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,12 +1,12 @@
-t_shms_numAdc = 4
+t_shms_numAdc = 5
t_shms_numTdc = 49
t_shms_tdcoffset = 300.
t_shms_adc_tdc_offset = 200.
t_shms_tdcchanperns = 0.1
-; bar num: 1 2 3 4
-t_shms_adcNames = "pAERSUM pHGCSUM pNGCSUM pFADC_TREF_ROC2"
+; bar num: 1 2 3 4 5
+t_shms_adcNames = "pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
-; BAR NUM: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
-t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRSHWRLO pPRSHWRHI pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN"
+; BAR NUM: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
+t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN"