diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
index 16fd7b59e05cf87b55769ea4e72863535569eb25..123c922b18cec32bd4a7eed95143c238b3cdb3ab 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
@@ -50,25 +50,29 @@ TH1F hdc_refdiff_3m4 'HDC Reference time 3 minus 4; TDC Time (Clicks); Number of
TH1F htrig_hasum_adc_rawpped 'HMS hAsum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hASUM_adcPedRaw 500 -500 4000
TH1F htrig_hasum_adc_rawpi 'HMS hAsum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hASUM_adcPulseIntRaw 4000 15000 33000
TH1F htrig_hasum_adc_rawpamp 'HMS hAsum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hASUM_adcPulseAmpRaw 410 -500 3000
-TH1F htrig_hasum_adc_rawptime 'HMS hAsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hASUM_adcPulseTimeRaw 2000 1500 3000
+TH1F htrig_hasum_adc_rawptime 'HMS hAsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hASUM_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_hasum_adc_ptime 'HMS hAsum Pulse Time; Pulse Time (ns); Counts ;' T.hms.hASUM_adcPulseTime 300 0 300
TH1F htrig_hasum_rawtdc 'HMS hAsum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hASUM_tdcTimeRaw 4000 1000 2200
TH1F htrig_hbsum_adc_rawpped 'HMS hBsum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hBSUM_adcPedRaw 500 2000 3000
TH1F htrig_hbsum_adc_rawpi 'HMS hBsum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hBSUM_adcPulseIntRaw 4000 15000 30000
TH1F htrig_hbsum_adc_rawpamp 'HMS hBsum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hBSUM_adcPulseAmpRaw 410 -500 3000
-TH1F htrig_hbsum_adc_rawptime 'HMS hBsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hBSUM_adcPulseTimeRaw 2000 1500 3000
+TH1F htrig_hbsum_adc_rawptime 'HMS hBsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hBSUM_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_hbsum_adc_ptime 'HMS hBsum Pulse Time; Pulse Time (ns); Counts ;' T.hms.hBSUM_adcPulseTime 300 0 300
TH1F htrig_hbsum_rawtdc 'HMS hBsum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hBSUM_tdcTimeRaw 4000 1000 2000
TH1F htrig_hcsum_adc_rawpped 'HMS hCsum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hCSUM_adcPedRaw 500 2000 3000
TH1F htrig_hcsum_adc_rawpi 'HMS hCsum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hCSUM_adcPulseIntRaw 4000 15000 25000
TH1F htrig_hcsum_adc_rawpamp 'HMS hCsum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hCSUM_adcPulseAmpRaw 410 -500 2000
-TH1F htrig_hcsum_adc_rawptime 'HMS hCsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hCSUM_adcPulseTimeRaw 2000 1500 3000
+TH1F htrig_hcsum_adc_rawptime 'HMS hCsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hCSUM_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_hcsum_adc_ptime 'HMS hCsum Pulse Time; Pulse Time (ns); Counts ;' T.hms.hCSUM_adcPulseTimeRaw 300 0 300
TH1F htrig_hcsum_rawtdc 'HMS hCsum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCSUM_tdcTimeRaw 4000 1000 2000
TH1F htrig_hdsum_adc_rawpped 'HMS hDsum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hDSUM_adcPedRaw 500 2000 3000
TH1F htrig_hdsum_adc_rawpi 'HMS hDsum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hDSUM_adcPulseIntRaw 4000 15000 25000
TH1F htrig_hdsum_adc_rawpamp 'HMS hDsum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hDSUM_adcPulseAmpRaw 410 -200 1200
-TH1F htrig_hdsum_adc_rawptime 'HMS hDsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hDSUM_adcPulseTimeRaw 2000 1500 3000
+TH1F htrig_hdsum_adc_rawptime 'HMS hDsum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hDSUM_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_hdsum_adc_ptime 'HMS hDsum Pulse Time; Pulse Time (ns); Counts ;' T.hms.hDSUM_adcPulseTime 300 0 300
TH1F htrig_hdsum_rawtdc 'HMS hDsum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDSUM_tdcTimeRaw 4000 -500 1000
#-------------------------------------
@@ -78,7 +82,8 @@ TH1F htrig_hdsum_rawtdc 'HMS hDsum Raw TDC Time; Raw TDC Time (TDC Units); Count
TH1F htrig_hpreShwr_adc_rawpped 'HMS Pre-Shower Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hPSHWR_adcPedRaw 500 2000 3500
TH1F htrig_hpreShwr_adc_rawpi 'HMS Pre-Shower Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hPSHWR_adcPulseIntRaw 4000 15000 40000
TH1F htrig_hpreShwr_adc_rawpamp 'HMS Pre-Shower Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hPSHWR_adcPulseAmpRaw 410 -500 4000
-TH1F htrig_hpreShwr_adc_rawptime 'HMS Pre-Shower Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hPSHWR_adcPulseTimeRaw 2000 1500 3000
+TH1F htrig_hpreShwr_adc_rawptime 'HMS Pre-Shower Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hPSHWR_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_hpreShwr_adc_ptime 'HMS Pre-Shower Pulse Time; Pulse Time (ns); Counts ;' T.hms.hPSHWR_adcPulseTime 300 0 300
TH1F htrig_hpreShwr_rawtdc 'HMS Pre-Shower Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWR_tdcTimeRaw 4000 -1000 1000
TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRLO_tdcTimeRaw 4000 -500 2500
@@ -91,7 +96,8 @@ TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units)
TH1F htrig_hshwr_adc_rawpped 'HMS Shower Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hSHWR_adcPedRaw 500 3000 4000
TH1F htrig_hshwr_adc_rawpi 'HMS Shower Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hSHWR_adcPulseIntRaw 4000 20000 45000
TH1F htrig_hshwr_adc_rawpamp 'HMS Shower Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hSHWR_adcPulseAmpRaw 410 -1000 3800
-TH1F htrig_hshwr_adc_rawptime 'HMS Shower Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hSHWR_adcPulseTimeRaw 2000 1500 3000
+TH1F htrig_hshwr_adc_rawptime 'HMS Shower Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hSHWR_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_hshwr_adc_ptime 'HMS Shower Pulse Time; Pulse Time (ns); Counts ;' T.hms.hSHWR_adcPulseTime 300 0 300
TH1F htrig_hshwr_rawtdc 'HMS Shower Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hSHWR_tdcTimeRaw 4000 -500 2500
@@ -144,7 +150,8 @@ TH1F htrig_hshwr_tdc 'HMS Shower TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.h
TH1F htrig_hcersum_adc_rawpped 'HMS Cherenkov Sum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hCERSUM_adcPedRaw 500 1800 2200
TH1F htrig_hcersum_adc_rawpi 'HMS Cherenkov Sum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hCERSUM_adcPulseIntRaw 4000 10000 25000
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 -200 1500
-TH1F htrig_hcersum_adc_rawptime 'HMS Cherenkov Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hCERSUM_adcPulseTimeRaw 2000 -500 3500
+TH1F htrig_hcersum_adc_rawptime 'HMS Cherenkov Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hCERSUM_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_hcersum_adc_ptime 'HMS Cherenkov Sum Pulse Time; Pulse Time (ns); Counts;' T.hms.hCERSUM_adcPulseTime 300 0 300
TH1F htrig_hcersum_rawtdc 'HMS Cherenkov Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCERSUM_tdcTimeRaw 4000 1000 2500
#---------------------------------------
@@ -163,7 +170,8 @@ TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (ns); Counts / 0.1
TH1F htrig_haersum_adc_rawpped 'HMS Aerogel Sum Raw Pulse Pedestal; Raw Pulse Pedestal (ADC Units); Counts / 10 ADC Units;' T.hms.hAERSUM_adcPedRaw 500 0 5000
TH1F htrig_haersum_adc_rawpi 'HMS Aerogel Sum Raw Pulse Integral; Raw Pulse Integral (ADC Units); Counts / 10 ADC Units;' T.hms.hAERSUM_adcPulseIntRaw 4000 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 / 10 ADC Units;' T.hms.hAERSUM_adcPulseTimeRaw 2000 0 20000
+TH1F htrig_haersum_adc_rawptime 'HMS Aerogel Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hAERSUM_adcPulseTimeRaw 3000 0 3000
+TH1F htrig_haersum_adc_ptime 'HMS Aerogel Sum Pulse Time; Raw Pulse Time (ns); Counts;' T.hms.hAERSUM_adcPulseTime 300 0 300
TH1F htrig_haersum_rawtdc 'HMS Aerogel Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAERSUM_tdcTimeRaw 4000 0 40000
#------------------------------------------
@@ -176,25 +184,3 @@ TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (
TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hAERSUM_tdcTime 4000 0 40000
-#-------------
-# Fast Raster
-#-------------
-
-# Assume FADC range is set to 1V and the integration is 25 channels
-# Offset in the FADC is about 0.122V or 500 channels.
-
-formula FRXA_V T.hms.pFRXA_adcPulseIntRaw*(1./4096.)/25.
-formula FRXB_V T.hms.pFRXB_adcPulseIntRaw*(1./4096.)/25.
-formula FRYA_V T.hms.pFRYA_adcPulseIntRaw*(1./4096.)/25.
-formula FRYB_V T.hms.pFRYB_adcPulseIntRaw*(1./4096.)/25.
-
-TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' T.hms.pFRXA_adcPulseIntRaw 10 -0.2 0.2
-TH1F hFRXA_V 'HMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 10 -0.2 0.2
-TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' T.hms.pFRXB_adcPulseIntRaw 10 -0.2 0.2
-TH1F hFRXB_V 'HMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 10 -0.2 0.2
-TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' T.hms.pFRYA_adcPulseIntRaw 10 -0.2 0.2
-TH1F hFRYA_V 'HMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 10 -0.2 0.2
-TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' T.hms.pFRYB_adcPulseIntRaw 10 -0.2 0.2
-TH1F hFRYB_V 'HMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 10 -0.2 0.2
-TH2F hFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 10 -0.2 0.2 10 -0.2 0.2
-TH2F hFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 10 -0.2 0.2 10 -0.2 0.2
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
index 382abfb93d23c397afb8fd4a1fb41def9d2d5008..c1b8d6f47563830ec49ba54aa367152bb4a574b1 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
@@ -73,6 +73,7 @@ TH1F ptrig_pngc_sum_pint_raw 'SHMS Noble Gas Sum FADC Raw Pulse Integral; Pulse
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
@@ -86,5 +87,6 @@ TH1F ptrig_phgc_sum_pint_raw 'SHMS Heavy Gas Sum FADC Raw Pulse Integral; Pulse
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
diff --git a/MAPS/HMS/DETEC/CAL/hcal.map b/MAPS/HMS/DETEC/CAL/hcal.map
index c79bed6a035d87096308f520044bdea9c1c2f245..5fc94bea0241826b2def42d05ee93e5e6068dd71 100644
--- a/MAPS/HMS/DETEC/CAL/hcal.map
+++ b/MAPS/HMS/DETEC/CAL/hcal.map
@@ -3,9 +3,13 @@
ROC=1
detector=15
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
!F250 modules
SLOT=3
+REFINDEX=3
! chan plane row sig
0, 1, 1, 0! hA01+
1, 1, 2, 0! hA02+
@@ -24,6 +28,7 @@ SLOT=3
14, 1, 2, 1! hA02-
15, 1, 3, 1! hA03-
SLOT=4
+REFINDEX=3
! chan plane row sig
0, 1, 4, 1! hA04-
1, 1, 5, 1! hA05-
@@ -42,6 +47,7 @@ SLOT=4
14, 2, 5, 0! hB05+
15, 2, 6, 0! hB06+
SLOT=5
+REFINDEX=3
! chan plane row sig
0, 2, 7, 0! hB07+
1, 2, 8, 0! hB08+
@@ -60,6 +66,7 @@ SLOT=5
14, 2, 8, 1! hB08-
15, 2, 9, 1! hB09-
SLOT=6
+REFINDEX=3
! chan plane row sig
0, 2, 10, 1! hB10-
1, 2, 11, 1! hB11-
@@ -78,6 +85,7 @@ SLOT=6
14, 3, 11, 0! hC11+
15, 3, 12, 0! hC12+
SLOT=7
+REFINDEX=3
! chan plane row sig
0, 3, 13, 0! hC13+
1, 4, 1, 0! hD01+
diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
index 2dc11b8386a6c0db92fbf8bc30a9514ec165f82c..f66b8ce76249f9f7a2749ed4306eab38321c076a 100644
--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -5,8 +5,12 @@
DETECTOR=10
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=17
+REFINDEX=3
8, 1, 1, 0 ! hASUM
9, 1, 2, 0 ! hBSUM
10, 1, 3, 0 ! hCSUM
@@ -17,6 +21,7 @@ SLOT=17
15, 1, 8, 0 ! hCERSUM
SLOT=18
+REFINDEX=3
11, 1, 9, 0 ! hFADC_TREF_ROC1
SLOT=2
@@ -72,8 +77,12 @@ SLOT=13
DETECTOR=15
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=3
+REFINDEX=3
0, 1, 1, 0 ! hA01+
1, 1, 2, 0 ! hA02+
2, 1, 3, 0 ! hA03+
@@ -92,6 +101,7 @@ SLOT=3
15, 1, 3, 1 ! hA03-
SLOT=4
+REFINDEX=3
0, 1, 4, 1 ! hA04-
1, 1, 5, 1 ! hA05-
2, 1, 6, 1 ! hA06-
@@ -110,6 +120,7 @@ SLOT=4
15, 2, 6, 0 ! hB06+
SLOT=5
+REFINDEX=3
0, 2, 7, 0 ! hB07+
1, 2, 8, 0 ! hB08+
2, 2, 9, 0 ! hB09+
@@ -128,6 +139,7 @@ SLOT=5
15, 2, 9, 1 ! hB09-
SLOT=6
+REFINDEX=3
0, 2, 10, 1 ! hB10-
1, 2, 11, 1 ! hB11-
2, 2, 12, 1 ! hB12-
@@ -146,6 +158,7 @@ SLOT=6
15, 3, 12, 0 ! hC12+
SLOT=7
+REFINDEX=3
0, 3, 13, 0 ! hC13+
1, 4, 1, 0 ! hD01+
2, 4, 2, 0 ! hD02+
diff --git a/MAPS/HMS/DETEC/CER/hcer.map b/MAPS/HMS/DETEC/CER/hcer.map
index 805bd36530b4163dceca8978de314a3412ad9143..da4c05210582a4c7f5870662ec67ec5139fb54b8 100644
--- a/MAPS/HMS/DETEC/CER/hcer.map
+++ b/MAPS/HMS/DETEC/CER/hcer.map
@@ -3,9 +3,13 @@
ROC=1
detector=14
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
!F250 modules
SLOT=7
+REFINDEX=3
! chan plane tube sig
14, 1, 1, 0! hCER01
15, 1, 2, 0! hCER02
diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map
index 3c58ccee87e10510105188c0d2896e45182e49cb..a8a0f0df8ca845abd4478b145601de0e7911fda7 100644
--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -5,8 +5,12 @@
DETECTOR=10
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=17
+REFINDEX=3
8, 1, 1, 0 ! hASUM
9, 1, 2, 0 ! hBSUM
10, 1, 3, 0 ! hCSUM
@@ -17,6 +21,7 @@ SLOT=17
15, 1, 8, 0 ! hCERSUM
SLOT=18
+REFINDEX=3
11, 1, 9, 0 ! hFADC_TREF_ROC1
SLOT=2
@@ -72,7 +77,11 @@ SLOT=13
DETECTOR=14
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=7
+REFINDEX=3
14, 1, 1, 0 ! hCER01
15, 1, 2, 0 ! hCER02
diff --git a/MAPS/HMS/DETEC/HODO/hhodo.map b/MAPS/HMS/DETEC/HODO/hhodo.map
index 698489c2c8da58580038b37d27d9ef1ebfcdc642..59b8c30f3f1cd08b4f40a8e54d3da9cf58ac8f0f 100644
--- a/MAPS/HMS/DETEC/HODO/hhodo.map
+++ b/MAPS/HMS/DETEC/HODO/hhodo.map
@@ -3,9 +3,13 @@
ROC=1
detector=13
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
! F250 modules
SLOT=8
+REFINDEX=3
! chan plane bar sig
0, 1, 1, 0! h1x01A+
1, 1, 2, 0! h1x02A+
@@ -24,6 +28,7 @@ SLOT=8
14, 1, 15, 0! h1x15A+
15, 1, 16, 0! h1x16A+
SLOT=9
+REFINDEX=3
! chan plane bar sig
0, 1, 1, 1! h1x01A-
1, 1, 2, 1! h1x02A-
@@ -42,6 +47,7 @@ SLOT=9
14, 1, 15, 1! h1x15A-
15, 1, 16, 1! h1x16A-
SLOT=10
+REFINDEX=3
! chan plane bar sig
0, 2, 1, 0! h1y01A+
1, 2, 2, 0! h1y02A+
@@ -60,6 +66,7 @@ SLOT=10
14, 2, 5, 1! h1y05A-
15, 2, 6, 1! h1y06A-
SLOT=13
+REFINDEX=3
! chan plane bar sig
0, 2, 7, 1! h1y07A-
1, 2, 8, 1! h1y08A-
@@ -78,6 +85,7 @@ SLOT=13
14, 3, 11, 0! h2x11A+
15, 3, 12, 0! h2x12A+
SLOT=14
+REFINDEX=3
! chan plane bar sig
0, 3, 13, 0! h2x13A+
1, 3, 14, 0! h2x14A+
@@ -96,6 +104,7 @@ SLOT=14
14, 3, 11, 1! h2x11A-
15, 3, 12, 1! h2x12A-
SLOT=15
+REFINDEX=3
! chan plane bar sig
0, 3, 13, 1! h2x13A-
1, 3, 14, 1! h2x14A-
@@ -114,6 +123,7 @@ SLOT=15
14, 4, 1, 1! h2y01A-
15, 4, 2, 1! h2y02A-
SLOT=16
+REFINDEX=3
! chan plane bar sig
0, 4, 3, 1! h2y03A-
1, 4, 4, 1! h2y04A-
diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
index 83c1fade48e456892418e5f69bbf838c7e139847..19b8212e6278dcf02b74e846c5fc0c57660a7a80 100644
--- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
@@ -5,8 +5,12 @@
DETECTOR=10
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=17
+REFINDEX=3
8, 1, 1, 0 ! hASUM
9, 1, 2, 0 ! hBSUM
10, 1, 3, 0 ! hCSUM
@@ -17,6 +21,7 @@ SLOT=17
15, 1, 8, 0 ! hCERSUM
SLOT=18
+REFINDEX=3
11, 1, 9, 0 ! hFADC_TREF_ROC1
SLOT=2
@@ -52,6 +57,7 @@ REFINDEX=0
21, 2, 33, 1 ! pTRIG6
SLOT=20
+REFINDEX=0
127, 2, 17, 1 ! hT2
ROC=3
@@ -72,8 +78,12 @@ SLOT=13
DETECTOR=13
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=8
+REFINDEX=3
0, 1, 1, 0 ! h1x01A+
1, 1, 2, 0 ! h1x02A+
2, 1, 3, 0 ! h1x03A+
@@ -92,6 +102,7 @@ SLOT=8
15, 1, 16, 0 ! h1x16A+
SLOT=9
+REFINDEX=3
0, 1, 1, 1 ! h1x01A-
1, 1, 2, 1 ! h1x02A-
2, 1, 3, 1 ! h1x03A-
@@ -110,6 +121,7 @@ SLOT=9
15, 1, 16, 1 ! h1x16A-
SLOT=10
+REFINDEX=3
0, 2, 1, 0 ! h1y01A+
1, 2, 2, 0 ! h1y02A+
2, 2, 3, 0 ! h1y03A+
@@ -128,6 +140,7 @@ SLOT=10
15, 2, 6, 1 ! h1y06A-
SLOT=13
+REFINDEX=3
0, 2, 7, 1 ! h1y07A-
1, 2, 8, 1 ! h1y08A-
2, 2, 9, 1 ! h1y09A-
@@ -146,6 +159,7 @@ SLOT=13
15, 3, 12, 0 ! h2x12A+
SLOT=14
+REFINDEX=3
0, 3, 13, 0 ! h2x13A+
1, 3, 14, 0 ! h2x14A+
2, 3, 15, 0 ! h2x15A+
@@ -164,6 +178,7 @@ SLOT=14
15, 3, 12, 1 ! h2x12A-
SLOT=15
+REFINDEX=3
0, 3, 13, 1 ! h2x13A-
1, 3, 14, 1 ! h2x14A-
2, 3, 15, 1 ! h2x15A-
@@ -182,6 +197,7 @@ SLOT=15
15, 4, 2, 1 ! h2y02A-
SLOT=16
+REFINDEX=3
0, 4, 3, 1 ! h2y03A-
1, 4, 4, 1 ! h2y04A-
2, 4, 5, 1 ! h2y05A-
diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map
index b254257e8c3d83539ad13de4c5e37de4e49128be..9882e9ed8acc4870f501e058b54a5bd2106a31b4 100644
--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -10,8 +10,13 @@
DETECTOR=10
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
+ 11, 1, 9, 0 ! hFADC_TREF_ROC1
SLOT=17
+REFINDEX=3
8, 1, 1, 0 ! hASUM
9, 1, 2, 0 ! hBSUM
10, 1, 3, 0 ! hCSUM
@@ -21,8 +26,6 @@ SLOT=17
14, 1, 7, 0 ! hAERSUM
15, 1, 8, 0 ! hCERSUM
-SLOT=18
- 11, 1, 9, 0 ! hFADC_TREF_ROC1
SLOT=2
REFINDEX=0
@@ -57,6 +60,7 @@ REFINDEX=0
21, 2, 33, 1 ! pTRIG6
SLOT=20
+REFINDEX=0
127, 2, 17, 1 ! hT2
ROC=3
@@ -1399,7 +1403,12 @@ DETECTOR=12
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
+
SLOT=16
+REFINDEX=3
8, 1, 1, 1 ! hAER01-
9, 1, 2, 1 ! hAER02-
10, 1, 3, 1 ! hAER03-
@@ -1410,6 +1419,7 @@ SLOT=16
15, 1, 8, 1 ! hAER08-
SLOT=17
+REFINDEX=3
0, 1, 1, 0 ! hAER01+
1, 1, 2, 0 ! hAER02+
2, 1, 3, 0 ! hAER03+
@@ -1423,8 +1433,12 @@ SLOT=17
DETECTOR=13
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=8
+REFINDEX=3
0, 1, 1, 0 ! h1x01A+
1, 1, 2, 0 ! h1x02A+
2, 1, 3, 0 ! h1x03A+
@@ -1443,6 +1457,7 @@ SLOT=8
15, 1, 16, 0 ! h1x16A+
SLOT=9
+REFINDEX=3
0, 1, 1, 1 ! h1x01A-
1, 1, 2, 1 ! h1x02A-
2, 1, 3, 1 ! h1x03A-
@@ -1461,6 +1476,7 @@ SLOT=9
15, 1, 16, 1 ! h1x16A-
SLOT=10
+REFINDEX=3
0, 2, 1, 0 ! h1y01A+
1, 2, 2, 0 ! h1y02A+
2, 2, 3, 0 ! h1y03A+
@@ -1479,6 +1495,7 @@ SLOT=10
15, 2, 6, 1 ! h1y06A-
SLOT=13
+REFINDEX=3
0, 2, 7, 1 ! h1y07A-
1, 2, 8, 1 ! h1y08A-
2, 2, 9, 1 ! h1y09A-
@@ -1497,6 +1514,7 @@ SLOT=13
15, 3, 12, 0 ! h2x12A+
SLOT=14
+REFINDEX=3
0, 3, 13, 0 ! h2x13A+
1, 3, 14, 0 ! h2x14A+
2, 3, 15, 0 ! h2x15A+
@@ -1515,6 +1533,7 @@ SLOT=14
15, 3, 12, 1 ! h2x12A-
SLOT=15
+REFINDEX=3
0, 3, 13, 1 ! h2x13A-
1, 3, 14, 1 ! h2x14A-
2, 3, 15, 1 ! h2x15A-
@@ -1533,6 +1552,7 @@ SLOT=15
15, 4, 2, 1 ! h2y02A-
SLOT=16
+REFINDEX=3
0, 4, 3, 1 ! h2y03A-
1, 4, 4, 1 ! h2y04A-
2, 4, 5, 1 ! h2y05A-
@@ -1654,8 +1674,12 @@ REFINDEX=0
DETECTOR=14
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=7
+REFINDEX=3
14, 1, 1, 0 ! hCER01
15, 1, 2, 0 ! hCER02
@@ -1663,8 +1687,12 @@ SLOT=7
DETECTOR=15
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
SLOT=3
+REFINDEX=3
0, 1, 1, 0 ! hA01+
1, 1, 2, 0 ! hA02+
2, 1, 3, 0 ! hA03+
@@ -1683,6 +1711,7 @@ SLOT=3
15, 1, 3, 1 ! hA03-
SLOT=4
+REFINDEX=3
0, 1, 4, 1 ! hA04-
1, 1, 5, 1 ! hA05-
2, 1, 6, 1 ! hA06-
@@ -1701,6 +1730,7 @@ SLOT=4
15, 2, 6, 0 ! hB06+
SLOT=5
+REFINDEX=3
0, 2, 7, 0 ! hB07+
1, 2, 8, 0 ! hB08+
2, 2, 9, 0 ! hB09+
@@ -1719,6 +1749,7 @@ SLOT=5
15, 2, 9, 1 ! hB09-
SLOT=6
+REFINDEX=3
0, 2, 10, 1 ! hB10-
1, 2, 11, 1 ! hB11-
2, 2, 12, 1 ! hB12-
@@ -1737,6 +1768,7 @@ SLOT=6
15, 3, 12, 0 ! hC12+
SLOT=7
+REFINDEX=3
0, 3, 13, 0 ! hC13+
1, 4, 1, 0 ! hD01+
2, 4, 2, 0 ! hD02+
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index f8fd157d082f0c4fd0be3655e5ddd3ba9e833509..bc076c2357785aa5250785259ceb0e47be74009f 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -7,9 +7,13 @@
detector=10
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000,0,3
!F250 module
SLOT=17
+REFINDEX=3
! chan plane bar sig
8, 1, 1, 0! hASUM
9, 1, 2, 0! hBSUM
@@ -21,6 +25,7 @@ SLOT=17
15, 1, 8, 0! hCERSUM
SLOT=18
+REFINDEX=3
! chan plane bar sig
11, 1, 9, 0! hFADC_TREF_ROC1
@@ -63,6 +68,7 @@ REFINDEX=0
!CAEN1190 module
SLOT=20
+REFINDEX=0
! D1
! chan plane bar sig
127, 2, 17, 1! hT2
diff --git a/PARAM/HMS/AERO/CUTS/haero_cuts.param b/PARAM/HMS/AERO/CUTS/haero_cuts.param
index a0849e79c0283ff9e57af49cdef7ded3cddea96e..bd705e861e03d519125c3a0a77218758959bc6d9 100644
--- a/PARAM/HMS/AERO/CUTS/haero_cuts.param
+++ b/PARAM/HMS/AERO/CUTS/haero_cuts.param
@@ -16,9 +16,10 @@ haero_enorm_max = 1.5
haero_dp_min = -20.0
haero_dp_max = 25.0
+haero_adc_tdc_offset = 200.
; ADC time window cut values used to select "good" ADC events
-haero_adcTimeWindowMin = 31.25
-haero_adcTimeWindowMax = 156.25
+haero_adcTimeWindowMin = -1000.
+haero_adcTimeWindowMax = 1000.
; NPE Threshold for "good" hit (for measureing effic.)
haero_npe_thresh = 0.5
diff --git a/PARAM/HMS/CAL/CUTS/hcal_cuts.param b/PARAM/HMS/CAL/CUTS/hcal_cuts.param
index 310e3468079933b460eb6cc5440d2ce87f120539..28a7f77dcffd1c545fe3669df6475d33a89ad649 100644
--- a/PARAM/HMS/CAL/CUTS/hcal_cuts.param
+++ b/PARAM/HMS/CAL/CUTS/hcal_cuts.param
@@ -5,9 +5,10 @@
; if not set then defaults to use the raw pulse integral
hcal_ADCmode=1
+hcal_adc_tdc_offset= 200.
;FADC Pulse time window cuts
-hcal_AdcTimeWindowMin = 62.5
-hcal_AdcTimeWindowMax = 175.0
+hcal_AdcTimeWindowMin = -1000.
+hcal_AdcTimeWindowMax = 1000.
; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
hcal_AdcNegThreshold=0.
diff --git a/PARAM/HMS/CER/CUTS/hcer_cuts.param b/PARAM/HMS/CER/CUTS/hcer_cuts.param
index c1aefa166ede75cb8d584ada7837742c081dbd8b..76243b188b454b8702813404cba95cbb562bf75e 100644
--- a/PARAM/HMS/CER/CUTS/hcer_cuts.param
+++ b/PARAM/HMS/CER/CUTS/hcer_cuts.param
@@ -16,9 +16,10 @@ hcer_enorm_max = 1.5
hcer_dp_min = -20.0
hcer_dp_max = 25.0
+hcer_adc_tdc_window= 200.
; ADC time window cut values used to select "good" ADC events
-hcer_adcTimeWindowMin = 93.75
-hcer_adcTimeWindowMax = 218.75
+hcer_adcTimeWindowMin = -1000.
+hcer_adcTimeWindowMax = 1000.
; NPE Threshold for good hit (for measureing effic.)
hcer_npe_thresh = 0.5
diff --git a/PARAM/HMS/HODO/CUTS/hhodo_cuts.param b/PARAM/HMS/HODO/CUTS/hhodo_cuts.param
index 437adb86e5d4d030bf36284fe2c7491f7005a58a..ee3ef4d5fde8e1e45342395cb55c3fd34c4a341a 100644
--- a/PARAM/HMS/HODO/CUTS/hhodo_cuts.param
+++ b/PARAM/HMS/HODO/CUTS/hhodo_cuts.param
@@ -15,6 +15,7 @@ hhodo_adc_mode=1
hhodo_tdc_offset = 1280, 1280, 1280, 1280
; hhodo_tdc_offset = 1000, 1000, 1000, 1000
+hhodo_adc_tdc_offset = 200., 200., 200., 200.
; hhodo set min and max fADC time window for all paddles in a plane in units of ns
; the conversion is 0.0625 ns / channel for flash ADC 250
hhodo_AdcTimeWindowMin = 0., 0., 0., 0.
diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param
index f09ef239e5bb21ebb8c0c3e85cdee7e9f8ae5b41..6a1901aa0cde69b865ebaf163d0bc0c28200818a 100644
--- a/PARAM/TRIG/tcoin.param
+++ b/PARAM/TRIG/tcoin.param
@@ -1,6 +1,7 @@
t_coin_numAdc = 19
t_coin_numTdc = 43
-t_coin_tdcoffset = -300.
+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 14 15 16 17 18 19
diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param
index 1652ba5d2bcb7f62d063a49136931ca2690d3a6e..5b79a4a28ed0a8647ca9fdffbb4f67972248e213 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -1,6 +1,7 @@
t_hms_numAdc = 9
t_hms_numTdc = 33
-t_hms_tdcoffset=-300.
+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
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index 8a3b1f66a4eebf77a439eb73916acfd75d148810..ed99aa7cdc6769224a2fb2749b3a0e35d5d7fe67 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,7 +1,8 @@
t_shms_numAdc = 4
t_shms_numTdc = 35
-t_shms_tdcoffset = -300.
+t_shms_tdcoffset = 300.
+t_shms_adc_tdc_offset = 200.
t_shms_tdcchanperns = 0.1
; bar num: 1 2 3 4