diff --git a/DEF-files/HMS/SCALERS/hscaler_cuts.def b/DEF-files/HMS/SCALERS/hscaler_cuts.def
index 09986bf042dd4d809bb361dc80e83985636c883e..8044e55049a70f409b2235c42eeba49f0da973de 100644
--- a/DEF-files/HMS/SCALERS/hscaler_cuts.def
+++ b/DEF-files/HMS/SCALERS/hscaler_cuts.def
@@ -16,8 +16,8 @@ RawDecode_master 1
Block: Decode
hms_trigs HMS_event
-edtm_accepted T.hms.hHODO_EDTM_tdcTime != 0.0
-physics_accepted T.hms.hHODO_EDTM_tdcTime == 0.0
+edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+physics_accepted T.hms.hEDTM_tdcTime == 0.0
triggers_accepted T.hms.hT1_tdcTime == 300.0
Decode_master HMS_event
diff --git a/DEF-files/SHMS/SCALERS/pscaler_cuts.def b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
index 408e961b6120f723ef4fc238ee981f6a18ca0ec1..57435c07ab37970834884694246353f2d2dda6c0 100644
--- a/DEF-files/SHMS/SCALERS/pscaler_cuts.def
+++ b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
@@ -3,22 +3,16 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 7
RawDecode_master 1
Block: Decode
shms_trigs SHMS_event
-edtm_accepted T.shms.pHODO_EDTM_tdcTime != 0.0
-physics_accepted T.shms.pHODO_EDTM_tdcTime == 0.0
-triggers_accepted T.shms.pT2_tdcTime == 300.0
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
+triggers_accepted T.shms.pT2_tdcTime == 200.0
Decode_master SHMS_event
diff --git a/MAPS/COIN/DETEC/TRIG/cointrig.map b/MAPS/COIN/DETEC/TRIG/cointrig.map
index 2bcf645cbac1422dd345f438fd00e70b24cca23b..a584433dc8cea9bfd631624c2e5da46aeca82f82 100644
--- a/MAPS/COIN/DETEC/TRIG/cointrig.map
+++ b/MAPS/COIN/DETEC/TRIG/cointrig.map
@@ -47,21 +47,32 @@ REFINDEX=0
11, 2, 12, 1! hPSHWRLO
12, 2, 13, 1! hPSHWRHI
13, 2, 14, 1! hSHWR
- 14, 2, 15, 1! hHODO_EDTM
+ 14, 2, 15, 1! hEDTM
15, 2, 16, 1! hCERSUM
! A1
- 26, 2, 22, 1! hhTRIG1
- 27, 2, 23, 1! hhTRIG2
- 28, 2, 24, 1! hhTRIG3
- 29, 2, 25, 1! hhTRIG4
- 30, 2, 26, 1! hhTRIG5
- 31, 2, 27, 1! hhTRIG6
- 16, 2, 28, 1! hpTRIG1
- 17, 2, 29, 1! hpTRIG2
- 18, 2, 30, 1! hpTRIG3
- 19, 2, 31, 1! hpTRIG4
- 20, 2, 32, 1! hpTRIG5
- 21, 2, 33, 1! hpTRIG6
+ 26, 2, 22, 1! hTRIG1_ROC1
+ 27, 2, 23, 1! hTRIG2_ROC1
+ 28, 2, 24, 1! hTRIG3_ROC1
+ 29, 2, 25, 1! hTRIG4_ROC1
+ 30, 2, 26, 1! hTRIG5_ROC1
+ 31, 2, 27, 1! hTRIG6_ROC1
+ 16, 2, 28, 1! pTRIG1_ROC1
+ 17, 2, 29, 1! pTRIG2_ROC1
+ 18, 2, 30, 1! pTRIG3_ROC1
+ 19, 2, 31, 1! pTRIG4_ROC1
+ 20, 2, 32, 1! pTRIG5_ROC1
+ 21, 2, 33, 1! pTRIG6_ROC1
+! B1
+ 48, 2, 79, 1! pSTOF_ROC1
+ 49, 2, 80, 1! pEL_LO_ROC1
+ 50, 2, 81, 1! pEL_HI_ROC1
+ 51, 2, 82, 1! pEL_REAL_ROC1
+ 52, 2, 83, 1! pEL_CLEAN_ROC1
+ 56, 2, 84, 1! hSTOF_ROC1
+ 57, 2, 85, 1! hEL_LO_ROC1
+ 58, 2, 86, 1! hEL_HI_ROC1
+ 59, 2, 87, 1! hEL_REAL_ROC1
+ 60, 2, 88, 1! hEL_CLEAN_ROC1
!CAEN1190 module
@@ -118,19 +129,29 @@ REFINDEX=0
39, 2, 43, 1 ! pAERSUM
40, 2, 44, 1 ! pHGCERSUM
41, 2, 45, 1 ! pNGCERSUM
- 42, 2, 56, 1 ! pHODO_EDTM
- 48, 2, 57, 1 ! ppTRIG1
- 49, 2, 58, 1 ! ppTRIG2
- 50, 2, 59, 1 ! ppTRIG3
- 51, 2, 60, 1 ! ppTRIG4
- 52, 2, 61, 1 ! ppTRIG5
- 53, 2, 62, 1 ! ppTRIG6
- 58, 2, 63, 1 ! phTRIG1
- 59, 2, 64, 1 ! phTRIG2
- 60, 2, 65, 1 ! phTRIG3
- 61, 2, 66, 1 ! phTRIG4
- 62, 2, 67, 1 ! phTRIG5
- 63, 2, 68, 1 ! phTRIG6
+ 42, 2, 56, 1 ! pEDTM
+ 48, 2, 57, 1 ! pTRIG1_ROC2
+ 49, 2, 58, 1 ! pTRIG2_ROC2
+ 50, 2, 59, 1 ! pTRIG3_ROC2
+ 51, 2, 60, 1 ! pTRIG4_ROC2
+ 52, 2, 61, 1 ! pTRIG5_ROC2
+ 53, 2, 62, 1 ! pTRIG6_ROC2
+ 58, 2, 63, 1 ! hTRIG1_ROC2
+ 59, 2, 64, 1 ! hTRIG2_ROC2
+ 60, 2, 65, 1 ! hTRIG3_ROC2
+ 61, 2, 66, 1 ! hTRIG4_ROC2
+ 62, 2, 67, 1 ! hTRIG5_ROC2
+ 63, 2, 68, 1 ! hTRIG6_ROC2
+ 64, 2, 69, 1 ! pSTOF_ROC2
+ 65, 2, 70, 1 ! pEL_LO_ROC2
+ 66, 2, 71, 1 ! pEL_HI_ROC2
+ 67, 2, 72, 1 ! pEL_REAL_ROC2
+ 68, 2, 73, 1 ! pEL_CLEAN_ROC2
+ 72, 2, 74, 1 ! hSTOF_ROC2
+ 73, 2, 75, 1 ! hEL_LO_ROC2
+ 74, 2, 76, 1 ! hEL_HI_ROC2
+ 75, 2, 77, 1 ! hEL_REAL_ROC2
+ 76, 2, 78, 1 ! hEL_CLEAN_ROC2
ROC=6
diff --git a/MAPS/COIN/DETEC/coin.map b/MAPS/COIN/DETEC/coin.map
index 59df6a74c4df48ea15324c5cae9957bcb4281309..b46331d644434e2742fca423ec4b505fc4695b9f 100644
--- a/MAPS/COIN/DETEC/coin.map
+++ b/MAPS/COIN/DETEC/coin.map
@@ -3803,20 +3803,30 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hHODO_EDTM
+ 14, 2, 15, 1 ! hEDTM
15, 2, 16, 1 ! hCERSUM
- 26, 2, 22, 1 ! hhTRIG1
- 27, 2, 23, 1 ! hhTRIG2
- 28, 2, 24, 1 ! hhTRIG3
- 29, 2, 25, 1 ! hhTRIG4
- 30, 2, 26, 1 ! hhTRIG5
- 31, 2, 27, 1 ! hhTRIG6
- 16, 2, 28, 1 ! hpTRIG1
- 17, 2, 29, 1 ! hpTRIG2
- 18, 2, 30, 1 ! hpTRIG3
- 19, 2, 31, 1 ! hpTRIG4
- 20, 2, 32, 1 ! hpTRIG5
- 21, 2, 33, 1 ! hpTRIG6
+ 26, 2, 22, 1 ! hTRIG1_ROC1
+ 27, 2, 23, 1 ! hTRIG2_ROC1
+ 28, 2, 24, 1 ! hTRIG3_ROC1
+ 29, 2, 25, 1 ! hTRIG4_ROC1
+ 30, 2, 26, 1 ! hTRIG5_ROC1
+ 31, 2, 27, 1 ! hTRIG6_ROC1
+ 16, 2, 28, 1 ! pTRIG1_ROC1
+ 17, 2, 29, 1 ! pTRIG2_ROC1
+ 18, 2, 30, 1 ! pTRIG3_ROC1
+ 19, 2, 31, 1 ! pTRIG4_ROC1
+ 20, 2, 32, 1 ! pTRIG5_ROC1
+ 21, 2, 33, 1 ! pTRIG6_ROC1
+ 48, 2, 79, 1 ! pSTOF_ROC1
+ 49, 2, 80, 1 ! pEL_LO_ROC1
+ 50, 2, 81, 1 ! pEL_HI_ROC1
+ 51, 2, 82, 1 ! pEL_REAL_ROC1
+ 52, 2, 83, 1 ! pEL_CLEAN_ROC1
+ 56, 2, 84, 1 ! hSTOF_ROC1
+ 57, 2, 85, 1 ! hEL_LO_ROC1
+ 58, 2, 86, 1 ! hEL_HI_ROC1
+ 59, 2, 87, 1 ! hEL_REAL_ROC1
+ 60, 2, 88, 1 ! hEL_CLEAN_ROC1
SLOT=20
REFINDEX=1
@@ -3841,7 +3851,6 @@ ROC=2
SLOT=14
REFINDEX=3
- 11,1000, 0, 3 ! pFADC_TREF_ROC2
0, 1, 10, 0 ! pAERSUM
1, 1, 11, 0 ! pHGCERSUM
2, 1, 12, 0 ! pNGCERSUM
@@ -3866,19 +3875,29 @@ REFINDEX=0
39, 2, 43, 1 ! pAERSUM
40, 2, 44, 1 ! pHGCERSUM
41, 2, 45, 1 ! pNGCERSUM
- 42, 2, 56, 1 ! pHODO_EDTM
- 48, 2, 57, 1 ! ppTRIG1
- 49, 2, 58, 1 ! ppTRIG2
- 50, 2, 59, 1 ! ppTRIG3
- 51, 2, 60, 1 ! ppTRIG4
- 52, 2, 61, 1 ! ppTRIG5
- 53, 2, 62, 1 ! ppTRIG6
- 58, 2, 63, 1 ! phTRIG1
- 59, 2, 64, 1 ! phTRIG2
- 60, 2, 65, 1 ! phTRIG3
- 61, 2, 66, 1 ! phTRIG4
- 62, 2, 67, 1 ! phTRIG5
- 63, 2, 68, 1 ! phTRIG6
+ 42, 2, 56, 1 ! pEDTM
+ 48, 2, 57, 1 ! pTRIG1_ROC2
+ 49, 2, 58, 1 ! pTRIG2_ROC2
+ 50, 2, 59, 1 ! pTRIG3_ROC2
+ 51, 2, 60, 1 ! pTRIG4_ROC2
+ 52, 2, 61, 1 ! pTRIG5_ROC2
+ 53, 2, 62, 1 ! pTRIG6_ROC2
+ 58, 2, 63, 1 ! hTRIG1_ROC2
+ 59, 2, 64, 1 ! hTRIG2_ROC2
+ 60, 2, 65, 1 ! hTRIG3_ROC2
+ 61, 2, 66, 1 ! hTRIG4_ROC2
+ 62, 2, 67, 1 ! hTRIG5_ROC2
+ 63, 2, 68, 1 ! hTRIG6_ROC2
+ 64, 2, 69, 1 ! pSTOF_ROC2
+ 65, 2, 70, 1 ! pEL_LO_ROC2
+ 66, 2, 71, 1 ! pEL_HI_ROC2
+ 67, 2, 72, 1 ! pEL_REAL_ROC2
+ 68, 2, 73, 1 ! pEL_CLEAN_ROC2
+ 72, 2, 74, 1 ! hSTOF_ROC2
+ 73, 2, 75, 1 ! hEL_LO_ROC2
+ 74, 2, 76, 1 ! hEL_HI_ROC2
+ 75, 2, 77, 1 ! hEL_REAL_ROC2
+ 76, 2, 78, 1 ! hEL_CLEAN_ROC2
ROC=6
diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
index a4e716ef7b059aae7a27698f477ec23250348ab6..309fc625f5b1946c270a34c4cd8be2823e8b9054 100644
--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -39,7 +39,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hHODO_EDTM
+ 14, 2, 15, 1 ! hEDTM
15, 2, 16, 1 ! hCERSUM
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
@@ -53,6 +53,16 @@ REFINDEX=0
19, 2, 31, 1 ! pTRIG4
20, 2, 32, 1 ! pTRIG5
21, 2, 33, 1 ! pTRIG6
+ 48, 2, 34, 1 ! pSTOF
+ 49, 2, 35, 1 ! pEL_LO
+ 50, 2, 36, 1 ! pEL_HI
+ 51, 2, 37, 1 ! pEL_REAL
+ 52, 2, 38, 1 ! pEL_CLEAN
+ 56, 2, 39, 1 ! hSTOF
+ 57, 2, 40, 1 ! hEL_LO
+ 58, 2, 41, 1 ! hEL_HI
+ 59, 2, 42, 1 ! hEL_REAL
+ 60, 2, 43, 1 ! hEL_CLEAN
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map
index 82ef503b52bf6ae1649ea7d4075064785ab5933d..70f6e736f356344265afbbb35a2b54db91a49285 100644
--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -39,7 +39,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hHODO_EDTM
+ 14, 2, 15, 1 ! hEDTM
15, 2, 16, 1 ! hCERSUM
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
@@ -53,6 +53,16 @@ REFINDEX=0
19, 2, 31, 1 ! pTRIG4
20, 2, 32, 1 ! pTRIG5
21, 2, 33, 1 ! pTRIG6
+ 48, 2, 34, 1 ! pSTOF
+ 49, 2, 35, 1 ! pEL_LO
+ 50, 2, 36, 1 ! pEL_HI
+ 51, 2, 37, 1 ! pEL_REAL
+ 52, 2, 38, 1 ! pEL_CLEAN
+ 56, 2, 39, 1 ! hSTOF
+ 57, 2, 40, 1 ! hEL_LO
+ 58, 2, 41, 1 ! hEL_HI
+ 59, 2, 42, 1 ! hEL_REAL
+ 60, 2, 43, 1 ! hEL_CLEAN
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/DC/hdc_htrig.map b/MAPS/HMS/DETEC/DC/hdc_htrig.map
index d26f1fd6c76d182144f057d02523ed305cd50345..ac62395ebf4a0cae83face840e5a664b74a15b22 100644
--- a/MAPS/HMS/DETEC/DC/hdc_htrig.map
+++ b/MAPS/HMS/DETEC/DC/hdc_htrig.map
@@ -39,7 +39,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hHODO_EDTM
+ 14, 2, 15, 1 ! hEDTM
15, 2, 16, 1 ! hCERSUM
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
@@ -53,6 +53,16 @@ REFINDEX=0
19, 2, 31, 1 ! pTRIG4
20, 2, 32, 1 ! pTRIG5
21, 2, 33, 1 ! pTRIG6
+ 48, 2, 34, 1 ! pSTOF
+ 49, 2, 35, 1 ! pEL_LO
+ 50, 2, 36, 1 ! pEL_HI
+ 51, 2, 37, 1 ! pEL_REAL
+ 52, 2, 38, 1 ! pEL_CLEAN
+ 56, 2, 39, 1 ! hSTOF
+ 57, 2, 40, 1 ! hEL_LO
+ 58, 2, 41, 1 ! hEL_HI
+ 59, 2, 42, 1 ! hEL_REAL
+ 60, 2, 43, 1 ! hEL_CLEAN
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
index 6786eb0e4c2a2c364b2f7743db0cacff2303a0a9..e3cb6fd9f68964ee6f3165d34bbf37dc76ccd565 100644
--- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
@@ -39,7 +39,7 @@ REFINDEX=0
11, 2, 12, 1 ! hPSHWRLO
12, 2, 13, 1 ! hPSHWRHI
13, 2, 14, 1 ! hSHWR
- 14, 2, 15, 1 ! hHODO_EDTM
+ 14, 2, 15, 1 ! hEDTM
15, 2, 16, 1 ! hCERSUM
26, 2, 22, 1 ! hTRIG1
27, 2, 23, 1 ! hTRIG2
@@ -53,6 +53,16 @@ REFINDEX=0
19, 2, 31, 1 ! pTRIG4
20, 2, 32, 1 ! pTRIG5
21, 2, 33, 1 ! pTRIG6
+ 48, 2, 34, 1 ! pSTOF
+ 49, 2, 35, 1 ! pEL_LO
+ 50, 2, 36, 1 ! pEL_HI
+ 51, 2, 37, 1 ! pEL_REAL
+ 52, 2, 38, 1 ! pEL_CLEAN
+ 56, 2, 39, 1 ! hSTOF
+ 57, 2, 40, 1 ! hEL_LO
+ 58, 2, 41, 1 ! hEL_HI
+ 59, 2, 42, 1 ! hEL_REAL
+ 60, 2, 43, 1 ! hEL_CLEAN
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index c9f3b40ed71fcb06e6e73a18f8bab4c1dc98a8d2..df8d463515d581891cc3a251a357b53b8395730e 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -47,7 +47,7 @@ REFINDEX=0
11, 2, 12, 1! hPSHWRLO
12, 2, 13, 1! hPSHWRHI
13, 2, 14, 1! hSHWR
- 14, 2, 15, 1! hHODO_EDTM
+ 14, 2, 15, 1! hEDTM
15, 2, 16, 1! hCERSUM
! A1
26, 2, 22, 1! hTRIG1
@@ -62,6 +62,17 @@ REFINDEX=0
19, 2, 31, 1! pTRIG4
20, 2, 32, 1! pTRIG5
21, 2, 33, 1! pTRIG6
+! B1
+ 48, 2, 34, 1! pSTOF
+ 49, 2, 35, 1! pEL_LO
+ 50, 2, 36, 1! pEL_HI
+ 51, 2, 37, 1! pEL_REAL
+ 52, 2, 38, 1! pEL_CLEAN
+ 56, 2, 39, 1! hSTOF
+ 57, 2, 40, 1! hEL_LO
+ 58, 2, 41, 1! hEL_HI
+ 59, 2, 42, 1! hEL_REAL
+ 60, 2, 43, 1! hEL_CLEAN
!CAEN1190 module
diff --git a/MAPS/SCALERS/db_HScalevt.dat b/MAPS/SCALERS/db_HScalevt.dat
index bd35462ba5bd8acedb9bf9e9b854609bec4f8aac..7145363575f7d9a1d0fad1cefb27da5d13a1cdf4 100644
--- a/MAPS/SCALERS/db_HScalevt.dat
+++ b/MAPS/SCALERS/db_HScalevt.dat
@@ -5,6 +5,8 @@ map 3801 5 9 00600920 ffffffff 12
map 3801 5 10 00800a20 ffffffff 12
map 3801 5 11 00a00b20 ffffffff 12
map 3801 5 12 00c00c20 ffffffff 12 31 1000000
+variable 5 18 1 .pEL_HI.scaler SHMS EL_HI
+variable 5 18 2 .pEL_HI.scalerRate SHMS EL_HI
variable 3 3 1 .hod.2y7.posScaler HMS 2Y+ paddle 7
variable 3 3 2 .hod.2y7.posScalerRate HMS 2Y+ paddle 7
variable 3 19 1 .hod.2y7.negScaler HMS 2Y- paddle 7
@@ -19,6 +21,8 @@ variable 2 8 1 .hod.2x9.posScaler HMS 2X+ paddle 9
variable 2 8 2 .hod.2x9.posScalerRate HMS 2X+ paddle 9
variable 2 24 1 .hod.2x9.negScaler HMS 2X- paddle 9
variable 2 24 2 .hod.2x9.negScalerRate HMS 2X- paddle 9
+variable 5 26 1 .hEL_HI.scaler HMS EL_HI
+variable 5 26 2 .hEL_HI.scalerRate HMS EL_HI
variable 1 19 1 .hod.1y7.negScaler HMS 1Y- paddle 7
variable 1 19 2 .hod.1y7.negScalerRate HMS 1Y- paddle 7
variable 1 3 1 .hod.1y7.posScaler HMS 1Y+ paddle 7
@@ -65,6 +69,8 @@ variable 2 25 1 .hod.2x11.negScaler HMS 2X- paddle 11
variable 2 25 2 .hod.2x11.negScalerRate HMS 2X- paddle 11
variable 3 1 1 .hod.2y3.posScaler HMS 2Y+ paddle 3
variable 3 1 2 .hod.2y3.posScalerRate HMS 2Y+ paddle 3
+variable 3 7 1 .hod.2y8.posScaler HMS 2Y+ paddle 8
+variable 3 7 2 .hod.2y8.posScalerRate HMS 2Y+ paddle 8
variable 3 23 1 .hod.2y8.negScaler HMS 2Y- paddle 8
variable 3 23 2 .hod.2y8.negScalerRate HMS 2Y- paddle 8
variable 6 30 1 .Unser.scaler Unser
@@ -79,29 +85,31 @@ variable 2 21 1 .hod.2x4.negScaler HMS 2X- paddle 4
variable 2 21 2 .hod.2x4.negScalerRate HMS 2X- paddle 4
variable 2 5 1 .hod.2x4.posScaler HMS 2X+ paddle 4
variable 2 5 2 .hod.2x4.posScalerRate HMS 2X+ paddle 4
-variable 6 25 1 .BCM4A.scaler bcm4a
-variable 6 25 2 .BCM4A.scalerRate bcm4a
-variable 6 25 3 .BCM4A.scalerCurrent bcm4a
-variable 6 25 4 .BCM4A.scalerCharge bcm4a
-variable 6 26 1 .BCM4B.scaler bcm4b
-variable 6 26 2 .BCM4B.scalerRate bcm4b
-variable 6 26 3 .BCM4B.scalerCurrent bcm4b
-variable 6 26 4 .BCM4B.scalerCharge bcm4b
+variable 5 25 1 .hEL_LO.scaler HMS EL_LO
+variable 5 25 2 .hEL_LO.scalerRate HMS EL_LO
+variable 6 25 1 .BCM4A.scaler BCM4a
+variable 6 25 2 .BCM4A.scalerRate BCM4a
+variable 6 25 3 .BCM4A.scalerCurrent BCM4a
+variable 6 25 4 .BCM4A.scalerCharge BCM4a
+variable 6 26 1 .BCM4B.scaler BCM4b
+variable 6 26 2 .BCM4B.scalerRate BCM4b
+variable 6 26 3 .BCM4B.scalerCurrent BCM4b
+variable 6 26 4 .BCM4B.scalerCharge BCM4b
variable 6 31 1 .1Mhz.scaler 1MHz
variable 6 31 2 .1Mhz.scalerRate 1MHz
variable 6 31 5 .1Mhz.scalerTime 1MHz
-variable 1 11 1 .Empty_3.scaler Empty
-variable 1 11 2 .Empty_3.scalerRate Empty
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 8 1 .hod.1x9.posScaler HMS 1X+ paddle 9
variable 0 8 2 .hod.1x9.posScalerRate HMS 1X+ paddle 9
variable 0 24 1 .hod.1x9.negScaler HMS 1X- paddle 9
variable 0 24 2 .hod.1x9.negScalerRate HMS 1X- paddle 9
+variable 5 30 1 .Empty_29.scaler Empty
+variable 5 30 2 .Empty_29.scalerRate Empty
+variable 5 29 1 .Empty_28.scaler Empty
+variable 5 29 2 .Empty_28.scalerRate Empty
variable 2 27 1 .hod.2x15.negScaler HMS 2X- paddle 15
variable 2 27 2 .hod.2x15.negScalerRate HMS 2X- paddle 15
variable 3 26 1 .Empty_20.scaler Empty
@@ -110,16 +118,20 @@ variable 3 30 1 .Empty_23.scaler Empty
variable 3 30 2 .Empty_23.scalerRate Empty
variable 3 29 1 .Empty_22.scaler Empty
variable 3 29 2 .Empty_22.scalerRate Empty
+variable 5 21 1 .Empty_25.scaler Empty
+variable 5 21 2 .Empty_25.scalerRate Empty
variable 3 31 1 .Empty_24.scaler Empty
variable 3 31 2 .Empty_24.scalerRate Empty
variable 2 11 1 .hod.2x15.posScaler HMS 2X+ paddle 15
variable 2 11 2 .hod.2x15.posScalerRate HMS 2X+ paddle 15
+variable 5 22 1 .Empty_26.scaler Empty
+variable 5 22 2 .Empty_26.scalerRate Empty
+variable 5 27 1 .hEL_REAL.scaler HMS EL_REAL
+variable 5 27 2 .hEL_REAL.scalerRate HMS EL_REAL
variable 3 21 1 .hod.2y4.negScaler HMS 2Y- paddle 4
variable 3 21 2 .hod.2y4.negScalerRate HMS 2Y- paddle 4
variable 3 5 1 .hod.2y4.posScaler HMS 2Y+ paddle 4
variable 3 5 2 .hod.2y4.posScalerRate HMS 2Y+ paddle 4
-variable 0 0 1 .hod.1x1.posScaler HMS 1X+ paddle 1
-variable 0 0 2 .hod.1x1.posScalerRate HMS 1X+ paddle 1
variable 0 27 1 .hod.1x15.negScaler HMS 1X- paddle 15
variable 0 27 2 .hod.1x15.negScalerRate HMS 1X- paddle 15
variable 0 11 1 .hod.1x15.posScaler HMS 1X+ paddle 15
@@ -128,12 +140,16 @@ variable 2 7 1 .hod.2x8.posScaler HMS 2X+ paddle 8
variable 2 7 2 .hod.2x8.posScalerRate HMS 2X+ paddle 8
variable 2 23 1 .hod.2x8.negScaler HMS 2X- paddle 8
variable 2 23 2 .hod.2x8.negScalerRate HMS 2X- paddle 8
+variable 5 28 1 .hEL_CLEAN.scaler HMS EL_CLEAN
+variable 5 28 2 .hEL_CLEAN.scalerRate HMS EL_CLEAN
variable 2 17 1 .hod.2x3.negScaler HMS 2X- paddle 3
variable 2 17 2 .hod.2x3.negScalerRate HMS 2X- paddle 3
variable 2 1 1 .hod.2x3.posScaler HMS 2X+ paddle 3
variable 2 1 2 .hod.2x3.posScalerRate HMS 2X+ paddle 3
variable 0 5 1 .hod.1x4.posScaler HMS 1X+ paddle 4
variable 0 5 2 .hod.1x4.posScalerRate HMS 1X+ paddle 4
+variable 5 19 1 .pEL_REAL.scaler SHMS EL_REAL
+variable 5 19 2 .pEL_REAL.scalerRate SHMS EL_REAL
variable 1 24 1 .hod.1y9.negScaler HMS 1Y- paddle 9
variable 1 24 2 .hod.1y9.negScalerRate HMS 1Y- paddle 9
variable 1 8 1 .hod.1y9.posScaler HMS 1Y+ paddle 9
@@ -184,14 +200,16 @@ variable 0 12 1 .hod.1x10.posScaler HMS 1X+ paddle 10
variable 0 12 2 .hod.1x10.posScalerRate HMS 1X+ paddle 10
variable 0 28 1 .hod.1x10.negScaler HMS 1X- paddle 10
variable 0 28 2 .hod.1x10.negScalerRate HMS 1X- paddle 10
-variable 6 28 1 .BCM2.scaler bcm2
-variable 6 28 2 .BCM2.scalerRate bcm2
-variable 6 28 3 .BCM2.scalerCurrent bcm2
-variable 6 28 4 .BCM2.scalerCharge bcm2
-variable 6 27 1 .BCM1.scaler bcm1
-variable 6 27 2 .BCM1.scalerRate bcm1
-variable 6 27 3 .BCM1.scalerCurrent bcm1
-variable 6 27 4 .BCM1.scalerCharge bcm1
+variable 5 20 1 .pEL_CLEAN.scaler SHMS EL_CLEAN
+variable 5 20 2 .pEL_CLEAN.scalerRate SHMS EL_CLEAN
+variable 6 28 1 .BCM2.scaler BCM2
+variable 6 28 2 .BCM2.scalerRate BCM2
+variable 6 28 3 .BCM2.scalerCurrent BCM2
+variable 6 28 4 .BCM2.scalerCharge BCM2
+variable 6 27 1 .BCM1.scaler BCM1
+variable 6 27 2 .BCM1.scalerRate BCM1
+variable 6 27 3 .BCM1.scalerCurrent BCM1
+variable 6 27 4 .BCM1.scalerCharge BCM1
variable 2 3 1 .hod.2x7.posScaler HMS 2X+ paddle 7
variable 2 3 2 .hod.2x7.posScalerRate HMS 2X+ paddle 7
variable 2 19 1 .hod.2x7.negScaler HMS 2X- paddle 7
@@ -204,10 +222,32 @@ variable 1 20 1 .hod.1y2.negScaler HMS 1Y- paddle 2
variable 1 20 2 .hod.1y2.negScalerRate HMS 1Y- paddle 2
variable 1 4 1 .hod.1y2.posScaler HMS 1Y+ paddle 2
variable 1 4 2 .hod.1y2.posScalerRate HMS 1Y+ paddle 2
-variable 6 6 1 .Trig.scaler HMS T1
-variable 6 6 2 .Trig.scalerRate HMS T1
+variable 6 23 1 .Empty_38.scaler Empty
+variable 6 23 2 .Empty_38.scalerRate Empty
+variable 6 24 1 .Empty_39.scaler Empty
+variable 6 24 2 .Empty_39.scalerRate Empty
+variable 6 17 1 .Empty_32.scaler Empty
+variable 6 17 2 .Empty_32.scalerRate Empty
+variable 6 18 1 .Empty_33.scaler Empty
+variable 6 18 2 .Empty_33.scalerRate Empty
+variable 5 31 1 .Empty_30.scaler Empty
+variable 5 31 2 .Empty_30.scalerRate Empty
+variable 6 16 1 .Empty_31.scaler Empty
+variable 6 16 2 .Empty_31.scalerRate Empty
+variable 6 21 1 .Empty_36.scaler Empty
+variable 6 21 2 .Empty_36.scalerRate Empty
+variable 6 22 1 .Empty_37.scaler Empty
+variable 6 22 2 .Empty_37.scalerRate Empty
+variable 6 19 1 .Empty_34.scaler Empty
+variable 6 19 2 .Empty_34.scalerRate Empty
+variable 6 20 1 .Empty_35.scaler Empty
+variable 6 20 2 .Empty_35.scalerRate Empty
+variable 0 0 1 .hod.1x1.posScaler HMS 1X+ paddle 1
+variable 0 0 2 .hod.1x1.posScalerRate HMS 1X+ paddle 1
variable 0 16 1 .hod.1x1.negScaler HMS 1X- paddle 1
variable 0 16 2 .hod.1x1.negScalerRate HMS 1X- paddle 1
+variable 1 11 1 .Empty_3.scaler Empty
+variable 1 11 2 .Empty_3.scalerRate Empty
variable 3 27 1 .Empty_21.scaler Empty
variable 3 27 2 .Empty_21.scalerRate Empty
variable 3 2 1 .hod.2y5.posScaler HMS 2Y+ paddle 5
@@ -218,6 +258,8 @@ variable 2 15 1 .hod.2x16.posScaler HMS 2X+ paddle 16
variable 2 15 2 .hod.2x16.posScalerRate HMS 2X+ paddle 16
variable 2 31 1 .hod.2x16.negScaler HMS 2X- paddle 16
variable 2 31 2 .hod.2x16.negScalerRate HMS 2X- paddle 16
+variable 5 23 1 .Empty_27.scaler Empty
+variable 5 23 2 .Empty_27.scalerRate Empty
variable 0 30 1 .hod.1x14.negScaler HMS 1X- paddle 14
variable 0 30 2 .hod.1x14.negScalerRate HMS 1X- paddle 14
variable 0 14 1 .hod.1x14.posScaler HMS 1X+ paddle 14
@@ -226,10 +268,10 @@ variable 2 4 1 .hod.2x2.posScaler HMS 2X+ paddle 2
variable 2 4 2 .hod.2x2.posScalerRate HMS 2X+ paddle 2
variable 2 20 1 .hod.2x2.negScaler HMS 2X- paddle 2
variable 2 20 2 .hod.2x2.negScalerRate HMS 2X- paddle 2
-variable 6 29 1 .BCM17.scaler bcm17
-variable 6 29 2 .BCM17.scalerRate bcm17
-variable 6 29 3 .BCM17.scalerCurrent bcm17
-variable 6 29 4 .BCM17.scalerCharge bcm17
+variable 6 29 1 .BCM17.scaler BCM17
+variable 6 29 2 .BCM17.scalerRate BCM17
+variable 6 29 3 .BCM17.scalerCurrent BCM17
+variable 6 29 4 .BCM17.scalerCharge BCM17
variable 5 10 1 .hTRIG1.scaler HMS TRIG1
variable 5 10 2 .hTRIG1.scalerRate HMS TRIG1
variable 1 23 1 .hod.1y8.negScaler HMS 1Y- paddle 8
@@ -298,10 +340,14 @@ variable 2 0 1 .hod.2x1.posScaler HMS 2X+ paddle 1
variable 2 0 2 .hod.2x1.posScalerRate HMS 2X+ paddle 1
variable 2 16 1 .hod.2x1.negScaler HMS 2X- paddle 1
variable 2 16 2 .hod.2x1.negScalerRate HMS 2X- paddle 1
+variable 6 14 1 .EDTM.scaler HMS EDTM
+variable 6 14 2 .EDTM.scalerRate HMS EDTM
variable 1 5 1 .hod.1y4.posScaler HMS 1Y+ paddle 4
variable 1 5 2 .hod.1y4.posScalerRate HMS 1Y+ paddle 4
variable 1 21 1 .hod.1y4.negScaler HMS 1Y- paddle 4
variable 1 21 2 .hod.1y4.negScalerRate HMS 1Y- paddle 4
+variable 5 17 1 .pEL_LO.scaler SHMS EL_LO
+variable 5 17 2 .pEL_LO.scalerRate SHMS EL_LO
variable 0 22 1 .hod.1x6.negScaler HMS 1X- paddle 6
variable 0 22 2 .hod.1x6.negScalerRate HMS 1X- paddle 6
variable 0 6 1 .hod.1x6.posScaler HMS 1X+ paddle 6
@@ -320,8 +366,10 @@ variable 2 18 1 .hod.2x5.negScaler HMS 2X- paddle 5
variable 2 18 2 .hod.2x5.negScalerRate HMS 2X- paddle 5
variable 2 2 1 .hod.2x5.posScaler HMS 2X+ paddle 5
variable 2 2 2 .hod.2x5.posScalerRate HMS 2X+ paddle 5
-variable 3 7 1 .hod.2y8.posScaler HMS 2Y+ paddle 8
-variable 3 7 2 .hod.2y8.posScalerRate HMS 2Y+ paddle 8
+variable 5 16 1 .pSTOF.scaler SHMS STOF
+variable 5 16 2 .pSTOF.scalerRate SHMS STOF
+variable 5 24 1 .hSTOF.scaler HMS STOF
+variable 5 24 2 .hSTOF.scalerRate HMS STOF
variable 6 8 1 .BSUM.scaler HMS BSUM
variable 6 8 2 .BSUM.scalerRate HMS BSUM
variable 0 1 1 .hod.1x3.posScaler HMS 1X+ paddle 3
@@ -344,3 +392,5 @@ variable 6 3 1 .S2Y.scaler HMS S2Y
variable 6 3 2 .S2Y.scalerRate HMS S2Y
variable 6 2 1 .S2X.scaler HMS S2X
variable 6 2 2 .S2X.scalerRate HMS S2X
+variable 6 6 1 .hTREF1.scaler HMS TREF1
+variable 6 6 2 .hTREF1.scalerRate HMS TREF1
diff --git a/MAPS/SCALERS/db_PScalevt.dat b/MAPS/SCALERS/db_PScalevt.dat
index 1ef53fabafaa6f23d9ba6997938fa496c0425812..6eeb1aa986bdf93698f4ea14dae14a3c50cdace4 100644
--- a/MAPS/SCALERS/db_PScalevt.dat
+++ b/MAPS/SCALERS/db_PScalevt.dat
@@ -6,12 +6,16 @@ map 3801 8 10 03000a20 ffffffff 13
map 3801 8 11 03200b20 ffffffff 13
map 3801 8 12 03400c20 ffffffff 13
map 3801 8 13 03600d20 ffffffff 13 31 1000000
+variable 6 24 1 .hSTOF.scaler HMS STOF
+variable 6 24 2 .hSTOF.scalerRate HMS STOF
variable 3 31 1 .hod.2y16.posScaler SHMS 2y+ paddle 16
variable 3 31 2 .hod.2y16.posScalerRate SHMS 2y+ paddle 16
variable 3 15 1 .hod.2y16.negScaler SHMS 2y- paddle 16
variable 3 15 2 .hod.2y16.negScalerRate SHMS 2y- paddle 16
-variable 7 6 1 .Trig.scaler SHMS T1
-variable 7 6 2 .Trig.scalerRate SHMS T1
+variable 6 28 1 .hEL_CLEAN.scaler HMS EL_CLEAN
+variable 6 28 2 .hEL_CLEAN.scalerRate HMS EL_CLEAN
+variable 7 10 1 .EDTM.scaler SHMS EDTM
+variable 7 10 2 .EDTM.scalerRate SHMS EDTM
variable 0 23 1 .hod.1x8.negScaler SHMS 1X- paddle 8
variable 0 23 2 .hod.1x8.negScalerRate SHMS 1X- paddle 8
variable 0 7 1 .hod.1x8.posScaler SHMS 1X+ paddle 8
@@ -22,26 +26,20 @@ variable 0 1 1 .hod.1x3.posScaler SHMS 1X+ paddle 3
variable 0 1 2 .hod.1x3.posScalerRate SHMS 1X+ paddle 3
variable 0 17 1 .hod.1x3.negScaler SHMS 1X- paddle 3
variable 0 17 2 .hod.1x3.negScalerRate SHMS 1X- paddle 3
-variable 7 21 1 .Empty_69.scaler Empty
-variable 7 21 2 .Empty_69.scalerRate Empty
-variable 7 20 1 .Empty_68.scaler Empty
-variable 7 20 2 .Empty_68.scalerRate Empty
-variable 7 17 1 .Empty_65.scaler Empty
-variable 7 17 2 .Empty_65.scalerRate Empty
-variable 7 16 1 .Empty_64.scaler Empty
-variable 7 16 2 .Empty_64.scalerRate Empty
-variable 7 19 1 .Empty_67.scaler Empty
-variable 7 19 2 .Empty_67.scalerRate Empty
+variable 7 23 1 .Empty_65.scaler Empty
+variable 7 23 2 .Empty_65.scalerRate Empty
+variable 7 22 1 .Empty_64.scaler Empty
+variable 7 22 2 .Empty_64.scalerRate Empty
variable 4 1 1 .hod.2y19.negScaler SHMS 2y- paddle 19
variable 4 1 2 .hod.2y19.negScalerRate SHMS 2y- paddle 19
-variable 7 13 1 .Empty_61.scaler Empty
-variable 7 13 2 .Empty_61.scalerRate Empty
+variable 7 19 1 .Empty_61.scaler Empty
+variable 7 19 2 .Empty_61.scalerRate Empty
variable 4 17 1 .hod.2y19.posScaler SHMS 2y+ paddle 19
variable 4 17 2 .hod.2y19.posScalerRate SHMS 2y+ paddle 19
-variable 7 15 1 .Empty_63.scaler Empty
-variable 7 15 2 .Empty_63.scalerRate Empty
-variable 7 14 1 .Empty_62.scaler Empty
-variable 7 14 2 .Empty_62.scalerRate Empty
+variable 7 21 1 .Empty_63.scaler Empty
+variable 7 21 2 .Empty_63.scalerRate Empty
+variable 7 20 1 .Empty_62.scaler Empty
+variable 7 20 2 .Empty_62.scalerRate Empty
variable 3 19 1 .hod.2y7.posScaler SHMS 2y+ paddle 7
variable 3 19 2 .hod.2y7.posScalerRate SHMS 2y+ paddle 7
variable 3 3 1 .hod.2y7.negScaler SHMS 2y- paddle 7
@@ -70,30 +68,28 @@ variable 2 8 1 .hod.2x9.posScaler SHMS 2X+ paddle 9
variable 2 8 2 .hod.2x9.posScalerRate SHMS 2X+ paddle 9
variable 2 24 1 .hod.2x9.negScaler SHMS 2X- paddle 9
variable 2 24 2 .hod.2x9.negScalerRate SHMS 2X- paddle 9
-variable 7 28 1 .BCM2.scaler bcm2
-variable 7 28 2 .BCM2.scalerRate bcm2
-variable 7 28 3 .BCM2.scalerCurrent bcm2
-variable 7 28 4 .BCM2.scalerCharge bcm2
-variable 4 9 1 .Empty_32.scaler Empty
-variable 4 9 2 .Empty_32.scalerRate Empty
-variable 4 10 1 .Empty_33.scaler Empty
-variable 4 10 2 .Empty_33.scalerRate Empty
-variable 4 7 1 .Empty_30.scaler Empty
-variable 4 7 2 .Empty_30.scalerRate Empty
-variable 4 8 1 .Empty_31.scaler Empty
-variable 4 8 2 .Empty_31.scalerRate Empty
-variable 4 13 1 .Empty_36.scaler Empty
-variable 4 13 2 .Empty_36.scalerRate Empty
-variable 4 14 1 .Empty_37.scaler Empty
-variable 4 14 2 .Empty_37.scalerRate Empty
-variable 4 12 1 .Empty_35.scaler Empty
-variable 4 12 2 .Empty_35.scalerRate Empty
+variable 7 28 1 .BCM2.scaler BCM2
+variable 7 28 2 .BCM2.scalerRate BCM2
+variable 7 28 3 .BCM2.scalerCurrent BCM2
+variable 7 28 4 .BCM2.scalerCharge BCM2
+variable 4 6 1 .Empty_33.scaler Empty
+variable 4 6 2 .Empty_33.scalerRate Empty
+variable 4 30 1 .Empty_30.scaler Empty
+variable 4 30 2 .Empty_30.scalerRate Empty
+variable 4 31 1 .Empty_31.scaler Empty
+variable 4 31 2 .Empty_31.scalerRate Empty
+variable 4 9 1 .Empty_36.scaler Empty
+variable 4 9 2 .Empty_36.scalerRate Empty
+variable 4 10 1 .Empty_37.scaler Empty
+variable 4 10 2 .Empty_37.scalerRate Empty
+variable 4 8 1 .Empty_35.scaler Empty
+variable 4 8 2 .Empty_35.scalerRate Empty
variable 3 27 1 .hod.2y15.posScaler SHMS 2y+ paddle 15
variable 3 27 2 .hod.2y15.posScalerRate SHMS 2y+ paddle 15
-variable 4 15 1 .Empty_38.scaler Empty
-variable 4 15 2 .Empty_38.scalerRate Empty
-variable 6 6 1 .Empty_39.scaler Empty
-variable 6 6 2 .Empty_39.scalerRate Empty
+variable 4 11 1 .Empty_38.scaler Empty
+variable 4 11 2 .Empty_38.scalerRate Empty
+variable 4 12 1 .Empty_39.scaler Empty
+variable 4 12 2 .Empty_39.scalerRate Empty
variable 3 11 1 .hod.2y15.negScaler SHMS 2y- paddle 15
variable 3 11 2 .hod.2y15.negScalerRate SHMS 2y- paddle 15
variable 1 10 1 .hod.1y13.negScaler SHMS 1Y- paddle 13
@@ -111,32 +107,34 @@ variable 0 3 2 .hod.1x7.posScalerRate SHMS 1X+ paddle 7
variable 7 31 1 .1Mhz.scaler 1MHz
variable 7 31 2 .1Mhz.scalerRate 1MHz
variable 7 31 5 .1Mhz.scalerTime 1MHz
-variable 0 11 1 .Empty.scaler Empty
-variable 0 11 2 .Empty.scalerRate Empty
+variable 6 6 1 .Empty.scaler Empty
+variable 6 6 2 .Empty.scalerRate Empty
variable 2 21 1 .hod.2x4.negScaler SHMS 2X- paddle 4
variable 2 21 2 .hod.2x4.negScalerRate SHMS 2X- paddle 4
variable 3 23 1 .hod.2y8.posScaler SHMS 2y+ paddle 8
variable 3 23 2 .hod.2y8.posScalerRate SHMS 2y+ paddle 8
variable 3 7 1 .hod.2y8.negScaler SHMS 2y- paddle 8
variable 3 7 2 .hod.2y8.negScalerRate SHMS 2y- paddle 8
-variable 7 25 1 .BCM4A.scaler bcm4a
-variable 7 25 2 .BCM4A.scalerRate bcm4a
-variable 7 25 3 .BCM4A.scalerCurrent bcm4a
-variable 7 25 4 .BCM4A.scalerCharge bcm4a
-variable 7 26 1 .BCM4B.scaler bcm4b
-variable 7 26 2 .BCM4B.scalerRate bcm4b
-variable 7 26 3 .BCM4B.scalerCurrent bcm4b
-variable 7 26 4 .BCM4B.scalerCharge bcm4b
+variable 7 25 1 .BCM4A.scaler BCM4a
+variable 7 25 2 .BCM4A.scalerRate BCM4a
+variable 7 25 3 .BCM4A.scalerCurrent BCM4a
+variable 7 25 4 .BCM4A.scalerCharge BCM4a
+variable 7 26 1 .BCM4B.scaler BCM4b
+variable 7 26 2 .BCM4B.scalerRate BCM4b
+variable 7 26 3 .BCM4B.scalerCurrent BCM4b
+variable 7 26 4 .BCM4B.scalerCharge BCM4b
variable 3 1 1 .hod.2y3.negScaler SHMS 2y- paddle 3
variable 3 1 2 .hod.2y3.negScalerRate SHMS 2y- paddle 3
variable 3 17 1 .hod.2y3.posScaler SHMS 2y+ paddle 3
variable 3 17 2 .hod.2y3.posScalerRate SHMS 2y+ paddle 3
-variable 0 15 1 .Empty_3.scaler Empty
-variable 0 15 2 .Empty_3.scalerRate Empty
+variable 6 8 1 .Empty_3.scaler Empty
+variable 6 8 2 .Empty_3.scalerRate Empty
+variable 3 9 1 .hod.2y11.negScaler SHMS 2y- paddle 11
+variable 3 9 2 .hod.2y11.negScalerRate SHMS 2y- paddle 11
variable 3 25 1 .hod.2y11.posScaler SHMS 2y+ paddle 11
variable 3 25 2 .hod.2y11.posScalerRate SHMS 2y+ paddle 11
-variable 1 27 1 .Empty_7.scaler Empty
-variable 1 27 2 .Empty_7.scalerRate Empty
+variable 0 15 1 .Empty_7.scaler Empty
+variable 0 15 2 .Empty_7.scalerRate Empty
variable 2 28 1 .hod.2x10.negScaler SHMS 2X- paddle 10
variable 2 28 2 .hod.2x10.negScalerRate SHMS 2X- paddle 10
variable 1 17 1 .hod.1y3.posScaler SHMS 1Y+ paddle 3
@@ -153,12 +151,12 @@ variable 0 24 1 .hod.1x9.negScaler SHMS 1X- paddle 9
variable 0 24 2 .hod.1x9.negScalerRate SHMS 1X- paddle 9
variable 4 4 1 .hod.2y18.negScaler SHMS 2y- paddle 18
variable 4 4 2 .hod.2y18.negScalerRate SHMS 2y- paddle 18
-variable 7 24 1 .Empty_72.scaler Empty
-variable 7 24 2 .Empty_72.scalerRate Empty
+variable 6 19 1 .pEL_REAL.scaler SHMS EL_REAL
+variable 6 19 2 .pEL_REAL.scalerRate SHMS EL_REAL
variable 4 20 1 .hod.2y18.posScaler SHMS 2y+ paddle 18
variable 4 20 2 .hod.2y18.posScalerRate SHMS 2y+ paddle 18
-variable 7 23 1 .Empty_71.scaler Empty
-variable 7 23 2 .Empty_71.scalerRate Empty
+variable 6 11 1 .hTRIG2.scaler HMS TRIG2
+variable 6 11 2 .hTRIG2.scalerRate HMS TRIG2
variable 7 3 1 .S2Y.scaler SHMS S2Y
variable 7 3 2 .S2Y.scalerRate SHMS S2Y
variable 7 2 1 .S2X.scaler SHMS S2X
@@ -167,24 +165,22 @@ variable 3 5 1 .hod.2y4.negScaler SHMS 2y- paddle 4
variable 3 5 2 .hod.2y4.negScalerRate SHMS 2y- paddle 4
variable 3 21 1 .hod.2y4.posScaler SHMS 2y+ paddle 4
variable 3 21 2 .hod.2y4.posScalerRate SHMS 2y+ paddle 4
-variable 7 18 1 .Empty_66.scaler Empty
-variable 7 18 2 .Empty_66.scalerRate Empty
-variable 7 12 1 .Empty_60.scaler Empty
-variable 7 12 2 .Empty_60.scalerRate Empty
+variable 7 24 1 .Empty_66.scaler Empty
+variable 7 24 2 .Empty_66.scalerRate Empty
+variable 7 18 1 .Empty_60.scaler Empty
+variable 7 18 2 .Empty_60.scalerRate Empty
variable 0 26 1 .hod.1x13.negScaler SHMS 1X- paddle 13
variable 0 26 2 .hod.1x13.negScalerRate SHMS 1X- paddle 13
variable 0 10 1 .hod.1x13.posScaler SHMS 1X+ paddle 13
variable 0 10 2 .hod.1x13.posScalerRate SHMS 1X+ paddle 13
variable 2 26 1 .hod.2x13.negScaler SHMS 2X- paddle 13
variable 2 26 2 .hod.2x13.negScalerRate SHMS 2X- paddle 13
-variable 6 27 1 .Empty_54.scaler Empty
-variable 6 27 2 .Empty_54.scalerRate Empty
-variable 7 10 1 .HOD_EDTM.scaler SHMS HODO EDTM
-variable 7 10 2 .HOD_EDTM.scalerRate SHMS HODO EDTM
+variable 7 12 1 .Empty_54.scaler Empty
+variable 7 12 2 .Empty_54.scalerRate Empty
variable 2 10 1 .hod.2x13.posScaler SHMS 2X+ paddle 13
variable 2 10 2 .hod.2x13.posScalerRate SHMS 2X+ paddle 13
-variable 6 25 1 .Empty_52.scaler Empty
-variable 6 25 2 .Empty_52.scalerRate Empty
+variable 6 31 1 .Empty_52.scaler Empty
+variable 6 31 2 .Empty_52.scalerRate Empty
variable 2 17 1 .hod.2x3.negScaler SHMS 2X- paddle 3
variable 2 17 2 .hod.2x3.negScalerRate SHMS 2X- paddle 3
variable 2 1 1 .hod.2x3.posScaler SHMS 2X+ paddle 3
@@ -211,34 +207,38 @@ variable 0 5 1 .hod.1x4.posScaler SHMS 1X+ paddle 4
variable 0 5 2 .hod.1x4.posScalerRate SHMS 1X+ paddle 4
variable 0 21 1 .hod.1x4.negScaler SHMS 1X- paddle 4
variable 0 21 2 .hod.1x4.negScalerRate SHMS 1X- paddle 4
+variable 6 20 1 .pEL_CLEAN.scaler SHMS EL_CLEAN
+variable 6 20 2 .pEL_CLEAN.scalerRate SHMS EL_CLEAN
variable 3 8 1 .hod.2y9.negScaler SHMS 2y- paddle 9
variable 3 8 2 .hod.2y9.negScalerRate SHMS 2y- paddle 9
variable 3 24 1 .hod.2y9.posScaler SHMS 2y+ paddle 9
variable 3 24 2 .hod.2y9.posScalerRate SHMS 2y+ paddle 9
+variable 7 6 1 .pTREF3.scaler SHMS TREF3
+variable 7 6 2 .pTREF3.scalerRate SHMS TREF3
variable 7 7 1 .AERO.scaler SHMS AERO
variable 7 7 2 .AERO.scalerRate SHMS AERO
variable 4 5 1 .hod.2y20.negScaler SHMS 2y- paddle 20
variable 4 5 2 .hod.2y20.negScalerRate SHMS 2y- paddle 20
variable 4 21 1 .hod.2y20.posScaler SHMS 2y+ paddle 20
variable 4 21 2 .hod.2y20.posScalerRate SHMS 2y+ paddle 20
-variable 0 14 1 .Empty_2.scaler Empty
-variable 0 14 2 .Empty_2.scalerRate Empty
+variable 6 7 1 .Empty_2.scaler Empty
+variable 6 7 2 .Empty_2.scalerRate Empty
variable 2 12 1 .hod.2x10.posScaler SHMS 2X+ paddle 10
variable 2 12 2 .hod.2x10.posScalerRate SHMS 2X+ paddle 10
-variable 7 27 1 .BCM1.scaler bcm1
-variable 7 27 2 .BCM1.scalerRate bcm1
-variable 7 27 3 .BCM1.scalerCurrent bcm1
-variable 7 27 4 .BCM1.scalerCharge bcm1
-variable 0 31 1 .Empty_6.scaler Empty
-variable 0 31 2 .Empty_6.scalerRate Empty
-variable 0 27 1 .Empty_4.scaler Empty
-variable 0 27 2 .Empty_4.scalerRate Empty
-variable 0 29 1 .Empty_5.scaler Empty
-variable 0 29 2 .Empty_5.scalerRate Empty
-variable 1 30 1 .Empty_8.scaler Empty
-variable 1 30 2 .Empty_8.scalerRate Empty
-variable 1 31 1 .Empty_9.scaler Empty
-variable 1 31 2 .Empty_9.scalerRate Empty
+variable 7 27 1 .BCM1.scaler BCM1
+variable 7 27 2 .BCM1.scalerRate BCM1
+variable 7 27 3 .BCM1.scalerCurrent BCM1
+variable 7 27 4 .BCM1.scalerCharge BCM1
+variable 0 14 1 .Empty_6.scaler Empty
+variable 0 14 2 .Empty_6.scalerRate Empty
+variable 6 9 1 .Empty_4.scaler Empty
+variable 6 9 2 .Empty_4.scalerRate Empty
+variable 0 11 1 .Empty_5.scaler Empty
+variable 0 11 2 .Empty_5.scalerRate Empty
+variable 0 27 1 .Empty_8.scaler Empty
+variable 0 27 2 .Empty_8.scalerRate Empty
+variable 0 29 1 .Empty_9.scaler Empty
+variable 0 29 2 .Empty_9.scalerRate Empty
variable 6 14 1 .hTRIG5.scaler HMS TRIG5
variable 6 14 2 .hTRIG5.scalerRate HMS TRIG5
variable 6 13 1 .hTRIG4.scaler HMS TRIG4
@@ -249,18 +249,16 @@ variable 6 10 1 .hTRIG1.scaler HMS TRIG1
variable 6 10 2 .hTRIG1.scalerRate HMS TRIG1
variable 6 12 1 .hTRIG3.scaler HMS TRIG3
variable 6 12 2 .hTRIG3.scalerRate HMS TRIG3
-variable 6 11 1 .hTRIG2.scaler HMS TRIG2
-variable 6 11 2 .hTRIG2.scalerRate HMS TRIG2
variable 3 12 1 .hod.2y10.negScaler SHMS 2y- paddle 10
variable 3 12 2 .hod.2y10.negScalerRate SHMS 2y- paddle 10
variable 3 28 1 .hod.2y10.posScaler SHMS 2y+ paddle 10
variable 3 28 2 .hod.2y10.posScalerRate SHMS 2y+ paddle 10
variable 2 23 1 .hod.2x8.negScaler SHMS 2X- paddle 8
variable 2 23 2 .hod.2x8.negScalerRate SHMS 2X- paddle 8
-variable 7 22 1 .Empty_70.scaler Empty
-variable 7 22 2 .Empty_70.scalerRate Empty
variable 2 3 1 .hod.2x7.posScaler SHMS 2X+ paddle 7
variable 2 3 2 .hod.2x7.posScalerRate SHMS 2X+ paddle 7
+variable 6 17 1 .pEL_LO.scaler SHMS EL_LO
+variable 6 17 2 .pEL_LO.scalerRate SHMS EL_LO
variable 2 19 1 .hod.2x7.negScaler SHMS 2X- paddle 7
variable 2 19 2 .hod.2x7.negScalerRate SHMS 2X- paddle 7
variable 7 30 1 .Unser.scaler Unser
@@ -273,10 +271,10 @@ variable 1 4 1 .hod.1y2.negScaler SHMS 1Y- paddle 2
variable 1 4 2 .hod.1y2.negScalerRate SHMS 1Y- paddle 2
variable 1 20 1 .hod.1y2.posScaler SHMS 1Y+ paddle 2
variable 1 20 2 .hod.1y2.posScalerRate SHMS 1Y+ paddle 2
-variable 7 29 1 .BCM17.scaler bcm17
-variable 7 29 2 .BCM17.scalerRate bcm17
-variable 7 29 3 .BCM17.scalerCurrent bcm17
-variable 7 29 4 .BCM17.scalerCharge bcm17
+variable 7 29 1 .BCM17.scaler BCM17
+variable 7 29 2 .BCM17.scalerRate BCM17
+variable 7 29 3 .BCM17.scalerCurrent BCM17
+variable 7 29 4 .BCM17.scalerCharge BCM17
variable 1 9 1 .hod.1y11.negScaler SHMS 1Y- paddle 11
variable 1 9 2 .hod.1y11.negScalerRate SHMS 1Y- paddle 11
variable 1 25 1 .hod.1y11.posScaler SHMS 1Y+ paddle 11
@@ -285,36 +283,38 @@ variable 1 18 1 .hod.1y5.posScaler SHMS 1Y+ paddle 5
variable 1 18 2 .hod.1y5.posScalerRate SHMS 1Y+ paddle 5
variable 1 2 1 .hod.1y5.negScaler SHMS 1Y- paddle 5
variable 1 2 2 .hod.1y5.negScalerRate SHMS 1Y- paddle 5
-variable 6 16 1 .Empty_43.scaler Empty
-variable 6 16 2 .Empty_43.scalerRate Empty
-variable 6 9 1 .Empty_42.scaler Empty
-variable 6 9 2 .Empty_42.scalerRate Empty
-variable 6 8 1 .Empty_41.scaler Empty
-variable 6 8 2 .Empty_41.scalerRate Empty
+variable 6 6 1 .Empty_43.scaler Empty
+variable 6 6 2 .Empty_43.scalerRate Empty
+variable 4 15 1 .Empty_42.scaler Empty
+variable 4 15 2 .Empty_42.scalerRate Empty
+variable 4 14 1 .Empty_41.scaler Empty
+variable 4 14 2 .Empty_41.scalerRate Empty
variable 0 0 1 .hod.1x1.posScaler SHMS 1X+ paddle 1
variable 0 0 2 .hod.1x1.posScalerRate SHMS 1X+ paddle 1
-variable 6 20 1 .Empty_47.scaler Empty
-variable 6 20 2 .Empty_47.scalerRate Empty
+variable 6 21 1 .Empty_47.scaler Empty
+variable 6 21 2 .Empty_47.scalerRate Empty
variable 0 16 1 .hod.1x1.negScaler SHMS 1X- paddle 1
variable 0 16 2 .hod.1x1.negScalerRate SHMS 1X- paddle 1
-variable 6 18 1 .Empty_45.scaler Empty
-variable 6 18 2 .Empty_45.scalerRate Empty
-variable 6 17 1 .Empty_44.scaler Empty
-variable 6 17 2 .Empty_44.scalerRate Empty
-variable 6 22 1 .Empty_49.scaler Empty
-variable 6 22 2 .Empty_49.scalerRate Empty
-variable 6 21 1 .Empty_48.scaler Empty
-variable 6 21 2 .Empty_48.scalerRate Empty
+variable 6 8 1 .Empty_45.scaler Empty
+variable 6 8 2 .Empty_45.scalerRate Empty
+variable 6 7 1 .Empty_44.scaler Empty
+variable 6 7 2 .Empty_44.scalerRate Empty
+variable 6 23 1 .Empty_49.scaler Empty
+variable 6 23 2 .Empty_49.scalerRate Empty
+variable 6 22 1 .Empty_48.scaler Empty
+variable 6 22 2 .Empty_48.scalerRate Empty
variable 6 4 1 .pTRIG5.scaler SHMS TRIG5
variable 6 4 2 .pTRIG5.scalerRate SHMS TRIG5
variable 6 3 1 .pTRIG4.scaler SHMS TRIG4
variable 6 3 2 .pTRIG4.scalerRate SHMS TRIG4
-variable 4 23 1 .Empty_19.scaler Empty
-variable 4 23 2 .Empty_19.scalerRate Empty
+variable 2 27 1 .Empty_19.scaler Empty
+variable 2 27 2 .Empty_19.scalerRate Empty
variable 0 13 1 .hod.1x12.posScaler SHMS 1X+ paddle 12
variable 0 13 2 .hod.1x12.posScalerRate SHMS 1X+ paddle 12
variable 0 30 1 .hod.1x12.negScaler SHMS 1X- paddle 12
variable 0 30 2 .hod.1x12.negScalerRate SHMS 1X- paddle 12
+variable 6 18 1 .pEL_HI.scaler SHMS EL_HI
+variable 6 18 2 .pEL_HI.scalerRate SHMS EL_HI
variable 3 18 1 .hod.2y5.posScaler SHMS 2y+ paddle 5
variable 3 18 2 .hod.2y5.posScalerRate SHMS 2y+ paddle 5
variable 3 2 1 .hod.2y5.negScaler SHMS 2y- paddle 5
@@ -327,10 +327,10 @@ variable 2 4 1 .hod.2x2.posScaler SHMS 2X+ paddle 2
variable 2 4 2 .hod.2x2.posScalerRate SHMS 2X+ paddle 2
variable 2 20 1 .hod.2x2.negScaler SHMS 2X- paddle 2
variable 2 20 2 .hod.2x2.negScalerRate SHMS 2X- paddle 2
-variable 6 7 1 .Empty_40.scaler Empty
-variable 6 7 2 .Empty_40.scalerRate Empty
-variable 6 19 1 .Empty_46.scaler Empty
-variable 6 19 2 .Empty_46.scalerRate Empty
+variable 4 13 1 .Empty_40.scaler Empty
+variable 4 13 2 .Empty_40.scalerRate Empty
+variable 6 9 1 .Empty_46.scaler Empty
+variable 6 9 2 .Empty_46.scalerRate Empty
variable 4 0 1 .hod.2y17.negScaler SHMS 2y- paddle 17
variable 4 0 2 .hod.2y17.negScalerRate SHMS 2y- paddle 17
variable 4 16 1 .hod.2y17.posScaler SHMS 2y+ paddle 17
@@ -341,8 +341,6 @@ variable 1 23 1 .hod.1y8.posScaler SHMS 1Y+ paddle 8
variable 1 23 2 .hod.1y8.posScalerRate SHMS 1Y+ paddle 8
variable 1 0 1 .hod.1y1.negScaler SHMS 1Y- paddle 1
variable 1 0 2 .hod.1y1.negScalerRate SHMS 1Y- paddle 1
-variable 3 9 1 .hod.2y11.negScaler SHMS 2y- paddle 11
-variable 3 9 2 .hod.2y11.negScalerRate SHMS 2y- paddle 11
variable 1 16 1 .hod.1y1.posScaler SHMS 1Y+ paddle 1
variable 1 16 2 .hod.1y1.posScalerRate SHMS 1Y+ paddle 1
variable 0 18 1 .hod.1x5.negScaler SHMS 1X- paddle 5
@@ -353,24 +351,24 @@ variable 0 4 1 .hod.1x2.posScaler SHMS 1X+ paddle 2
variable 0 4 2 .hod.1x2.posScalerRate SHMS 1X+ paddle 2
variable 0 20 1 .hod.1x2.negScaler SHMS 1X- paddle 2
variable 0 20 2 .hod.1x2.negScalerRate SHMS 1X- paddle 2
-variable 4 22 1 .Empty_18.scaler Empty
-variable 4 22 2 .Empty_18.scalerRate Empty
-variable 1 11 1 .Empty_10.scaler Empty
-variable 1 11 2 .Empty_10.scalerRate Empty
-variable 1 14 1 .Empty_11.scaler Empty
-variable 1 14 2 .Empty_11.scalerRate Empty
-variable 1 15 1 .Empty_12.scaler Empty
-variable 1 15 2 .Empty_12.scalerRate Empty
-variable 2 11 1 .Empty_13.scaler Empty
-variable 2 11 2 .Empty_13.scalerRate Empty
-variable 2 15 1 .Empty_14.scaler Empty
-variable 2 15 2 .Empty_14.scalerRate Empty
-variable 2 27 1 .Empty_15.scaler Empty
-variable 2 27 2 .Empty_15.scalerRate Empty
-variable 2 31 1 .Empty_16.scaler Empty
-variable 2 31 2 .Empty_16.scalerRate Empty
-variable 4 19 1 .Empty_17.scaler Empty
-variable 4 19 2 .Empty_17.scalerRate Empty
+variable 2 15 1 .Empty_18.scaler Empty
+variable 2 15 2 .Empty_18.scalerRate Empty
+variable 0 31 1 .Empty_10.scaler Empty
+variable 0 31 2 .Empty_10.scalerRate Empty
+variable 1 27 1 .Empty_11.scaler Empty
+variable 1 27 2 .Empty_11.scalerRate Empty
+variable 1 30 1 .Empty_12.scaler Empty
+variable 1 30 2 .Empty_12.scalerRate Empty
+variable 1 31 1 .Empty_13.scaler Empty
+variable 1 31 2 .Empty_13.scalerRate Empty
+variable 1 11 1 .Empty_14.scaler Empty
+variable 1 11 2 .Empty_14.scalerRate Empty
+variable 1 14 1 .Empty_15.scaler Empty
+variable 1 14 2 .Empty_15.scalerRate Empty
+variable 1 15 1 .Empty_16.scaler Empty
+variable 1 15 2 .Empty_16.scalerRate Empty
+variable 2 11 1 .Empty_17.scaler Empty
+variable 2 11 2 .Empty_17.scalerRate Empty
variable 3 22 1 .hod.2y6.posScaler SHMS 2y+ paddle 6
variable 3 22 2 .hod.2y6.posScalerRate SHMS 2y+ paddle 6
variable 3 6 1 .hod.2y6.negScaler SHMS 2y- paddle 6
@@ -401,28 +399,32 @@ variable 3 10 1 .hod.2y13.negScaler SHMS 2y- paddle 13
variable 3 10 2 .hod.2y13.negScalerRate SHMS 2y- paddle 13
variable 2 22 1 .hod.2x6.negScaler SHMS 2X- paddle 6
variable 2 22 2 .hod.2x6.negScalerRate SHMS 2X- paddle 6
+variable 6 16 1 .pSTOF.scaler SHMS STOF
+variable 6 16 2 .pSTOF.scalerRate SHMS STOF
variable 2 6 1 .hod.2x6.posScaler SHMS 2X+ paddle 6
variable 2 6 2 .hod.2x6.posScalerRate SHMS 2X+ paddle 6
-variable 4 25 1 .Empty_21.scaler Empty
-variable 4 25 2 .Empty_21.scalerRate Empty
-variable 4 24 1 .Empty_20.scaler Empty
-variable 4 24 2 .Empty_20.scalerRate Empty
-variable 4 27 1 .Empty_23.scaler Empty
-variable 4 27 2 .Empty_23.scalerRate Empty
-variable 4 26 1 .Empty_22.scaler Empty
-variable 4 26 2 .Empty_22.scalerRate Empty
-variable 4 29 1 .Empty_25.scaler Empty
-variable 4 29 2 .Empty_25.scalerRate Empty
-variable 4 28 1 .Empty_24.scaler Empty
-variable 4 28 2 .Empty_24.scalerRate Empty
-variable 4 31 1 .Empty_27.scaler Empty
-variable 4 31 2 .Empty_27.scalerRate Empty
-variable 4 30 1 .Empty_26.scaler Empty
-variable 4 30 2 .Empty_26.scalerRate Empty
-variable 4 6 1 .Empty_29.scaler Empty
-variable 4 6 2 .Empty_29.scalerRate Empty
-variable 4 3 1 .Empty_28.scaler Empty
-variable 4 3 2 .Empty_28.scalerRate Empty
+variable 6 26 1 .hEL_HI.scaler HMS EL_HI
+variable 6 26 2 .hEL_HI.scalerRate HMS EL_HI
+variable 4 19 1 .Empty_21.scaler Empty
+variable 4 19 2 .Empty_21.scalerRate Empty
+variable 2 31 1 .Empty_20.scaler Empty
+variable 2 31 2 .Empty_20.scalerRate Empty
+variable 4 23 1 .Empty_23.scaler Empty
+variable 4 23 2 .Empty_23.scalerRate Empty
+variable 4 22 1 .Empty_22.scaler Empty
+variable 4 22 2 .Empty_22.scalerRate Empty
+variable 4 25 1 .Empty_25.scaler Empty
+variable 4 25 2 .Empty_25.scalerRate Empty
+variable 4 24 1 .Empty_24.scaler Empty
+variable 4 24 2 .Empty_24.scalerRate Empty
+variable 4 27 1 .Empty_27.scaler Empty
+variable 4 27 2 .Empty_27.scalerRate Empty
+variable 4 26 1 .Empty_26.scaler Empty
+variable 4 26 2 .Empty_26.scalerRate Empty
+variable 4 29 1 .Empty_29.scaler Empty
+variable 4 29 2 .Empty_29.scalerRate Empty
+variable 4 28 1 .Empty_28.scaler Empty
+variable 4 28 2 .Empty_28.scalerRate Empty
variable 1 29 1 .hod.1y12.posScaler SHMS 1Y+ paddle 12
variable 1 29 2 .hod.1y12.posScalerRate SHMS 1Y+ paddle 12
variable 1 13 1 .hod.1y12.negScaler SHMS 1Y- paddle 12
@@ -433,32 +435,38 @@ variable 1 5 1 .hod.1y4.negScaler SHMS 1Y- paddle 4
variable 1 5 2 .hod.1y4.negScalerRate SHMS 1Y- paddle 4
variable 0 22 1 .hod.1x6.negScaler SHMS 1X- paddle 6
variable 0 22 2 .hod.1x6.negScalerRate SHMS 1X- paddle 6
-variable 6 28 1 .Empty_55.scaler Empty
-variable 6 28 2 .Empty_55.scalerRate Empty
-variable 6 29 1 .Empty_56.scaler Empty
-variable 6 29 2 .Empty_56.scalerRate Empty
-variable 6 30 1 .Empty_57.scaler Empty
-variable 6 30 2 .Empty_57.scalerRate Empty
-variable 6 23 1 .Empty_50.scaler Empty
-variable 6 23 2 .Empty_50.scalerRate Empty
-variable 6 24 1 .Empty_51.scaler Empty
-variable 6 24 2 .Empty_51.scalerRate Empty
+variable 7 13 1 .Empty_55.scaler Empty
+variable 7 13 2 .Empty_55.scalerRate Empty
+variable 7 14 1 .Empty_56.scaler Empty
+variable 7 14 2 .Empty_56.scalerRate Empty
+variable 7 15 1 .Empty_57.scaler Empty
+variable 7 15 2 .Empty_57.scalerRate Empty
+variable 6 29 1 .Empty_50.scaler Empty
+variable 6 29 2 .Empty_50.scalerRate Empty
+variable 6 30 1 .Empty_51.scaler Empty
+variable 6 30 2 .Empty_51.scalerRate Empty
variable 0 6 1 .hod.1x6.posScaler SHMS 1X+ paddle 6
variable 0 6 2 .hod.1x6.posScalerRate SHMS 1X+ paddle 6
-variable 6 26 1 .Empty_53.scaler Empty
-variable 6 26 2 .Empty_53.scalerRate Empty
-variable 6 31 1 .Empty_58.scaler Empty
-variable 6 31 2 .Empty_58.scalerRate Empty
-variable 7 11 1 .Empty_59.scaler Empty
-variable 7 11 2 .Empty_59.scalerRate Empty
+variable 7 11 1 .Empty_53.scaler Empty
+variable 7 11 2 .Empty_53.scalerRate Empty
+variable 7 16 1 .Empty_58.scaler Empty
+variable 7 16 2 .Empty_58.scalerRate Empty
+variable 7 17 1 .Empty_59.scaler Empty
+variable 7 17 2 .Empty_59.scalerRate Empty
variable 7 8 1 .HGC.scaler SHMS HGC
variable 7 8 2 .HGC.scalerRate SHMS HGC
variable 7 9 1 .NGC.scaler SHMS NGC
variable 7 9 2 .NGC.scalerRate SHMS NGC
+variable 4 3 1 .Empty_32.scaler Empty
+variable 4 3 2 .Empty_32.scalerRate Empty
+variable 6 27 1 .hEL_REAL.scaler HMS EL_REAL
+variable 6 27 2 .hEL_REAL.scalerRate HMS EL_REAL
+variable 6 25 1 .hEL_LO.scaler HMS EL_LO
+variable 6 25 2 .hEL_LO.scalerRate HMS EL_LO
variable 3 4 1 .hod.2y2.negScaler SHMS 2y- paddle 2
variable 3 4 2 .hod.2y2.negScalerRate SHMS 2y- paddle 2
-variable 4 11 1 .Empty_34.scaler Empty
-variable 4 11 2 .Empty_34.scalerRate Empty
+variable 4 7 1 .Empty_34.scaler Empty
+variable 4 7 2 .Empty_34.scalerRate Empty
variable 3 20 1 .hod.2y2.posScaler SHMS 2y+ paddle 2
variable 3 20 2 .hod.2y2.posScalerRate SHMS 2y+ paddle 2
variable 2 18 1 .hod.2x5.negScaler SHMS 2X- paddle 5
diff --git a/MAPS/SCALERS/scaler.map b/MAPS/SCALERS/scaler.map
index 37f517a0d66b26ef0e118f22f11d8ac5fff0f48c..cf63d61cc1ad1256d0f98c1ff35a26c458c0908c 100755
--- a/MAPS/SCALERS/scaler.map
+++ b/MAPS/SCALERS/scaler.map
@@ -14,32 +14,32 @@ DATE 4 1 2017
# Setup for Hall C testing HMS hodoscopes, etc.
-xscaler-tabs HMS 0:X1 1:Y1 2:X2 3:Y2 4:Trig 5:Triggers
+xscaler-tabs HMS 0:1X 1:1Y 2:2X 3:2Y 4:Trigger 5:Trigger
xscaler-layout HMS 0:8x4 1:8x4 2:8x4 3:8x4 4:8x4 5:8x4
xscaler-pageslot HMS 0:page0 1:page1 2:page2 3:page3 4:slot6 5:slot5
-xscaler-pagename HMS 0:'HMS Hodoscope X1'
-xscaler-pagename HMS 1:'HMS Hodoscope Y1'
-xscaler-pagename HMS 2:'HMS Hodoscope X2'
-xscaler-pagename HMS 3:'HMS Hodoscope Y2'
-xscaler-pagename HMS 4:'HMS Trigger,BCM and clock'
-xscaler-pagename HMS 5:'HMS Triggers'
+xscaler-pagename HMS 0:'HMS Hodoscope Plane 1X'
+xscaler-pagename HMS 1:'HMS Hodoscope Plane 1Y'
+xscaler-pagename HMS 2:'HMS Hodoscope Plane 2X'
+xscaler-pagename HMS 3:'HMS Hodoscope Plane 2Y'
+xscaler-pagename HMS 4:'HMS Trigger & Beamline'
+xscaler-pagename HMS 5:'HMS Trigger'
xscaler-clock HMS slot:7 chan:1 rate:60
#####################################################################
# Setup for Hall C testing SHMS hodoscopes, etc.
-xscaler-tabs SHMS 0:X1 1:Y1 2:X2 3:Y2 4:Trig 5:Triggers
+xscaler-tabs SHMS 0:1X 1:1Y 2:2X 3:2Y 4:Trigger 5:Trigger
xscaler-layout SHMS 0:8x4 1:8x4 2:8x4 3:8x4 4:8x4 5:8x4
xscaler-pageslot SHMS 0:page0 1:page1 2:page2 3:page3 4:slot7 5:slot6
-xscaler-pagename SHMS 0:'SHMS Hodoscope X1'
-xscaler-pagename SHMS 1:'SHMS Hodoscope Y1'
-xscaler-pagename SHMS 2:'SHMS Hodoscope X2'
-xscaler-pagename SHMS 3:'SHMS Hodoscope Y2'
-xscaler-pagename SHMS 4:'SHMS Trigger,BCM and clock'
-xscaler-pagename SHMS 5:'SHMS Triggers'
+xscaler-pagename SHMS 0:'SHMS Hodoscope Plane 1X'
+xscaler-pagename SHMS 1:'SHMS Hodoscope Plane 1Y'
+xscaler-pagename SHMS 2:'SHMS Hodoscope Plane 2X'
+xscaler-pagename SHMS 3:'SHMS Hodoscope Plane 2Y'
+xscaler-pagename SHMS 4:'SHMS Trigger & Beamline'
+xscaler-pagename SHMS 5:'SHMS Trigger'
xscaler-clock SHMS slot:8 chan:1 rate:60
#####################################################################
@@ -194,18 +194,39 @@ hhod2y10- 0 4 3 28 1 3 HMS 2Y- paddle 10
9/31 0 4 3 31 1 3 Empty
# desc hel crate slot start nchan page long-description
-hTRIG1 0 4 5 10 1 -1 HMS TRIG1
-hTRIG2 0 4 5 11 1 -1 HMS TRIG2
-hTRIG3 0 4 5 12 1 -1 HMS TRIG3
-hTRIG4 0 4 5 13 1 -1 HMS TRIG4
-hTRIG5 0 4 5 14 1 -1 HMS TRIG5
-hTRIG6 0 4 5 15 1 -1 HMS TRIG6
pTRIG1 0 4 5 0 1 -1 SHMS TRIG1
pTRIG2 0 4 5 1 1 -1 SHMS TRIG2
pTRIG3 0 4 5 2 1 -1 SHMS TRIG3
pTRIG4 0 4 5 3 1 -1 SHMS TRIG4
pTRIG5 0 4 5 4 1 -1 SHMS TRIG5
pTRIG6 0 4 5 5 1 -1 SHMS TRIG6
+12/6 0 5 6 6 1 -1 Empty
+12/7 0 5 6 7 1 -1 Empty
+12/8 0 5 6 8 1 -1 Empty
+12/9 0 5 6 9 1 -1 Empty
+hTRIG1 0 4 5 10 1 -1 HMS TRIG1
+hTRIG2 0 4 5 11 1 -1 HMS TRIG2
+hTRIG3 0 4 5 12 1 -1 HMS TRIG3
+hTRIG4 0 4 5 13 1 -1 HMS TRIG4
+hTRIG5 0 4 5 14 1 -1 HMS TRIG5
+hTRIG6 0 4 5 15 1 -1 HMS TRIG6
+pSTOF 0 4 5 16 1 -1 SHMS STOF
+pEL_LO 0 4 5 17 1 -1 SHMS EL_LO
+pEL_HI 0 4 5 18 1 -1 SHMS EL_HI
+pEL_REAL 0 4 5 19 1 -1 SHMS EL_REAL
+pEL_CLEAN 0 4 5 20 1 -1 SHMS EL_CLEAN
+12/21 0 4 5 21 1 -1 Empty
+12/22 0 4 5 22 1 -1 Empty
+12/23 0 4 5 23 1 -1 Empty
+hSTOF 0 4 5 24 1 -1 HMS STOF
+hEL_LO 0 4 5 25 1 -1 HMS EL_LO
+hEL_HI 0 4 5 26 1 -1 HMS EL_HI
+hEL_REAL 0 4 5 27 1 -1 HMS EL_REAL
+hEL_CLEAN 0 4 5 28 1 -1 HMS EL_CLEAN
+12/29 0 4 5 29 1 -1 Empty
+12/30 0 4 5 30 1 -1 Empty
+12/31 0 4 5 31 1 -1 Empty
+
# desc hel crate slot start nchan page long-description
S1X 0 4 6 0 1 -1 HMS S1X
@@ -214,7 +235,7 @@ S2X 0 4 6 2 1 -1 HMS S2X
S2Y 0 4 6 3 1 -1 HMS S2Y
S1XS1Y 0 4 6 4 1 -1 HMS S1T
S2XS2Y 0 4 6 5 1 -1 HMS S2T
-Trig 0 4 6 6 1 -1 HMS T1
+hTREF1 0 4 6 6 1 -1 HMS TREF1
ASUM 0 4 6 7 1 -1 HMS ASUM
BSUM 0 4 6 8 1 -1 HMS BSUM
CSUM 0 4 6 9 1 -1 HMS CSUM
@@ -222,13 +243,22 @@ DSUM 0 4 6 10 1 -1 HMS DSUM
PSHWRLO 0 4 6 11 1 -1 HMS PSHWRLO
PSHWRHI 0 4 6 12 1 -1 HMS PSHWRHI
SHWR 0 4 6 13 1 -1 HMS SHWR
-HOD_EDTM 0 4 6 14 1 -1 HMS HODO EDTM
+EDTM 0 4 6 14 1 -1 HMS EDTM
CERSUM 0 4 6 15 1 -1 HMS CERSUM
-BCM4A 0 4 6 25 1 -1 bcm4a
-BCM4B 0 4 6 26 1 -1 bcm4b
-BCM1 0 4 6 27 1 -1 bcm1
-BCM2 0 4 6 28 1 -1 bcm2
-BCM17 0 4 6 29 1 -1 bcm17
+21/16 0 4 6 16 1 -1 Empty
+21/17 0 4 6 17 1 -1 Empty
+21/18 0 4 6 18 1 -1 Empty
+21/19 0 4 6 19 1 -1 Empty
+21/20 0 4 6 20 1 -1 Empty
+21/21 0 4 6 21 1 -1 Empty
+21/22 0 4 6 22 1 -1 Empty
+21/23 0 4 6 23 1 -1 Empty
+21/24 0 4 6 24 1 -1 Empty
+BCM4A 0 4 6 25 1 -1 BCM4a
+BCM4B 0 4 6 26 1 -1 BCM4b
+BCM1 0 4 6 27 1 -1 BCM1
+BCM2 0 4 6 28 1 -1 BCM2
+BCM17 0 4 6 29 1 -1 BCM17
Unser 0 4 6 30 1 -1 Unser
1Mhz 0 4 6 31 1 -1 1MHz
@@ -432,29 +462,29 @@ pTRIG3 0 5 6 2 1 -1 SHMS TRIG3
pTRIG4 0 5 6 3 1 -1 SHMS TRIG4
pTRIG5 0 5 6 4 1 -1 SHMS TRIG5
pTRIG6 0 5 6 5 1 -1 SHMS TRIG6
+12/6 0 5 6 6 1 -1 Empty
+12/7 0 5 6 7 1 -1 Empty
+12/8 0 5 6 8 1 -1 Empty
+12/9 0 5 6 9 1 -1 Empty
hTRIG1 0 5 6 10 1 -1 HMS TRIG1
hTRIG2 0 5 6 11 1 -1 HMS TRIG2
hTRIG3 0 5 6 12 1 -1 HMS TRIG3
hTRIG4 0 5 6 13 1 -1 HMS TRIG4
hTRIG5 0 5 6 14 1 -1 HMS TRIG5
hTRIG6 0 5 6 15 1 -1 HMS TRIG6
-12/6 0 5 6 6 1 -1 Empty
-12/7 0 5 6 7 1 -1 Empty
-12/8 0 5 6 8 1 -1 Empty
-12/9 0 5 6 9 1 -1 Empty
-12/16 0 5 6 16 1 -1 Empty
-12/17 0 5 6 17 1 -1 Empty
-12/18 0 5 6 18 1 -1 Empty
-12/19 0 5 6 19 1 -1 Empty
-12/20 0 5 6 20 1 -1 Empty
+pSTOF 0 5 6 16 1 -1 SHMS STOF
+pEL_LO 0 5 6 17 1 -1 SHMS EL_LO
+pEL_HI 0 5 6 18 1 -1 SHMS EL_HI
+pEL_REAL 0 5 6 19 1 -1 SHMS EL_REAL
+pEL_CLEAN 0 5 6 20 1 -1 SHMS EL_CLEAN
12/21 0 5 6 21 1 -1 Empty
12/22 0 5 6 22 1 -1 Empty
12/23 0 5 6 23 1 -1 Empty
-12/24 0 5 6 24 1 -1 Empty
-12/25 0 5 6 25 1 -1 Empty
-12/26 0 5 6 26 1 -1 Empty
-12/27 0 5 6 27 1 -1 Empty
-12/28 0 5 6 28 1 -1 Empty
+hSTOF 0 5 6 24 1 -1 HMS STOF
+hEL_LO 0 5 6 25 1 -1 HMS EL_LO
+hEL_HI 0 5 6 26 1 -1 HMS EL_HI
+hEL_REAL 0 5 6 27 1 -1 HMS EL_REAL
+hEL_CLEAN 0 5 6 28 1 -1 HMS EL_CLEAN
12/29 0 5 6 29 1 -1 Empty
12/30 0 5 6 30 1 -1 Empty
12/31 0 5 6 31 1 -1 Empty
@@ -466,18 +496,11 @@ S2X 0 5 7 2 1 -1 SHMS S2X
S2Y 0 5 7 3 1 -1 SHMS S2Y
S1XS1Y 0 5 7 4 1 -1 SHMS S1T
S2XS2Y 0 5 7 5 1 -1 SHMS S2T
-Trig 0 5 7 6 1 -1 SHMS T1
+pTREF3 0 5 7 6 1 -1 SHMS TREF3
AERO 0 5 7 7 1 -1 SHMS AERO
HGC 0 5 7 8 1 -1 SHMS HGC
NGC 0 5 7 9 1 -1 SHMS NGC
-HOD_EDTM 0 5 7 10 1 -1 SHMS HODO EDTM
-BCM4A 0 5 7 25 1 -1 bcm4a
-BCM4B 0 5 7 26 1 -1 bcm4b
-BCM1 0 5 7 27 1 -1 bcm1
-BCM2 0 5 7 28 1 -1 bcm2
-BCM17 0 5 7 29 1 -1 bcm17
-Unser 0 5 7 30 1 -1 Unser
-1Mhz 0 5 7 31 1 -1 1MHz
+EDTM 0 5 7 10 1 -1 SHMS EDTM
13/11 0 5 7 11 1 -1 Empty
13/12 0 5 7 12 1 -1 Empty
13/13 0 5 7 13 1 -1 Empty
@@ -492,6 +515,13 @@ Unser 0 5 7 30 1 -1 Unser
13/22 0 5 7 22 1 -1 Empty
13/23 0 5 7 23 1 -1 Empty
13/24 0 5 7 24 1 -1 Empty
+BCM4A 0 5 7 25 1 -1 BCM4a
+BCM4B 0 5 7 26 1 -1 BCM4b
+BCM1 0 5 7 27 1 -1 BCM1
+BCM2 0 5 7 28 1 -1 BCM2
+BCM17 0 5 7 29 1 -1 BCM17
+Unser 0 5 7 30 1 -1 Unser
+1Mhz 0 5 7 31 1 -1 1MHz
# desc hel crate slot start nchan page long-description
clock 0 5 8 1 1 -1 clock
diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
index 9b04bb494687ca0392c09062fc10385b20e75a9d..5bbd52096f46df1faedbfd9a4929f8252058e612 100644
--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -33,7 +33,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
- 42, 2, 23, 1 ! pHODO_EDTM
+ 42, 2, 23, 1 ! pEDTM
48, 2, 24, 1 ! pTRIG1
49, 2, 25, 1 ! pTRIG2
50, 2, 26, 1 ! pTRIG3
@@ -46,6 +46,16 @@ REFINDEX=0
61, 2, 33, 1 ! hTRIG4
62, 2, 34, 1 ! hTRIG5
63, 2, 35, 1 ! hTRIG6
+ 64, 2, 36, 1 ! pSTOF
+ 65, 2, 37, 1 ! pEL_LO
+ 66, 2, 38, 1 ! pEL_HI
+ 67, 2, 39, 1 ! pEL_REAL
+ 68, 2, 40, 1 ! pEL_CLEAN
+ 72, 2, 41, 1 ! hSTOF
+ 73, 2, 42, 1 ! hEL_LO
+ 74, 2, 43, 1 ! hEL_HI
+ 75, 2, 44, 1 ! hEL_REAL
+ 76, 2, 45, 1 ! hEL_CLEAN
ROC=6
diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
index 4e9875b9a84574043fe0ff8126c7df925216973e..43eefd1add0737629542f5ca89d4dbb10ed3013b 100644
--- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
+++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
@@ -33,7 +33,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
- 42, 2, 23, 1 ! pHODO_EDTM
+ 42, 2, 23, 1 ! pEDTM
48, 2, 24, 1 ! pTRIG1
49, 2, 25, 1 ! pTRIG2
50, 2, 26, 1 ! pTRIG3
@@ -46,6 +46,16 @@ REFINDEX=0
61, 2, 33, 1 ! hTRIG4
62, 2, 34, 1 ! hTRIG5
63, 2, 35, 1 ! hTRIG6
+ 64, 2, 36, 1 ! pSTOF
+ 65, 2, 37, 1 ! pEL_LO
+ 66, 2, 38, 1 ! pEL_HI
+ 67, 2, 39, 1 ! pEL_REAL
+ 68, 2, 40, 1 ! pEL_CLEAN
+ 72, 2, 41, 1 ! hSTOF
+ 73, 2, 42, 1 ! hEL_LO
+ 74, 2, 43, 1 ! hEL_HI
+ 75, 2, 44, 1 ! hEL_REAL
+ 76, 2, 45, 1 ! hEL_CLEAN
ROC=6
diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
index 30885fa1ad72764f03b347f06bc7604f8c910e9d..49cbfb10351ec7d1680690232f713854561fabdb 100644
--- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
+++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
@@ -33,7 +33,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
- 42, 2, 23, 1 ! pHODO_EDTM
+ 42, 2, 23, 1 ! pEDTM
48, 2, 24, 1 ! pTRIG1
49, 2, 25, 1 ! pTRIG2
50, 2, 26, 1 ! pTRIG3
@@ -46,6 +46,16 @@ REFINDEX=0
61, 2, 33, 1 ! hTRIG4
62, 2, 34, 1 ! hTRIG5
63, 2, 35, 1 ! hTRIG6
+ 64, 2, 36, 1 ! pSTOF
+ 65, 2, 37, 1 ! pEL_LO
+ 66, 2, 38, 1 ! pEL_HI
+ 67, 2, 39, 1 ! pEL_REAL
+ 68, 2, 40, 1 ! pEL_CLEAN
+ 72, 2, 41, 1 ! hSTOF
+ 73, 2, 42, 1 ! hEL_LO
+ 74, 2, 43, 1 ! hEL_HI
+ 75, 2, 44, 1 ! hEL_REAL
+ 76, 2, 45, 1 ! hEL_CLEAN
ROC=6
diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
index 4e7ad55f7a32926b1f9c137314fdd783734cdc90..00e3409cd70a650d03a78304fad8dce7ae67d812 100644
--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -33,7 +33,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
- 42, 2, 23, 1 ! pHODO_EDTM
+ 42, 2, 23, 1 ! pEDTM
48, 2, 24, 1 ! pTRIG1
49, 2, 25, 1 ! pTRIG2
50, 2, 26, 1 ! pTRIG3
@@ -46,6 +46,16 @@ REFINDEX=0
61, 2, 33, 1 ! hTRIG4
62, 2, 34, 1 ! hTRIG5
63, 2, 35, 1 ! hTRIG6
+ 64, 2, 36, 1 ! pSTOF
+ 65, 2, 37, 1 ! pEL_LO
+ 66, 2, 38, 1 ! pEL_HI
+ 67, 2, 39, 1 ! pEL_REAL
+ 68, 2, 40, 1 ! pEL_CLEAN
+ 72, 2, 41, 1 ! hSTOF
+ 73, 2, 42, 1 ! hEL_LO
+ 74, 2, 43, 1 ! hEL_HI
+ 75, 2, 44, 1 ! hEL_REAL
+ 76, 2, 45, 1 ! hEL_CLEAN
ROC=6
diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
index 2bd18dd5beb17c67a1a4efc0a5cee40aaa824b08..c39b99765c60b22040c06aca07cc45ae644cde19 100644
--- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
@@ -33,7 +33,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
- 42, 2, 23, 1 ! pHODO_EDTM
+ 42, 2, 23, 1 ! pEDTM
48, 2, 24, 1 ! pTRIG1
49, 2, 25, 1 ! pTRIG2
50, 2, 26, 1 ! pTRIG3
@@ -46,6 +46,16 @@ REFINDEX=0
61, 2, 33, 1 ! hTRIG4
62, 2, 34, 1 ! hTRIG5
63, 2, 35, 1 ! hTRIG6
+ 64, 2, 36, 1 ! pSTOF
+ 65, 2, 37, 1 ! pEL_LO
+ 66, 2, 38, 1 ! pEL_HI
+ 67, 2, 39, 1 ! pEL_REAL
+ 68, 2, 40, 1 ! pEL_CLEAN
+ 72, 2, 41, 1 ! hSTOF
+ 73, 2, 42, 1 ! hEL_LO
+ 74, 2, 43, 1 ! hEL_HI
+ 75, 2, 44, 1 ! hEL_REAL
+ 76, 2, 45, 1 ! hEL_CLEAN
ROC=6
diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
index 7b12dd93bff399d05351ba2d5d148f098ee3861a..6ba7c4a2bed9ab19f862fb8f5028a0d11793a75b 100644
--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -33,7 +33,7 @@ REFINDEX=0
39, 2, 10, 1 ! pAERSUM
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
- 42, 2, 23, 1 ! pHODO_EDTM
+ 42, 2, 23, 1 ! pEDTM
48, 2, 24, 1 ! pTRIG1
49, 2, 25, 1 ! pTRIG2
50, 2, 26, 1 ! pTRIG3
@@ -46,6 +46,16 @@ REFINDEX=0
61, 2, 33, 1 ! hTRIG4
62, 2, 34, 1 ! hTRIG5
63, 2, 35, 1 ! hTRIG6
+ 64, 2, 36, 1 ! pSTOF
+ 65, 2, 37, 1 ! pEL_LO
+ 66, 2, 38, 1 ! pEL_HI
+ 67, 2, 39, 1 ! pEL_REAL
+ 68, 2, 40, 1 ! pEL_CLEAN
+ 72, 2, 41, 1 ! hSTOF
+ 73, 2, 42, 1 ! hEL_LO
+ 74, 2, 43, 1 ! hEL_HI
+ 75, 2, 44, 1 ! hEL_REAL
+ 76, 2, 45, 1 ! hEL_CLEAN
ROC=6
diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map
index 6315686c65682e2e6bb43cfdcbe86f9f2a4743cf..1c9d4e544114441f70f9905d3f6d046bca99b0d3 100644
--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -31,7 +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
+ 42, 2, 23, 1 ! pEDTM
48, 2, 24, 1 ! pTRIG1
49, 2, 25, 1 ! pTRIG2
50, 2, 26, 1 ! pTRIG3
@@ -44,6 +44,16 @@ REFINDEX=0
61, 2, 33, 1 ! hTRIG4
62, 2, 34, 1 ! hTRIG5
63, 2, 35, 1 ! hTRIG6
+ 64, 2, 36, 1 ! pSTOF
+ 65, 2, 37, 1 ! pEL_LO
+ 66, 2, 38, 1 ! pEL_HI
+ 67, 2, 39, 1 ! pEL_REAL
+ 68, 2, 40, 1 ! pEL_CLEAN
+ 72, 2, 41, 1 ! hSTOF
+ 73, 2, 42, 1 ! hEL_LO
+ 74, 2, 43, 1 ! hEL_HI
+ 75, 2, 44, 1 ! hEL_REAL
+ 76, 2, 45, 1 ! hEL_CLEAN
ROC=6
diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param
index db5e597a12cfe097a3476b7210f0de92b4c4ea2e..1a0c3cc24a49d41536e5bc8c716f581ad9ebab30 100644
--- a/PARAM/TRIG/tcoin.param
+++ b/PARAM/TRIG/tcoin.param
@@ -1,5 +1,5 @@
t_coin_numAdc = 13
-t_coin_numTdc = 68
+t_coin_numTdc = 88
t_coin_tdcoffset = 300.
t_coin_adc_tdc_offset = 200.
t_coin_tdcchanperns = 0.1
@@ -7,5 +7,5 @@ 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 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
-t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hHODO_EDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hhTRIG1 hhTRIG2 hhTRIG3 hhTRIG4 hhTRIG5 hhTRIG6 hpTRIG1 hpTRIG2 hpTRIG3 hpTRIG4 hpTRIG5 hpTRIG6 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pHODO_EDTM ppTRIG1 ppTRIG2 ppTRIG3 ppTRIG4 ppTRIG5 ppTRIG6 phTRIG1 phTRIG2 phTRIG3 phTRIG4 phTRIG5 phTRIG6"
+; 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
+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 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_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_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 5b79a4a28ed0a8647ca9fdffbb4f67972248e213..cbf9b72ca24018469debf3b17e30eb4cfdcf5d57 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -1,5 +1,5 @@
t_hms_numAdc = 9
-t_hms_numTdc = 33
+t_hms_numTdc = 43
t_hms_tdcoffset=300.
t_hms_adc_tdc_offset=300.
t_hms_tdcchanperns=0.1
@@ -7,5 +7,5 @@ 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 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
-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 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6"
\ 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
+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 pEL_HI pEL_REAL pEL_CLEAN hSTOF 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 ed99aa7cdc6769224a2fb2749b3a0e35d5d7fe67..f39ab53127e41e98eb7e5a2ebba29686740c76be 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,5 +1,5 @@
t_shms_numAdc = 4
-t_shms_numTdc = 35
+t_shms_numTdc = 45
t_shms_tdcoffset = 300.
t_shms_adc_tdc_offset = 200.
@@ -8,5 +8,5 @@ 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 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
-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 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6"
+; 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_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 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO hEL_HI hEL_REAL hEL_CLEAN"
diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_coin.C b/SCRIPTS/COIN/PRODUCTION/replay_production_coin.C
index 5e1346b5c2970fdff80d47f43871e93dac860a37..6a5e030d93bec6b1979ce295881f70ac7cff143c 100644
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_coin.C
+++ b/SCRIPTS/COIN/PRODUCTION/replay_production_coin.C
@@ -84,7 +84,7 @@ void replay_production_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// gHaPhysics->Add(pkin_secondary);
// Add event handler for scaler events
THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event type 1");
- pscaler->AddEvtType(1);
+ pscaler->AddEvtType(129);
pscaler->SetUseFirstEvent(kTRUE);
gHaEvtHandlers->Add(pscaler);
@@ -125,7 +125,7 @@ void replay_production_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
gHaPhysics->Add(hkin_secondary);
// Add event handler for scaler events
THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 4");
- hscaler->AddEvtType(4);
+ hscaler->AddEvtType(129);
hscaler->SetUseFirstEvent(kTRUE);
gHaEvtHandlers->Add(hscaler);
diff --git a/TEMPLATES/HMS/SCALERS/hscalers.template b/TEMPLATES/HMS/SCALERS/hscalers.template
index 448970550c2d4e04627e34548a67bc39fd684dac..8b1096a72acdc18e51db5fb15a42d624189da0c7 100644
--- a/TEMPLATES/HMS/SCALERS/hscalers.template
+++ b/TEMPLATES/HMS/SCALERS/hscalers.template
@@ -46,34 +46,34 @@ Ps6_factor = {floor(2**(ghconfig_ti_ps[5] - 1) + 1):%d}
* Triggers
***********
-HMS Triggers : {H.Trig.scaler}
-Estimated HMS Triggers : {H.Trig.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
-HMS Trigger Rate : {H.Trig.scalerRate/1000.:%.3f} kHz
+HMS Triggers : {H.hTREF1.scaler}
+Estimated HMS Triggers : {H.hTREF1.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
+HMS Trigger Rate : {H.hTREF1.scalerRate/1000.:%.3f} kHz
Accepted HMS Triggers : {triggers_accepted.npassed}
HMS Event Types : {hms_trigs.npassed}
-HMS Computer Live Time : {(hms_trigs.npassed / H.Trig.scaler)*100.0:%3.4f} %
-HMS Computer Dead Time : {100.0 - (hms_trigs.npassed / H.Trig.scaler)*100.0:%3.4f} %
+HMS Computer Live Time : {(hms_trigs.npassed / H.hTREF1.scaler)*100.0:%3.4f} %
+HMS Computer Dead Time : {100.0 - (hms_trigs.npassed / H.hTREF1.scaler)*100.0:%3.4f} %
*******
* EDTM
*******
-EDTM Triggers : {H.HOD_EDTM.scaler}
-Estimated EDTM Triggers : {H.HOD_EDTM.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
-EDTM Trigger Rate : {H.HOD_EDTM.scalerRate/1000.:%.3f} kHz
+EDTM Triggers : {H.EDTM.scaler}
+Estimated EDTM Triggers : {H.EDTM.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
+EDTM Trigger Rate : {H.EDTM.scalerRate/1000.:%.3f} kHz
Accepted EDTM Triggers : {edtm_accepted.npassed}
-Total Live Time (EDTM) : {(edtm_accepted.npassed / H.HOD_EDTM.scaler)*100.0:%3.4f} %
-Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / H.HOD_EDTM.scaler)*100.0:%3.4f} %
+Total Live Time (EDTM) : {(edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
+Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
*******************
* Physics Triggers
*******************
-Physics Triggers : {H.Trig.scaler - H.HOD_EDTM.scaler}
-Estimated Physics Triggers : {(H.Trig.scalerRate - H.HOD_EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
-Physics Trigger Rate : {(H.Trig.scalerRate - H.HOD_EDTM.scalerRate)/1000.:%.3f} kHz
+Physics Triggers : {H.hTREF1.scaler - H.EDTM.scaler}
+Estimated Physics Triggers : {(H.hTREF1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
+Physics Trigger Rate : {(H.hTREF1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
Accepted Physics Triggers : {physics_accepted.npassed}
*******************
diff --git a/TEMPLATES/SHMS/SCALERS/pscalers.template b/TEMPLATES/SHMS/SCALERS/pscalers.template
index 454ea0c950d51282714594b70ef299127d48412a..5a2ff7a37cd641b01402854ca50b25d1b3c10635 100644
--- a/TEMPLATES/SHMS/SCALERS/pscalers.template
+++ b/TEMPLATES/SHMS/SCALERS/pscalers.template
@@ -47,34 +47,34 @@ Ps6_factor = {floor(2**(gpconfig_ti_ps[5] - 1) + 1):%d}
* Triggers
***********
-SHMS Triggers : {P.Trig.scaler}
-Estimated SHMS Triggers : {P.Trig.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
-SHMS Trigger Rate : {P.Trig.scalerRate/1000.:%.3f} kHz
+SHMS Triggers : {P.pTREF3.scaler}
+Estimated SHMS Triggers : {P.pTREF3.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
+SHMS Trigger Rate : {P.pTREF3.scalerRate/1000.:%.3f} kHz
Accepted SHMS Triggers : {triggers_accepted.npassed}
SHMS Event Types : {shms_trigs.npassed}
-SHMS Computer Live Time : {(shms_trigs.npassed / P.Trig.scaler)*100.0:%3.4f} %
-SHMS Computer Dead Time : {100.0 - (shms_trigs.npassed / P.Trig.scaler)*100.0:%3.4f} %
+SHMS Computer Live Time : {(shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.4f} %
+SHMS Computer Dead Time : {100.0 - (shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.4f} %
*******
* EDTM
*******
-EDTM Triggers : {P.HOD_EDTM.scaler}
-Estimated EDTM Triggers : {P.HOD_EDTM.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
-EDTM Trigger Rate : {P.HOD_EDTM.scalerRate/1000.:%.3f} kHz
+EDTM Triggers : {P.EDTM.scaler}
+Estimated EDTM Triggers : {P.EDTM.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
+EDTM Trigger Rate : {P.EDTM.scalerRate/1000.:%.3f} kHz
Accepted EDTM Triggers : {edtm_accepted.npassed}
-Total Live Time (EDTM) : {(edtm_accepted.npassed / P.HOD_EDTM.scaler)*100.0:%3.4f} %
-Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / P.HOD_EDTM.scaler)*100.0:%3.4f} %
+Total Live Time (EDTM) : {(edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
+Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
*******************
* Physics Triggers
*******************
-Physics Triggers : {P.Trig.scaler - P.HOD_EDTM.scaler}
-Estimated Physics Triggers : {(P.Trig.scalerRate - P.HOD_EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
-Physics Trigger Rate : {(P.Trig.scalerRate - P.HOD_EDTM.scalerRate)/1000.:%.3f} kHz
+Physics Triggers : {P.pTREF3.scaler - P.EDTM.scaler}
+Estimated Physics Triggers : {(P.pTREF3.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
+Physics Trigger Rate : {(P.pTREF3.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
Accepted Physics Triggers : {physics_accepted.npassed}
*******************