diff --git a/DEF-files/HMS/CAL/hcalana.def b/DEF-files/HMS/CAL/hcalana.def
index 52c84478bb55e02e4c1c61328a925e3a25f39c2a..01b5e45365929623ece38e1454276b6b2d6a1e8b 100644
--- a/DEF-files/HMS/CAL/hcalana.def
+++ b/DEF-files/HMS/CAL/hcalana.def
@@ -1,3 +1,21 @@
 # See $ANALYZER/examples/output_example.def for examples
 #
-block H.cal.*
\ No newline at end of file
+block H.cal.*
+
+TH1F hcal_hAm_pi 'HMS hA- Pulse Integral; Pulse Integral (ADC Units); Counts / 10 ADC Units' H.cal.1pr.aneg 2500 0 25000
+TH1F hcal_hAp_pi 'HMS hA+ Pulse Integral; Pulse Integral (ADC Units); Counts / 10 ADC Units' H.cal.1pr.apos 2500 0 25000
+
+TH1F hcal_hBm_pi 'HMS hB- Pulse Integral; Pulse Integral (ADC Units); Counts / 10 ADC Units' H.cal.2ta.aneg 2500 0 25000
+TH1F hcal_hBp_pi 'HMS hB+ Pulse Integral; Pulse Integral (ADC Units); Counts / 10 ADC Units' H.cal.2ta.apos 2500 0 25000
+
+TH1F hcal_hCp_pi 'HMS hC+ Pulse Integral; Pulse Integral (ADC Units); Counts / 10 ADC Units' H.cal.3ta.apos 2500 0 25000
+TH1F hcal_hDp_pi 'HMS hD+ Pulse Integral; Pulse Integral (ADC Units); Counts / 10 ADC Units' H.cal.4ta.apos 2500 0 25000
+
+TH1F hcal_hAm_occu "HMS hA- ADC Occupancy; Paddle Number; Number of ADC Hits' H.cal.1pr.negadchits 13 0.5 13.5
+TH1F hcal_hAp_occu "HMS hA+ ADC Occupancy; Paddle Number; Number of ADC Hits' H.cal.1pr.posadchits 13 0.5 13.5
+
+TH1F hcal_hBm_occu "HMS hB- ADC Occupancy; Paddle Number; Number of ADC Hits' H.cal.2ta.negadchits 13 0.5 13.5
+TH1F hcal_hBp_occu "HMS hB+ ADC Occupancy; Paddle Number; Number of ADC Hits' H.cal.2ta.posadchits 13 0.5 13.5
+
+TH1F hcal_hCp_occu "HMS hC+ ADC Occupancy; Paddle Number; Number of ADC Hits' H.cal.3ta.posadchits 13 0.5 13.5
+TH1F hcal_hDp_occu "HMS hD+ ADC Occupancy; Paddle Number; Number of ADC Hits' H.cal.4ta.posadchits 13 0.5 13.5
\ No newline at end of file
diff --git a/DEF-files/HMS/HODO/hhodoana.def b/DEF-files/HMS/HODO/hhodoana.def
index dce19653d69fe935891e872ee97fa5e69ab2e7ff..1baa0f518fc085d82dc6d2e8ec92781bd53a4b11 100644
--- a/DEF-files/HMS/HODO/hhodoana.def
+++ b/DEF-files/HMS/HODO/hhodoana.def
@@ -1,3 +1,39 @@
 # See $ANALYZER/examples/output_example.def for examples
 #
