diff --git a/DEF-files/HMS/EPICS/epics_short.def b/DEF-files/HMS/EPICS/epics_short.def
index b1e773c18746eb72e62fd1ba406f3b7e2342a6dd..b675f6f4ccd1ef0643b519d47ea546c7630f0ef6 100644
--- a/DEF-files/HMS/EPICS/epics_short.def
+++ b/DEF-files/HMS/EPICS/epics_short.def
@@ -1,5 +1,4 @@
-# See $ANALYZER/examples/output_example.def for examples
-
+block T.hms.*
begin epics
IBC3H00CRCUR4
diff --git a/MAPS/COIN/DETEC/TRIG/cointrig.map b/MAPS/COIN/DETEC/TRIG/cointrig.map
index 45f0ea2def263ff278d8dbd3f37cdbf846111d64..b681a478e4cbc964f1f67be3c2d74c3dd32ff79a 100644
--- a/MAPS/COIN/DETEC/TRIG/cointrig.map
+++ b/MAPS/COIN/DETEC/TRIG/cointrig.map
@@ -46,7 +46,7 @@ REFINDEX=0
11, 2, 12, 1! hPSHWRLO
12, 2, 13, 1! hPSHWRHI
13, 2, 14, 1! hSHWR
- 14, 2, 15, 1! hAERSUM
+ 14, 2, 15, 1! hHODO_EDTM
15, 2, 16, 1! hCERSUM
!CAEN1190 module
SLOT=20
@@ -102,6 +102,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
ROC=6
diff --git a/MAPS/HMS/DETEC/AERO/haero_htrig.map b/MAPS/HMS/DETEC/AERO/haero_htrig.map
index d6129c33ec390abef7196a61d5899b06052ae529..b0bf58b21678e6a29e8fe7aa9d0c38054c06e7cc 100644
--- a/MAPS/HMS/DETEC/AERO/haero_htrig.map
+++ b/MAPS/HMS/DETEC/AERO/haero_htrig.map
@@ -32,7 +32,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hAERSUM
+ 14, 2, 15, 1 ! hHODO_EDTM
15, 2, 16, 1 ! hCERSUM
SLOT=20
diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
index 47c4dffd4433f39a9e456eb1e1ea31d4dffec625..a7df2aa46cac62a1b9b8768684f614fdec63e865 100644
--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -32,7 +32,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hAERSUM
+ 14, 2, 15, 1 ! hHODO_EDTM
15, 2, 16, 1 ! hCERSUM
SLOT=20
diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map
index 7dde3c534ab00a0e9b6f2708173979db9c932ee3..15cfd2ef286a49ca20cfb2e1082c1230d4cce2a8 100644
--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -32,7 +32,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hAERSUM
+ 14, 2, 15, 1 ! hHODO_EDTM
15, 2, 16, 1 ! hCERSUM
SLOT=20
diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map
index 40c1ff1c002f7865f2b824a11e35c31e83913772..623dc4946f553ffcdab9a3ababcb9112f993ae10 100644
--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -43,7 +43,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hAERSUM
+ 14, 2, 15, 1 ! hHODO_EDTM
15, 2, 16, 1 ! hCERSUM
SLOT=20
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index bf86bea8f90bd52558e048c62fdb9c7db6fe2ffc..1190ca6396274240ee3771220098d735f60c679c 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -46,7 +46,7 @@ REFINDEX=0
11, 2, 12, 1! hPSHWRLO
12, 2, 13, 1! hPSHWRHI
13, 2, 14, 1! hSHWR
- 14, 2, 15, 1! hAERSUM
+ 14, 2, 15, 1! hHODO_EDTM
15, 2, 16, 1! hCERSUM
!CAEN1190 module
SLOT=20
diff --git a/MAPS/SCALERS/db_HScalevt.dat b/MAPS/SCALERS/db_HScalevt.dat
index 06d24d5a79d373cece89009cceffd9bfc2f852d6..7a978fdb2a765d2ab849c69bf50a12bd1b293c30 100644
--- a/MAPS/SCALERS/db_HScalevt.dat
+++ b/MAPS/SCALERS/db_HScalevt.dat
@@ -141,8 +141,6 @@ variable 0 19 1 .hod.1x7.negScaler HMS 1X- paddle 7
variable 0 19 2 .hod.1x7.negScalerRate HMS 1X- paddle 7
variable 0 3 1 .hod.1x7.posScaler HMS 1X+ paddle 7
variable 0 3 2 .hod.1x7.posScalerRate HMS 1X+ paddle 7
-variable 6 14 1 .AERSUM.scaler HMS AERSUM
-variable 6 14 2 .AERSUM.scalerRate HMS AERSUM
variable 2 12 1 .hod.2x10.posScaler HMS 2X+ paddle 10
variable 2 12 2 .hod.2x10.posScalerRate HMS 2X+ paddle 10
variable 6 25 1 .BCM4A.scaler bcm4a
@@ -303,6 +301,8 @@ variable 1 1 1 .hod.1y3.posScaler HMS 1Y+ paddle 3
variable 1 1 2 .hod.1y3.posScalerRate HMS 1Y+ paddle 3
variable 1 17 1 .hod.1y3.negScaler HMS 1Y- paddle 3
variable 1 17 2 .hod.1y3.negScalerRate HMS 1Y- paddle 3
+variable 6 14 1 .HOD_EDTM.scaler HMS HODO EDTM
+variable 6 14 2 .HOD_EDTM.scalerRate HMS HODO EDTM
variable 0 26 1 .hod.1x13.negScaler HMS 1X- paddle 13
variable 0 26 2 .hod.1x13.negScalerRate HMS 1X- paddle 13
variable 0 10 1 .hod.1x13.posScaler HMS 1X+ paddle 13
diff --git a/MAPS/SCALERS/db_PScalevt.dat b/MAPS/SCALERS/db_PScalevt.dat
index c941be4e3ae737eee2a8d9d62cfe4b810bc8a201..7e8f4605d9832998b74751a9fdb06a8b11ec5d8e 100644
--- a/MAPS/SCALERS/db_PScalevt.dat
+++ b/MAPS/SCALERS/db_PScalevt.dat
@@ -88,8 +88,6 @@ variable 2 14 1 .hod.2x14.posScaler SHMS 2X+ paddle 14
variable 2 14 2 .hod.2x14.posScalerRate SHMS 2X+ paddle 14
variable 3 28 1 .hod.2y10.negScaler SHMS 2y- paddle 10
variable 3 28 2 .hod.2y10.negScalerRate SHMS 2y- paddle 10
-variable 7 10 1 .DSUM.scaler SHMS DSUM
-variable 7 10 2 .DSUM.scalerRate SHMS DSUM
variable 3 12 1 .hod.2y10.posScaler SHMS 2y+ paddle 10
variable 3 12 2 .hod.2y10.posScalerRate SHMS 2y+ paddle 10
variable 3 17 1 .hod.2y3.negScaler SHMS 2y- paddle 3
@@ -162,6 +160,8 @@ variable 0 13 1 .hod.1x12.posScaler SHMS 1X+ paddle 12
variable 0 13 2 .hod.1x12.posScalerRate SHMS 1X+ paddle 12
variable 3 24 1 .hod.2y9.negScaler SHMS 2y- paddle 9
variable 3 24 2 .hod.2y9.negScalerRate SHMS 2y- paddle 9
+variable 7 10 1 .HOD_EDTM.scaler SHMS HODO EDTM
+variable 7 10 2 .HOD_EDTM.scalerRate SHMS HODO EDTM
variable 1 21 1 .hod.1y4.posScaler SHMS 1Y+ paddle 4
variable 1 21 2 .hod.1y4.posScalerRate SHMS 1Y+ paddle 4
variable 2 8 1 .hod.2x9.posScaler SHMS 2X+ paddle 9
diff --git a/MAPS/SCALERS/scaler.map b/MAPS/SCALERS/scaler.map
index 082eb85a864e63325f0e8be5d38b62c9c3fbcacc..ee8e8d99074de072a548893e009484c678bbfe72 100755
--- a/MAPS/SCALERS/scaler.map
+++ b/MAPS/SCALERS/scaler.map
@@ -205,7 +205,7 @@ DSUM 0 4 6 10 1 HMS DSUM
PSHWRLO 0 4 6 11 1 HMS PSHWRLO
PSHWRHI 0 4 6 12 1 HMS PSHWRHI
SHWR 0 4 6 13 1 HMS SHWR
-AERSUM 0 4 6 14 1 HMS AERSUM
+HOD_EDTM 0 4 6 14 1 HMS HODO EDTM
CERSUM 0 4 6 15 1 HMS CERSUM
BCM4A 0 4 6 25 1 bcm4a
BCM4B 0 4 6 26 1 bcm4b
@@ -361,7 +361,7 @@ Trig 0 5 7 6 1 SHMS T1
ASUM 0 5 7 7 1 SHMS ASUM
BSUM 0 5 7 8 1 SHMS BSUM
CSUM 0 5 7 9 1 SHMS CSUM
-DSUM 0 5 7 10 1 SHMS DSUM
+HOD_EDTM 0 5 7 10 1 SHMS HODO EDTM
PSHWRLO 0 5 7 11 1 SHMS PSHWRLO
PSHWRHI 0 5 7 12 1 SHMS PSHWRHI
SHWR 0 5 7 13 1 SHMS SHWR
diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
index 4371a2f39bec818b16aea1bc046cfd605df0a42c..7162f8d9cf713121a711443cf6eafd8f6afbc41e 100644
--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCSUM
41, 2, 12, 1 ! pNGCSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
ROC=6
diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
index b67003d2d571767f1d48c606f457f0b92b315e68..c3f1e1bd787c07d40ce8ed24b416aadff7b2e047 100644
--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
ROC=6
diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
index 8f82c1e62eb33cb3d0dc49cd2edcae6053cd76df..2b825d532b5dd75a7b1eef902fd216f18eac75ca 100644
--- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
ROC=6
diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
index 697bbb6d98f0780787fe86a7c42464d34ac10954..0ed42633a111d0b957e454762aacb46dacc730a2 100644
--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
ROC=6
diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map
index 58b2339eacee524faa122cb96ce19a5bb3455a94..03902b074c98a91e3a3de0205b1e28989d08b294 100644
--- a/MAPS/SHMS/DETEC/STACK/shms_stack.map
+++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map
@@ -36,6 +36,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
ROC=6
diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map
index 4c09cf42f13a9136f3be84f6e436f3f38ec132a7..0c87bc567dd51809f4428a489be5325676b73ef4 100644
--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -31,6 +31,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
ROC=6
diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param
index 5f86e65d463a51f290af0c755fefaa5972345404..bd0c2c7fe2a7d52c31df7d3e78e4732c73854f57 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -6,5 +6,5 @@ t_hms_tdcchanperns=0.1
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12
t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM hFRXA hFRYA hFRXB hFRYB"
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
-t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hAERSUM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4"
+; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
+t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hHODO_EDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4"
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index 05b2e0335c8d2a8acec4ebc4003aefc7974927fb..4cbae52d8cc8601b5aad81a35c04dcd09892504b 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,10 +1,10 @@
t_shms_numAdc = 7
-t_shms_numTdc = 22
+t_shms_numTdc = 23
t_shms_tdcoffset = -300.
t_shms_tdcchanperns = 0.1
; bar num: 1 2 3 4 5 6 7
t_shms_adcNames = "pAERSUM pHGCSUM pNGCSUM pFRXA pFRYA pFRXB pFRYB"
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-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"
\ 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
+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 pHODO_EDTM"
\ No newline at end of file