-block H.hod.*
\ No newline at end of file
+block H.hod.*
+block T.hms.*
+
+TH1F hhodo_h1x_multi 'HMS h1X Multiplicity; Number of Hits; Counts' H.hod.1x.nhits 16 0.5 16.5
+TH1F hhodo_h1y_multi 'HMS h1Y Multiplicity; Number of Hits; Counts' H.hod.1y.nhits 10 0.5 10.5
+TH1F hhodo_h2x_multi 'HMS h2X Multiplicity; Number of Hits; Counts' H.hod.2x.nhits 16 0.5 16.5
+TH1F hhodo_h2y_multi 'HMS h2Y Multiplicity; Number of Hits; Counts' H.hod.2y.nhits 10 0.5 10.5
+
+TH1F hhodo_h1xm_adc_occu 'HMS h1X- ADC Occupancy; Paddle Number; Number of Hits' H.hod.1x.negadcpad 16 0.5 16.5
+TH1F hhodo_h1ym_adc_occu 'HMS h1Y- ADC Occupancy; Paddle Number; Number of Hits' H.hod.1y.negadcpad 10 0.5 10.5 
+TH1F hhodo_h2xm_adc_occu 'HMS h2X- ADC Occupancy; Paddle Number; Number of Hits' H.hod.2x.negadcpad 16 0.5 16.5
+TH1F hhodo_h2ym_adc_occu 'HMS h2Y- ADC Occupancy; Paddle Number; Number of Hits' H.hod.2y.negadcpad 10 0.5 10.5
+
+TH1F hhodo_h1xp_adc_occu 'HMS h1X+ ADC Occupancy; Paddle Number; Number of Hits' H.hod.1x.posadcpad 16 0.5 16.5
+TH1F hhodo_h1yp_adc_occu 'HMS h1Y+ ADC Occupancy; Paddle Number; Number of Hits' H.hod.1y.posadcpad 10 0.5 10.5 
+TH1F hhodo_h2xp_adc_occu 'HMS h2X+ ADC Occupancy; Paddle Number; Number of Hits' H.hod.2x.posadcpad 16 0.5 16.5
+TH1F hhodo_h2yp_adc_occu 'HMS h2Y+ ADC Occupancy; Paddle Number; Number of Hits' H.hod.2y.posadcpad 10 0.5 10.5
+
+TH1F hhodo_h1xm_tdc_occu 'HMS h1X- TDC Occupancy; Paddle Number; Number of Hits' H.hod.1x.negtdcpad 16 0.5 16.5
+TH1F hhodo_h1ym_tdc_occu 'HMS h1Y- TDC Occupancy; Paddle Number; Number of Hits' H.hod.1y.negtdcpad 10 0.5 10.5 
+TH1F hhodo_h2xm_tdc_occu 'HMS h2X- TDC Occupancy; Paddle Number; Number of Hits' H.hod.2x.negtdcpad 16 0.5 16.5
+TH1F hhodo_h2ym_tdc_occu 'HMS h2Y- TDC Occupancy; Paddle Number; Number of Hits' H.hod.2y.negtdcpad 10 0.5 10.5
+
+TH1F hhodo_h1xp_tdc_occu 'HMS h1X+ TDC Occupancy; Paddle Number; Number of Hits' H.hod.1x.postdcpad 16 0.5 16.5
+TH1F hhodo_h1yp_tdc_occu 'HMS h1Y+ TDC Occupancy; Paddle Number; Number of Hits' H.hod.1y.postdcpad 10 0.5 10.5 
+TH1F hhodo_h2xp_tdc_occu 'HMS h2X+ TDC Occupancy; Paddle Number; Number of Hits' H.hod.2x.postdcpad 16 0.5 16.5
+TH1F hhodo_h2yp_tdc_occu 'HMS h2Y+ TDC Occupancy; Paddle Number; Number of Hits' H.hod.2y.postdcpad 10 0.5 10.5
+
+TH2F hhodo_h1xm_piVtdc 'HMS h1X- Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.1x.negadcval H.hod.1x.negtdcval 2500 0 25000 800 0 8000
+TH2F hhodo_h1ym_piVtdc 'HMS h1Y- Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.1y.negadcval H.hod.1y.negtdcval 2500 0 25000 800 0 8000
+TH2F hhodo_h2xm_piVtdc 'HMS h2X- Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.2x.negadcval H.hod.2x.negtdcval 2500 0 25000 800 0 8000
+TH2F hhodo_h2ym_piVtdc 'HMS h2Y- Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.2y.negadcval H.hod.2y.negtdcval 2500 0 25000 800 0 8000
+
+TH2F hhodo_h1xp_piVtdc 'HMS h1X+ Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.1x.posadcval H.hod.1x.postdcval 2500 0 25000 800 0 8000
+TH2F hhodo_h1yp_piVtdc 'HMS h1Y+ Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.1y.posadcval H.hod.1y.postdcval 2500 0 25000 800 0 8000
+TH2F hhodo_h2xp_piVtdc 'HMS h2X+ Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.2x.posadcval H.hod.2x.postdcval 2500 0 25000 800 0 8000
+TH2F hhodo_h2yp_piVtdc 'HMS h2Y+ Pulse Integral vs. TDC Time; Pulse Integral / 10 ADC Units; Raw TDC Time / 10 TDC Units' H.hod.2y.posadcval H.hod.2y.postdcval 2500 0 25000 800 0 8000
diff --git a/MAPS/HMS/DETEC/hcal_htrig.map b/MAPS/HMS/DETEC/hcal_htrig.map
new file mode 100644
index 0000000000000000000000000000000000000000..5efc3fa6de2cf496a1e718c91b6862ba85c6e0c0
--- /dev/null
+++ b/MAPS/HMS/DETEC/hcal_htrig.map
@@ -0,0 +1,145 @@
+! THMS_ID=10       ::  ADC,TDC
+! HCAL_ID=15       ::  ADC,TDC
+
+
+DETECTOR=10
+
+ROC=11
+
+SLOT=17
+   8,   1,   1,   0  ! hASUM
+   9,   1,   2,   0  ! hBSUM
+  10,   1,   3,   0  ! hCSUM
+  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
+
+SLOT=2
+   0,   2,   1,   1  ! h1X
+   1,   2,   2,   1  ! h1Y
+   2,   2,   3,   1  ! h2X
+   3,   2,   4,   1  ! h2Y
+   4,   2,   5,   1  ! h1T
+   5,   2,   6,   1  ! h2T
+   6,   2,   7,   1  ! hT1
+   7,   2,   8,   1  ! hASUM
+   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
+  13,   2,  14,   1  ! hSHWR
+  14,   2,  15,   1  ! hAERSUM
+  15,   2,  16,   1  ! hCERSUM
+
+SLOT=20
+ 127,   2,  17,   1  ! hT2
+
+ROC=3
+
+SLOT=5
+ 111,   2,  18,   1  ! hDCREF1
+
+SLOT=8
+ 127,   2,  19,   1  ! hDCREF2
+
+SLOT=10
+ 127,   2,  20,   1  ! hDCREF3
+
+SLOT=17
+ 127,   2,  21,   1  ! hDCREF4
+
+
+DETECTOR=15
+
+ROC=11
+
+SLOT=3
+   0,   1,   1,   0  ! hA01+
+   1,   1,   2,   0  ! hA02+
+   2,   1,   3,   0  ! hA03+
+   3,   1,   4,   0  ! hA04+
+   4,   1,   5,   0  ! hA05+
+   5,   1,   6,   0  ! hA06+
+   6,   1,   7,   0  ! hA07+
+   7,   1,   8,   0  ! hA08+
+   8,   1,   9,   0  ! hA09+
+   9,   1,  10,   0  ! hA10+
+  10,   1,  11,   0  ! hA11+
+  11,   1,  12,   0  ! hA12+
+  12,   1,  13,   0  ! hA13+
+  13,   1,   1,   1  ! hA01-
+  14,   1,   2,   1  ! hA02-
+  15,   1,   3,   1  ! hA03-
+
+SLOT=4
+   0,   1,   4,   1  ! hA04-
+   1,   1,   5,   1  ! hA05-
+   2,   1,   6,   1  ! hA06-
+   3,   1,   7,   1  ! hA07-
+   4,   1,   8,   1  ! hA08-
+   5,   1,   9,   1  ! hA09-
+   6,   1,  10,   1  ! hA10-
+   7,   1,  11,   1  ! hA11-
+   8,   1,  12,   1  ! hA12-
+   9,   1,  13,   1  ! hA13-
+  10,   2,   1,   0  ! hB01+
+  11,   2,   2,   0  ! hB02+
+  12,   2,   3,   0  ! hB03+
+  13,   2,   4,   0  ! hB04+
+  14,   2,   5,   0  ! hB05+
+  15,   2,   6,   0  ! hB06+
+
+SLOT=5
+   0,   2,   7,   0  ! hB07+
+   1,   2,   8,   0  ! hB08+
+   2,   2,   9,   0  ! hB09+
+   3,   2,  10,   0  ! hB10+
+   4,   2,  11,   0  ! hB11+
+   5,   2,  12,   0  ! hB12+
+   6,   2,  13,   0  ! hB13+
+   7,   2,   1,   1  ! hB01-
+   8,   2,   2,   1  ! hB02-
+   9,   2,   3,   1  ! hB03-
+  10,   2,   4,   1  ! hB04-
+  11,   2,   5,   1  ! hB05-
+  12,   2,   6,   1  ! hB06-
+  13,   2,   7,   1  ! hB07-
+  14,   2,   8,   1  ! hB08-
+  15,   2,   9,   1  ! hB09-
+
+SLOT=6
+   0,   2,  10,   1  ! hB10-
+   1,   2,  11,   1  ! hB11-
+   2,   2,  12,   1  ! hB12-
+   3,   2,  13,   1  ! hB13-
+   4,   3,   1,   0  ! hC01+
+   5,   3,   2,   0  ! hC02+
+   6,   3,   3,   0  ! hC03+
+   7,   3,   4,   0  ! hC04+
+   8,   3,   5,   0  ! hC05+
+   9,   3,   6,   0  ! hC06+
+  10,   3,   7,   0  ! hC07+
+  11,   3,   8,   0  ! hC08+
+  12,   3,   9,   0  ! hC09+
+  13,   3,  10,   0  ! hC10+
+  14,   3,  11,   0  ! hC11+
+  15,   3,  12,   0  ! hC12+
+
+SLOT=7
+   0,   3,  13,   0  ! hC13+
+   1,   4,   1,   0  ! hD01+
+   2,   4,   2,   0  ! hD02+
+   3,   4,   3,   0  ! hD03+
+   4,   4,   4,   0  ! hD04+
+   5,   4,   5,   0  ! hD05+
+   6,   4,   6,   0  ! hD06+
+   7,   4,   7,   0  ! hD07+
+   8,   4,   8,   0  ! hD08+
+   9,   4,   9,   0  ! hD09+
+  10,   4,  10,   0  ! hD10+
+  11,   4,  11,   0  ! hD11+
+  12,   4,  12,   0  ! hD12+
+  13,   4,  13,   0  ! hD13+
diff --git a/MAPS/HMS/DETEC/hhodo_htrig.map b/MAPS/HMS/DETEC/hhodo_htrig.map
new file mode 100644
index 0000000000000000000000000000000000000000..24a39e233b4094de2b941babf17cf3393a7c5e72
--- /dev/null
+++ b/MAPS/HMS/DETEC/hhodo_htrig.map
@@ -0,0 +1,281 @@
+! THMS_ID=10       ::  ADC,TDC
+! HSCIN_ID=13      ::  ADC,TDC
+
+
+DETECTOR=10
+
+ROC=11
+
+SLOT=17
+   8,   1,   1,   0  ! hASUM
+   9,   1,   2,   0  ! hBSUM
+  10,   1,   3,   0  ! hCSUM
+  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
+
+SLOT=2
+   0,   2,   1,   1  ! h1X
+   1,   2,   2,   1  ! h1Y
+   2,   2,   3,   1  ! h2X
+   3,   2,   4,   1  ! h2Y
+   4,   2,   5,   1  ! h1T
+   5,   2,   6,   1  ! h2T
+   6,   2,   7,   1  ! hT1
+   7,   2,   8,   1  ! hASUM
+   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
+  13,   2,  14,   1  ! hSHWR
+  14,   2,  15,   1  ! hAERSUM
+  15,   2,  16,   1  ! hCERSUM
+
+SLOT=20
+ 127,   2,  17,   1  ! hT2
+
+ROC=3
+
+SLOT=5
+ 111,   2,  18,   1  ! hDCREF1
+
+SLOT=8
+ 127,   2,  19,   1  ! hDCREF2
+
+SLOT=10
+ 127,   2,  20,   1  ! hDCREF3
+
+SLOT=17
+ 127,   2,  21,   1  ! hDCREF4
+
+
+DETECTOR=13
+
+ROC=11
+
+SLOT=8
+   0,   1,   1,   0  ! h1x01A+
+   1,   1,   2,   0  ! h1x02A+
+   2,   1,   3,   0  ! h1x03A+
+   3,   1,   4,   0  ! h1x04A+
+   4,   1,   5,   0  ! h1x05A+
+   5,   1,   6,   0  ! h1x06A+
+   6,   1,   7,   0  ! h1x07A+
+   7,   1,   8,   0  ! h1x08A+
+   8,   1,   9,   0  ! h1x09A+
+   9,   1,  10,   0  ! h1x10A+
+  10,   1,  11,   0  ! h1x11A+
+  11,   1,  12,   0  ! h1x12A+
+  12,   1,  13,   0  ! h1x13A+
+  13,   1,  14,   0  ! h1x14A+
+  14,   1,  15,   0  ! h1x15A+
+  15,   1,  16,   0  ! h1x16A+
+
+SLOT=9
+   0,   1,   1,   1  ! h1x01A-
+   1,   1,   2,   1  ! h1x02A-
+   2,   1,   3,   1  ! h1x03A-
+   3,   1,   4,   1  ! h1x04A-
+   4,   1,   5,   1  ! h1x05A-
+   5,   1,   6,   1  ! h1x06A-
+   6,   1,   7,   1  ! h1x07A-
+   7,   1,   8,   1  ! h1x08A-
+   8,   1,   9,   1  ! h1x09A-
+   9,   1,  10,   1  ! h1x10A-
+  10,   1,  11,   1  ! h1x11A-
+  11,   1,  12,   1  ! h1x12A-
+  12,   1,  13,   1  ! h1x13A-
+  13,   1,  14,   1  ! h1x14A-
+  14,   1,  15,   1  ! h1x15A-
+  15,   1,  16,   1  ! h1x16A-
+
+SLOT=10
+   0,   2,   1,   0  ! h1y01A+
+   1,   2,   2,   0  ! h1y02A+
+   2,   2,   3,   0  ! h1y03A+
+   3,   2,   4,   0  ! h1y04A+
+   4,   2,   5,   0  ! h1y05A+
+   5,   2,   6,   0  ! h1y06A+
+   6,   2,   7,   0  ! h1y07A+
+   7,   2,   8,   0  ! h1y08A+
+   8,   2,   9,   0  ! h1y09A+
+   9,   2,  10,   0  ! h1y10A+
+  10,   2,   1,   1  ! h1y01A-
+  11,   2,   2,   1  ! h1y02A-
+  12,   2,   3,   1  ! h1y03A-
+  13,   2,   4,   1  ! h1y04A-
+  14,   2,   5,   1  ! h1y05A-
+  15,   2,   6,   1  ! h1y06A-
+
+SLOT=13
+   0,   2,   7,   1  ! h1y07A-
+   1,   2,   8,   1  ! h1y08A-
+   2,   2,   9,   1  ! h1y09A-
+   3,   2,  10,   1  ! h1y10A-
+   4,   3,   1,   0  ! h2x01A+
+   5,   3,   2,   0  ! h2x02A+
+   6,   3,   3,   0  ! h2x03A+
+   7,   3,   4,   0  ! h2x04A+
+   8,   3,   5,   0  ! h2x05A+
+   9,   3,   6,   0  ! h2x06A+
+  10,   3,   7,   0  ! h2x07A+
+  11,   3,   8,   0  ! h2x08A+
+  12,   3,   9,   0  ! h2x09A+
+  13,   3,  10,   0  ! h2x10A+
+  14,   3,  11,   0  ! h2x11A+
+  15,   3,  12,   0  ! h2x12A+
+
+SLOT=14
+   0,   3,  13,   0  ! h2x13A+
+   1,   3,  14,   0  ! h2x14A+
+   2,   3,  15,   0  ! h2x15A+
+   3,   3,  16,   0  ! h2x16A+
+   4,   3,   1,   1  ! h2x01A-
+   5,   3,   2,   1  ! h2x02A-
+   6,   3,   3,   1  ! h2x03A-
+   7,   3,   4,   1  ! h2x04A-
+   8,   3,   5,   1  ! h2x05A-
+   9,   3,   6,   1  ! h2x06A-
+  10,   3,   7,   1  ! h2x07A-
+  11,   3,   8,   1  ! h2x08A-
+  12,   3,   9,   1  ! h2x09A-
+  13,   3,  10,   1  ! h2x10A-
+  14,   3,  11,   1  ! h2x11A-
+  15,   3,  12,   1  ! h2x12A-
+
+SLOT=15
+   0,   3,  13,   1  ! h2x13A-
+   1,   3,  14,   1  ! h2x14A-
+   2,   3,  15,   1  ! h2x15A-
+   3,   3,  16,   1  ! h2x16A-
+   4,   4,   1,   0  ! h2y01A+
+   5,   4,   2,   0  ! h2y02A+
+   6,   4,   3,   0  ! h2y03A+
+   7,   4,   4,   0  ! h2y04A+
+   8,   4,   5,   0  ! h2y05A+
+   9,   4,   6,   0  ! h2y06A+
+  10,   4,   7,   0  ! h2y07A+
+  11,   4,   8,   0  ! h2y08A+
+  12,   4,   9,   0  ! h2y09A+
+  13,   4,  10,   0  ! h2y10A+
+  14,   4,   1,   1  ! h2y01A-
+  15,   4,   2,   1  ! h2y02A-
+
+SLOT=16
+   0,   4,   3,   1  ! h2y03A-
+   1,   4,   4,   1  ! h2y04A-
+   2,   4,   5,   1  ! h2y05A-
+   3,   4,   6,   1  ! h2y06A-
+   4,   4,   7,   1  ! h2y07A-
+   5,   4,   8,   1  ! h2y08A-
+   6,   4,   9,   1  ! h2y09A-
+   7,   4,  10,   1  ! h2y10A-
+
+SLOT=20
+   0,   1,   1,   2  ! h1x01T+
+   1,   1,   3,   2  ! h1x03T+
+   2,   1,   5,   2  ! h1x05T+
+   3,   1,   7,   2  ! h1x07T+
+   4,   1,   2,   2  ! h1x02T+
+   5,   1,   4,   2  ! h1x04T+
+   6,   1,   6,   2  ! h1x06T+
+   7,   1,   8,   2  ! h1x08T+
+   8,   1,   9,   2  ! h1x09T+
+   9,   1,  11,   2  ! h1x11T+
+  10,   1,  13,   2  ! h1x13T+
+  11,   1,  15,   2  ! h1x15T+
+  12,   1,  10,   2  ! h1x10T+
+  13,   1,  12,   2  ! h1x12T+
+  14,   1,  14,   2  ! h1x14T+
+  15,   1,  16,   2  ! h1x16T+
+  16,   1,   1,   3  ! h1x01T-
+  17,   1,   3,   3  ! h1x03T-
+  18,   1,   5,   3  ! h1x05T-
+  19,   1,   7,   3  ! h1x07T-
+  20,   1,   2,   3  ! h1x02T-
+  21,   1,   4,   3  ! h1x04T-
+  22,   1,   6,   3  ! h1x06T-
+  23,   1,   8,   3  ! h1x08T-
+  24,   1,   9,   3  ! h1x09T-
+  25,   1,  11,   3  ! h1x11T-
+  26,   1,  13,   3  ! h1x13T-
+  27,   1,  15,   3  ! h1x15T-
+  28,   1,  10,   3  ! h1x10T-
+  29,   1,  12,   3  ! h1x12T-
+  30,   1,  14,   3  ! h1x14T-
+  31,   1,  16,   3  ! h1x16T-
+  32,   2,   1,   2  ! h1y01T+
+  33,   2,   3,   2  ! h1y03T+
+  34,   2,   5,   2  ! h1y05T+
+  35,   2,   7,   2  ! h1y07T+
+  36,   2,   2,   2  ! h1y02T+
+  37,   2,   4,   2  ! h1y04T+
+  38,   2,   6,   2  ! h1y06T+
+  39,   2,   8,   2  ! h1y08T+
+  40,   2,   9,   2  ! h1y09T+
+  44,   2,  10,   2  ! h1y10T+
+  48,   2,   1,   3  ! h1y01T-
+  49,   2,   3,   3  ! h1y03T-
+  50,   2,   5,   3  ! h1y05T-
+  51,   2,   7,   3  ! h1y07T-
+  52,   2,   2,   3  ! h1y02T-
+  53,   2,   4,   3  ! h1y04T-
+  54,   2,   6,   3  ! h1y06T-
+  55,   2,   8,   3  ! h1y08T-
+  56,   2,   9,   3  ! h1y09T-
+  60,   2,  10,   3  ! h1y10T-
+  64,   3,   1,   2  ! h2x01T+
+  65,   3,   3,   2  ! h2x03T+
+  66,   3,   5,   2  ! h2x05T+
+  67,   3,   7,   2  ! h2x07T+
+  68,   3,   2,   2  ! h2x02T+
+  69,   3,   4,   2  ! h2x04T+
+  70,   3,   6,   2  ! h2x06T+
+  71,   3,   8,   2  ! h2x08T+
+  72,   3,   9,   2  ! h2x09T+
+  73,   3,  11,   2  ! h2x11T+
+  74,   3,  13,   2  ! h2x13T+
+  75,   3,  15,   2  ! h2x15T+
+  76,   3,  10,   2  ! h2x10T+
+  77,   3,  12,   2  ! h2x12T+
+  78,   3,  14,   2  ! h2x14T+
+  79,   3,  16,   2  ! h2x16T+
+  80,   3,   1,   3  ! h2x01T-
+  81,   3,   3,   3  ! h2x03T-
+  82,   3,   5,   3  ! h2x05T-
+  83,   3,   7,   3  ! h2x07T-
+  84,   3,   2,   3  ! h2x02T-
+  85,   3,   4,   3  ! h2x04T-
+  86,   3,   6,   3  ! h2x06T-
+  87,   3,   8,   3  ! h2x08T-
+  88,   3,   9,   3  ! h2x09T-
+  89,   3,  11,   3  ! h2x11T-
+  90,   3,  13,   3  ! h2x13T-
+  91,   3,  15,   3  ! h2x15T-
+  92,   3,  10,   3  ! h2x10T-
+  93,   3,  12,   3  ! h2x12T-
+  94,   3,  14,   3  ! h2x14T-
+  95,   3,  16,   3  ! h2x16T-
+  96,   4,   1,   2  ! h2y01T+
+  97,   4,   3,   2  ! h2y03T+
+  98,   4,   5,   2  ! h2y05T+
+  99,   4,   7,   2  ! h2y07T+
+ 100,   4,   2,   2  ! h2y02T+
+ 101,   4,   4,   2  ! h2y04T+
+ 102,   4,   6,   2  ! h2y06T+
+ 103,   4,   8,   2  ! h2y08T+
+ 104,   4,   9,   2  ! h2y09T+
+ 108,   4,  10,   2  ! h2y10T+
+ 112,   4,   1,   3  ! h2y01T-
+ 113,   4,   3,   3  ! h2y03T-
+ 114,   4,   5,   3  ! h2y05T-
+ 115,   4,   7,   3  ! h2y07T-
+ 116,   4,   2,   3  ! h2y02T-
+ 117,   4,   4,   3  ! h2y04T-
+ 118,   4,   6,   3  ! h2y06T-
+ 119,   4,   8,   3  ! h2y08T-
+ 120,   4,   9,   3  ! h2y09T-
+ 124,   4,  10,   3  ! h2y10T-
diff --git a/MAPS/db_cratemap.dat b/MAPS/db_cratemap.dat
index 0da09164f8de31d45cb296c4c2d28eb59a66556c..764f4af4cc2ee3eeb4c9f800437b28ba60f2e273 100644
--- a/MAPS/db_cratemap.dat
+++ b/MAPS/db_cratemap.dat
@@ -1,34 +1,6 @@
-==== Crate 2 type vme Bank Decoding
-# slot  model   bank
-  3      250     250
-  4      250     250
-  5      250     250
-  6      250     250
-  7      250     250
-  8      250     250
-  9      250     250
-  10     250     250
-  13     250     250
-  14     250     250
-  18     1190    1190
-  19     1190    1190
-  20     1190    1190
-
-==== Crate 3 type vme Bank Decoding
-# slot  model   bank
-  4      1190    1190
-  5      1190    1190
-  7      1190    1190
-  8      1190    1190
-  10     1190    1190
-  13     1190    1190
-  14     1190    1190
-  16     1190    1190
-  17     1190    1190
-
-
-==== Crate 4 type vme Bank Decoding
+==== Crate 11 type vme Bank Decoding
 # slot  model   bank
+  2      1190    1190
   3      250     250
   4      250     250
   5      250     250
@@ -44,43 +16,19 @@
   17     250     250
   18     250     250
   19     250     250
-  20     250     250
+  20     1190    1190
 
-==== Crate 5 type vme Bank Decoding
-# slot  model   bank
 
-==== Crate 6 type vme Bank Decoding
+==== Crate 3 type vme Bank Decoding
 # slot  model   bank
-  6      1190    1190
+  4      1190    1190
+  5      1190    1190
   7      1190    1190
   8      1190    1190
-  9      1190    1190
   10     1190    1190
-  11     1190    1190
-  12     1190    1190
   13     1190    1190
   14     1190    1190
-  15     1190    1190
-
-
-==== Crate 11 type vme Bank Decoding
-# slot  model   bank
-  2      1190    1190
-  3      250     250
-  4      250     250
-  5      250     250
-  6      250     250
-  7      250     250
-  8      250     250
-  9      250     250
-  10     250     250
-  13     250     250
-  14     250     250
-  15     250     250
-  16     250     250
-  17     250     250
-  18     250     250
-  19     250     250
-  20     1190    1190
+  16     1190    1190
+  17     1190    1190
 
 
diff --git a/SCRIPTS/HMS/replay_hhodo_test_stand.C b/SCRIPTS/HMS/replay_hhodo_test_stand.C
index 00f7e7882d93fc246a2ea2f133196dd340a65819..153b0a61b544bf6760b05f27ad2fd0e03635b8cb 100644
--- a/SCRIPTS/HMS/replay_hhodo_test_stand.C
+++ b/SCRIPTS/HMS/replay_hhodo_test_stand.C
@@ -29,9 +29,12 @@ void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
 
+  // Load params for HMS trigger configuration
+  gHcParms->Load("PARAM/TRIG/thms.param");
+
   // Load the Hall C style detector map
   gHcDetectorMap = new THcDetectorMap();
-  gHcDetectorMap->Load("MAPS/HMS/DETEC/hhodo.map");
+  gHcDetectorMap->Load("MAPS/HMS/DETEC/hhodo_htrig.map");
   
   // Set up the equipment to be analyzed.
   THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
@@ -40,6 +43,13 @@ void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
   HMS->AddDetector(hod);
 
+  // Add trigger apparatus
+  THaApparatus* TRG = new THcTrigApp("T", "TRG");
+  gHaApps->Add(TRG);
+  // Add trigger detector to trigger apparatus
+  THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
+  TRG->AddDetector(hms);
+
   // Set up the analyzer - we use the standard one,
   // but this could be an experiment-specific one as well.
   // The Analyzer controls the reading of the data, executes