From 6ec47bb8488dc965bfe92dac799545d5133583c8 Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Thu, 11 Jan 2018 16:07:39 -0500
Subject: [PATCH] Og dead time maps (#356)
* Include 6-GeV era dead time channels
* Update scaler maps
* Update SHMS maps
* Update HMS maps
* Update coincidence maps
* Fix typo
---
MAPS/COIN/DETEC/TRIG/cointrig.map | 236 ++++++++++++++-----------
MAPS/COIN/DETEC/coin.map | 70 +++++---
MAPS/HMS/DETEC/AERO/haero_htrig.map | 8 +
MAPS/HMS/DETEC/CAL/hcal_htrig.map | 8 +
MAPS/HMS/DETEC/CER/hcer_htrig.map | 8 +
MAPS/HMS/DETEC/DC/hdc_htrig.map | 8 +
MAPS/HMS/DETEC/HODO/hhodo_htrig.map | 8 +
MAPS/HMS/DETEC/STACK/hms_stack.map | 8 +
MAPS/HMS/DETEC/TRIG/htrig.map | 122 +++++++------
MAPS/SCALERS/db_HScalevt.dat | 108 +++++++----
MAPS/SCALERS/db_PScalevt.dat | 136 ++++++++------
MAPS/SCALERS/scaler.map | 50 +++++-
MAPS/SHMS/DETEC/AERO/paero_ptrig.map | 12 +-
MAPS/SHMS/DETEC/CAL/pcal_ptrig.map | 12 +-
MAPS/SHMS/DETEC/DC/pdc_ptrig.map | 12 +-
MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map | 12 +-
MAPS/SHMS/DETEC/HODO/phodo_ptrig.map | 12 +-
MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map | 12 +-
MAPS/SHMS/DETEC/STACK/shms_stack.map | 12 +-
MAPS/SHMS/DETEC/TRIG/ptrig.map | 119 ++++++++-----
PARAM/TRIG/tcoin.param | 6 +-
PARAM/TRIG/thms.param | 6 +-
PARAM/TRIG/tshms.param | 6 +-
23 files changed, 639 insertions(+), 352 deletions(-)
diff --git a/MAPS/COIN/DETEC/TRIG/cointrig.map b/MAPS/COIN/DETEC/TRIG/cointrig.map
index e3c99fc5..6e26b424 100644
--- a/MAPS/COIN/DETEC/TRIG/cointrig.map
+++ b/MAPS/COIN/DETEC/TRIG/cointrig.map
@@ -8,82 +8,91 @@ DETECTOR=30
ROC=1
-!F250 module
+! F250 module
SLOT=17
REFINDEX=3
! chan plane bar sig
- 8, 1, 1, 0! hASUM
- 9, 1, 2, 0! hBSUM
- 10, 1, 3, 0! hCSUM
- 11, 1, 4, 0! hDSUM
- 12, 1, 5, 0! hPSHWR
- 13, 1, 6, 0! hSHWR
- 14, 1, 7, 0! hAERSUM
- 15, 1, 8, 0! hCERSUM
-
+ 8, 1, 1, 0 ! hASUM
+ 9, 1, 2, 0 ! hBSUM
+ 10, 1, 3, 0 ! hCSUM
+ 11, 1, 4, 0 ! hDSUM
+ 12, 1, 5, 0 ! hPSHWR
+ 13, 1, 6, 0 ! hSHWR
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
+
+! F250 module
SLOT=18
REFINDEX=3
! chan plane bar sig
- 11, 1000, 0, 3! hFADC_TREF_ROC1
- 11, 1, 9, 0! hFADC_TREF_ROC1
+ 11, 1000, 0, 3 ! hFADC_TREF_ROC1
+ 11, 1, 9, 0 ! hFADC_TREF_ROC1
-!CAEN1190 module
+! CAEN1190 module
SLOT=2
REFINDEX=0
! A0
! chan plane bar sig
- 0, 2, 1, 1! h1X
- 1, 2, 2, 1! h1Y
- 2, 2, 3, 1! h2X
- 3, 2, 4, 1! h2Y
- 4, 2, 5, 1! h1T
- 5, 2, 6, 1! h2T
- 6, 1000, 0, 0! hTref1
- 6, 2, 7, 1! hT1
- 7, 2, 8, 1! hASUM
- 8, 2, 9, 1! hBSUM
- 9, 2, 10, 1! hCSUM
- 10, 2, 11, 1! hDSUM
- 11, 2, 12, 1! hPSHWRLO
- 12, 2, 13, 1! hPSHWRHI
- 13, 2, 14, 1! hSHWR
- 14, 2, 15, 1! hEDTM
- 15, 2, 16, 1! hCERSUM
+ 0, 2, 1, 1 ! h1X
+ 1, 2, 2, 1 ! h1Y
+ 2, 2, 3, 1 ! h2X
+ 3, 2, 4, 1 ! h2Y
+ 4, 2, 5, 1 ! h1T
+ 5, 2, 6, 1 ! h2T
+ 6, 1000, 0, 0 ! hTref1
+ 6, 2, 7, 1 ! hT1
+ 7, 2, 8, 1 ! hASUM
+ 8, 2, 9, 1 ! hBSUM
+ 9, 2, 10, 1 ! hCSUM
+ 10, 2, 11, 1 ! hDSUM
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
+ 13, 2, 14, 1 ! hSHWR
+ 14, 2, 15, 1 ! hEDTM
+ 15, 2, 16, 1 ! hCER
! A1
- 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
+ 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, 81, 1! pSTOF_ROC1
- 49, 2, 82, 1! pEL_LO_LO_ROC1
- 50, 2, 83, 1! pEL_LO_ROC1
- 51, 2, 84, 1! pEL_HI_ROC1
- 52, 2, 85, 1! pEL_REAL_ROC1
- 53, 2, 86, 1! pEL_CLEAN_ROC1
- 56, 2, 87, 1! hSTOF_ROC1
- 57, 2, 88, 1! hEL_LO_LO_ROC1
- 58, 2, 89, 1! hEL_LO_ROC1
- 59, 2, 90, 1! hEL_HI_ROC1
- 60, 2, 91, 1! hEL_REAL_ROC1
- 61, 2, 92, 1! hEL_CLEAN_ROC1
-
+ 48, 2, 83, 1 ! pSTOF_ROC1
+ 49, 2, 84, 1 ! pEL_LO_LO_ROC1
+ 50, 2, 85, 1 ! pEL_LO_ROC1
+ 51, 2, 86, 1 ! pEL_HI_ROC1
+ 52, 2, 87, 1 ! pEL_REAL_ROC1
+ 53, 2, 88, 1 ! pEL_CLEAN_ROC1
+ 56, 2, 89, 1 ! hSTOF_ROC1
+ 57, 2, 90, 1 ! hEL_LO_LO_ROC1
+ 58, 2, 91, 1 ! hEL_LO_ROC1
+ 59, 2, 92, 1 ! hEL_HI_ROC1
+ 60, 2, 93, 1 ! hEL_REAL_ROC1
+ 61, 2, 94, 1 ! hEL_CLEAN_ROC1
+! C0
+ 64, 2, 95, 1 ! pPRE40_ROC1
+ 65, 2, 96, 1 ! pPRE100_ROC1
+ 66, 2, 97, 1 ! pPRE150_ROC1
+ 67, 2, 98, 1 ! pPRE200_ROC1
+ 72, 2, 99, 1 ! hPRE40_ROC1
+ 73, 2, 100, 1 ! hPRE100_ROC1
+ 74, 2, 101, 1 ! hPRE150_ROC1
+ 75, 2, 102, 1 ! hPRE200_ROC1
!CAEN1190 module
SLOT=20
! D1
! chan plane bar sig
REFINDEX=1
- 127, 1000, 0, 1! hTref2
- 127, 2, 17, 1! hT2
+ 127, 1000, 0, 1 ! hTref2
+ 127, 2, 17, 1 ! hT2
ROC=3
@@ -105,59 +114,80 @@ SLOT=13
ROC=2
+! F250 module
SLOT=14
REFINDEX=3
- 0, 1, 10, 0 ! pAERSUM
- 1, 1, 11, 0 ! pHGCERSUM
- 2, 1, 12, 0 ! pNGCERSUM
- 11, 1, 13, 0 ! pFADC_TREF_ROC2
-
+! chan plane bar sig
+ 0, 1, 10, 0 ! pAER
+ 1, 1, 11, 0 ! pHGCER
+ 2, 1, 12, 0 ! pNGCER
+ 3, 1, 12, 0 ! pNGCER
+ 4, 1, 13, 0 ! pPSHWR
+ 11, 1, 14, 0 ! pFADC_TREF_ROC2
+
+! F250 module
SLOT=20
REFINDEX=1
- 15, 1000, 0, 1 ! pTRef1
- 15, 2, 34, 1 ! pT1
+! chan plane bar sig
+ 15, 1000, 0, 1 ! pTRef1
+ 15, 2, 34, 1 ! pT1
+! CAEN1190 module
SLOT=19
REFINDEX=0
- 31, 1000, 0, 0 ! pTRef2
- 31, 2, 35, 1 ! pT2
- 32, 2, 36, 1 ! p1X
- 33, 2, 37, 1 ! p1Y
- 34, 2, 38, 1 ! p2X
- 35, 2, 39, 1 ! p2Y
- 36, 2, 40, 1 ! p1T
- 37, 2, 41, 1 ! p2T
- 38, 2, 42, 1 ! pT3
- 39, 2, 43, 1 ! pAERSUM
- 40, 2, 44, 1 ! pHGCERSUM
- 41, 2, 45, 1 ! pNGCERSUM
- 42, 2, 56, 1 ! pEDTM
- 43, 2, 57, 1 ! pPRSHWRLO
- 44, 2, 58, 1 ! pPRSHWRHI
- 48, 2, 59, 1 ! pTRIG1_ROC2
- 49, 2, 60, 1 ! pTRIG2_ROC2
- 50, 2, 61, 1 ! pTRIG3_ROC2
- 51, 2, 62, 1 ! pTRIG4_ROC2
- 52, 2, 63, 1 ! pTRIG5_ROC2
- 53, 2, 64, 1 ! pTRIG6_ROC2
- 58, 2, 65, 1 ! hTRIG1_ROC2
- 59, 2, 66, 1 ! hTRIG2_ROC2
- 60, 2, 67, 1 ! hTRIG3_ROC2
- 61, 2, 68, 1 ! hTRIG4_ROC2
- 62, 2, 69, 1 ! hTRIG5_ROC2
- 63, 2, 70, 1 ! hTRIG6_ROC2
- 64, 2, 71, 1 ! pSTOF_ROC2
- 65, 2, 72, 1 ! pEL_LO_LO_ROC2
- 66, 2, 73, 1 ! pEL_LO_ROC2
- 67, 2, 74, 1 ! pEL_HI_ROC2
- 68, 2, 75, 1 ! pEL_REAL_ROC2
- 69, 2, 76, 1 ! pEL_CLEAN_ROC2
- 72, 2, 77, 1 ! hSTOF_ROC2
- 73, 2, 78, 1 ! hEL_LO_LO_ROC2
- 74, 2, 79, 1 ! hEL_LO_ROC2
- 75, 2, 80, 1 ! hEL_HI_ROC2
- 76, 2, 81, 1 ! hEL_REAL_ROC2
- 77, 2, 82, 1 ! hEL_CLEAN_ROC2
+! A1
+! chan plane bar sig
+ 31, 1000, 0, 0 ! pTRef2
+ 31, 2, 35, 1 ! pT2
+! B0
+ 32, 2, 36, 1 ! p1X
+ 33, 2, 37, 1 ! p1Y
+ 34, 2, 38, 1 ! p2X
+ 35, 2, 39, 1 ! p2Y
+ 36, 2, 40, 1 ! p1T
+ 37, 2, 41, 1 ! p2T
+ 38, 2, 42, 1 ! pT3
+ 39, 2, 43, 1 ! pAER
+ 40, 2, 44, 1 ! pHGCER
+ 41, 2, 45, 1 ! pNGCER
+ 42, 2, 56, 1 ! pEDTM
+ 43, 2, 57, 1 ! pPRLO
+ 44, 2, 58, 1 ! pPRHI
+! B1
+ 48, 2, 59, 1 ! pTRIG1_ROC2
+ 49, 2, 60, 1 ! pTRIG2_ROC2
+ 50, 2, 61, 1 ! pTRIG3_ROC2
+ 51, 2, 62, 1 ! pTRIG4_ROC2
+ 52, 2, 63, 1 ! pTRIG5_ROC2
+ 53, 2, 64, 1 ! pTRIG6_ROC2
+ 58, 2, 65, 1 ! hTRIG1_ROC2
+ 59, 2, 66, 1 ! hTRIG2_ROC2
+ 60, 2, 67, 1 ! hTRIG3_ROC2
+ 61, 2, 68, 1 ! hTRIG4_ROC2
+ 62, 2, 69, 1 ! hTRIG5_ROC2
+ 63, 2, 70, 1 ! hTRIG6_ROC2
+ 64, 2, 71, 1 ! pSTOF_ROC2
+! C0
+ 65, 2, 72, 1 ! pEL_LO_LO_ROC2
+ 66, 2, 73, 1 ! pEL_LO_ROC2
+ 67, 2, 74, 1 ! pEL_HI_ROC2
+ 68, 2, 75, 1 ! pEL_REAL_ROC2
+ 69, 2, 76, 1 ! pEL_CLEAN_ROC2
+ 72, 2, 77, 1 ! hSTOF_ROC2
+ 73, 2, 78, 1 ! hEL_LO_LO_ROC2
+ 74, 2, 79, 1 ! hEL_LO_ROC2
+ 75, 2, 80, 1 ! hEL_HI_ROC2
+ 76, 2, 81, 1 ! hEL_REAL_ROC2
+ 77, 2, 82, 1 ! hEL_CLEAN_ROC2
+! C1
+ 80, 2, 103, 1 ! pPRE40_ROC2
+ 81, 2, 104, 1 ! pPRE100_ROC2
+ 82, 2, 105, 1 ! pPRE150_ROC2
+ 83, 2, 106, 1 ! pPRE200_ROC2
+ 88, 2, 107, 1 ! hPRE40_ROC2
+ 89, 2, 108, 1 ! hPRE100_ROC2
+ 90, 2, 109, 1 ! hPRE150_ROC2
+ 91, 2, 110, 1 ! hPRE200_ROC2
ROC=6
diff --git a/MAPS/COIN/DETEC/coin.map b/MAPS/COIN/DETEC/coin.map
index a66acd0f..9a153d65 100644
--- a/MAPS/COIN/DETEC/coin.map
+++ b/MAPS/COIN/DETEC/coin.map
@@ -3778,8 +3778,8 @@ REFINDEX=3
11, 1, 4, 0 ! hDSUM
12, 1, 5, 0 ! hPSHWR
13, 1, 6, 0 ! hSHWR
- 14, 1, 7, 0 ! hAERSUM
- 15, 1, 8, 0 ! hCERSUM
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
SLOT=18
REFINDEX=3
@@ -3800,11 +3800,11 @@ REFINDEX=0
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
10, 2, 11, 1 ! hDSUM
- 11, 2, 12, 1 ! hPSHWRLO
- 12, 2, 13, 1 ! hPSHWRHI
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
13, 2, 14, 1 ! hSHWR
14, 2, 15, 1 ! hEDTM
- 15, 2, 16, 1 ! hCERSUM
+ 15, 2, 16, 1 ! hCER
26, 2, 22, 1 ! hTRIG1_ROC1
27, 2, 23, 1 ! hTRIG2_ROC1
28, 2, 24, 1 ! hTRIG3_ROC1
@@ -3817,18 +3817,26 @@ REFINDEX=0
19, 2, 31, 1 ! pTRIG4_ROC1
20, 2, 32, 1 ! pTRIG5_ROC1
21, 2, 33, 1 ! pTRIG6_ROC1
- 48, 2, 81, 1 ! pSTOF_ROC1
- 49, 2, 82, 1 ! pEL_LO_LO_ROC1
- 50, 2, 83, 1 ! pEL_LO_ROC1
- 51, 2, 84, 1 ! pEL_HI_ROC1
- 52, 2, 85, 1 ! pEL_REAL_ROC1
- 53, 2, 86, 1 ! pEL_CLEAN_ROC1
- 56, 2, 87, 1 ! hSTOF_ROC1
- 57, 2, 88, 1 ! hEL_LO_LO_ROC1
- 58, 2, 89, 1 ! hEL_LO_ROC1
- 59, 2, 90, 1 ! hEL_HI_ROC1
- 60, 2, 91, 1 ! hEL_REAL_ROC1
- 61, 2, 92, 1 ! hEL_CLEAN_ROC1
+ 48, 2, 83, 1 ! pSTOF_ROC1
+ 49, 2, 84, 1 ! pEL_LO_LO_ROC1
+ 50, 2, 85, 1 ! pEL_LO_ROC1
+ 51, 2, 86, 1 ! pEL_HI_ROC1
+ 52, 2, 87, 1 ! pEL_REAL_ROC1
+ 53, 2, 88, 1 ! pEL_CLEAN_ROC1
+ 56, 2, 89, 1 ! hSTOF_ROC1
+ 57, 2, 90, 1 ! hEL_LO_LO_ROC1
+ 58, 2, 91, 1 ! hEL_LO_ROC1
+ 59, 2, 92, 1 ! hEL_HI_ROC1
+ 60, 2, 93, 1 ! hEL_REAL_ROC1
+ 61, 2, 94, 1 ! hEL_CLEAN_ROC1
+ 64, 2, 95, 1 ! pPRE40_ROC1
+ 65, 2, 96, 1 ! pPRE100_ROC1
+ 66, 2, 97, 1 ! pPRE150_ROC1
+ 67, 2, 98, 1 ! pPRE200_ROC1
+ 72, 2, 99, 1 ! hPRE40_ROC1
+ 73, 2, 100, 1 ! hPRE100_ROC1
+ 74, 2, 101, 1 ! hPRE150_ROC1
+ 75, 2, 102, 1 ! hPRE200_ROC1
SLOT=20
REFINDEX=1
@@ -3853,10 +3861,12 @@ ROC=2
SLOT=14
REFINDEX=3
- 0, 1, 10, 0 ! pAERSUM
- 1, 1, 11, 0 ! pHGCERSUM
- 2, 1, 12, 0 ! pNGCERSUM
- 11, 1, 13, 0 ! pFADC_TREF_ROC2
+ 0, 1, 10, 0 ! pAER
+ 1, 1, 11, 0 ! pHGCER
+ 2, 1, 12, 0 ! pNGCER
+ 3, 1, 12, 0 ! pNGCER
+ 4, 1, 13, 0 ! pPSHWR
+ 11, 1, 14, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -3874,12 +3884,12 @@ REFINDEX=0
36, 2, 40, 1 ! p1T
37, 2, 41, 1 ! p2T
38, 2, 42, 1 ! pT3
- 39, 2, 43, 1 ! pAERSUM
- 40, 2, 44, 1 ! pHGCERSUM
- 41, 2, 45, 1 ! pNGCERSUM
+ 39, 2, 43, 1 ! pAER
+ 40, 2, 44, 1 ! pHGCER
+ 41, 2, 45, 1 ! pNGCER
42, 2, 56, 1 ! pEDTM
- 43, 2, 57, 1 ! pPRSHWRLO
- 44, 2, 58, 1 ! pPRSHWRHI
+ 43, 2, 57, 1 ! pPRLO
+ 44, 2, 58, 1 ! pPRHI
48, 2, 59, 1 ! pTRIG1_ROC2
49, 2, 60, 1 ! pTRIG2_ROC2
50, 2, 61, 1 ! pTRIG3_ROC2
@@ -3904,6 +3914,14 @@ REFINDEX=0
75, 2, 80, 1 ! hEL_HI_ROC2
76, 2, 81, 1 ! hEL_REAL_ROC2
77, 2, 82, 1 ! hEL_CLEAN_ROC2
+ 80, 2, 103, 1 ! pPRE40_ROC2
+ 81, 2, 104, 1 ! pPRE100_ROC2
+ 82, 2, 105, 1 ! pPRE150_ROC2
+ 83, 2, 106, 1 ! pPRE200_ROC2
+ 88, 2, 107, 1 ! hPRE40_ROC2
+ 89, 2, 108, 1 ! hPRE100_ROC2
+ 90, 2, 109, 1 ! hPRE150_ROC2
+ 91, 2, 110, 1 ! hPRE200_ROC2
ROC=6
diff --git a/MAPS/HMS/DETEC/AERO/haero_htrig.map b/MAPS/HMS/DETEC/AERO/haero_htrig.map
index 92879f4f..d1c75cc4 100644
--- a/MAPS/HMS/DETEC/AERO/haero_htrig.map
+++ b/MAPS/HMS/DETEC/AERO/haero_htrig.map
@@ -65,6 +65,14 @@ REFINDEX=0
59, 2, 43, 1 ! hEL_HI
60, 2, 44, 1 ! hEL_REAL
61, 2, 45, 1 ! hEL_CLEAN
+ 64, 2, 46, 1 ! pPRE40
+ 65, 2, 47, 1 ! pPRE100
+ 66, 2, 48, 1 ! pPRE150
+ 67, 2, 49, 1 ! pPRE200
+ 72, 2, 50, 1 ! hPRE40
+ 73, 2, 51, 1 ! hPRE100
+ 74, 2, 52, 1 ! hPRE150
+ 75, 2, 53, 1 ! hPRE200
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
index b2736a8d..5df1038a 100644
--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -65,6 +65,14 @@ REFINDEX=0
59, 2, 43, 1 ! hEL_HI
60, 2, 44, 1 ! hEL_REAL
61, 2, 45, 1 ! hEL_CLEAN
+ 64, 2, 46, 1 ! pPRE40
+ 65, 2, 47, 1 ! pPRE100
+ 66, 2, 48, 1 ! pPRE150
+ 67, 2, 49, 1 ! pPRE200
+ 72, 2, 50, 1 ! hPRE40
+ 73, 2, 51, 1 ! hPRE100
+ 74, 2, 52, 1 ! hPRE150
+ 75, 2, 53, 1 ! hPRE200
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map
index 706a55f9..adaf3294 100644
--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -65,6 +65,14 @@ REFINDEX=0
59, 2, 43, 1 ! hEL_HI
60, 2, 44, 1 ! hEL_REAL
61, 2, 45, 1 ! hEL_CLEAN
+ 64, 2, 46, 1 ! pPRE40
+ 65, 2, 47, 1 ! pPRE100
+ 66, 2, 48, 1 ! pPRE150
+ 67, 2, 49, 1 ! pPRE200
+ 72, 2, 50, 1 ! hPRE40
+ 73, 2, 51, 1 ! hPRE100
+ 74, 2, 52, 1 ! hPRE150
+ 75, 2, 53, 1 ! hPRE200
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/DC/hdc_htrig.map b/MAPS/HMS/DETEC/DC/hdc_htrig.map
index cbeb9d49..5bebc97e 100644
--- a/MAPS/HMS/DETEC/DC/hdc_htrig.map
+++ b/MAPS/HMS/DETEC/DC/hdc_htrig.map
@@ -65,6 +65,14 @@ REFINDEX=0
59, 2, 43, 1 ! hEL_HI
60, 2, 44, 1 ! hEL_REAL
61, 2, 45, 1 ! hEL_CLEAN
+ 64, 2, 46, 1 ! pPRE40
+ 65, 2, 47, 1 ! pPRE100
+ 66, 2, 48, 1 ! pPRE150
+ 67, 2, 49, 1 ! pPRE200
+ 72, 2, 50, 1 ! hPRE40
+ 73, 2, 51, 1 ! hPRE100
+ 74, 2, 52, 1 ! hPRE150
+ 75, 2, 53, 1 ! hPRE200
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
index 8da9bd3b..14a677f7 100644
--- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
@@ -65,6 +65,14 @@ REFINDEX=0
59, 2, 43, 1 ! hEL_HI
60, 2, 44, 1 ! hEL_REAL
61, 2, 45, 1 ! hEL_CLEAN
+ 64, 2, 46, 1 ! pPRE40
+ 65, 2, 47, 1 ! pPRE100
+ 66, 2, 48, 1 ! pPRE150
+ 67, 2, 49, 1 ! pPRE200
+ 72, 2, 50, 1 ! hPRE40
+ 73, 2, 51, 1 ! hPRE100
+ 74, 2, 52, 1 ! hPRE150
+ 75, 2, 53, 1 ! hPRE200
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map
index d9632c5b..51239bb5 100644
--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -69,6 +69,14 @@ REFINDEX=0
59, 2, 43, 1 ! hEL_HI
60, 2, 44, 1 ! hEL_REAL
61, 2, 45, 1 ! hEL_CLEAN
+ 64, 2, 46, 1 ! pPRE40
+ 65, 2, 47, 1 ! pPRE100
+ 66, 2, 48, 1 ! pPRE150
+ 67, 2, 49, 1 ! pPRE200
+ 72, 2, 50, 1 ! hPRE40
+ 73, 2, 51, 1 ! hPRE100
+ 74, 2, 52, 1 ! hPRE150
+ 75, 2, 53, 1 ! hPRE200
SLOT=20
REFINDEX=1
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index d083d148..5dbac7ab 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -1,4 +1,4 @@
-!HMS:
+! HMS:
! THMS_ID=10 ADC,TDC
! Plane = 1 >> ADC Only
@@ -8,73 +8,83 @@ DETECTOR=10
ROC=1
-!F250 module
+! F250 module
SLOT=17
REFINDEX=3
! chan plane bar sig
- 8, 1, 1, 0! hASUM
- 9, 1, 2, 0! hBSUM
- 10, 1, 3, 0! hCSUM
- 11, 1, 4, 0! hDSUM
- 12, 1, 5, 0! hPSHWR
- 13, 1, 6, 0! hSHWR
- 14, 1, 7, 0! hAER
- 15, 1, 8, 0! hCER
+ 8, 1, 1, 0 ! hASUM
+ 9, 1, 2, 0 ! hBSUM
+ 10, 1, 3, 0 ! hCSUM
+ 11, 1, 4, 0 ! hDSUM
+ 12, 1, 5, 0 ! hPSHWR
+ 13, 1, 6, 0 ! hSHWR
+ 14, 1, 7, 0 ! hAER
+ 15, 1, 8, 0 ! hCER
+! F250 module
SLOT=18
REFINDEX=3
! chan plane bar sig
- 11, 1000, 0, 3! hFADC_TREF_ROC1
- 11, 1, 9, 0! hFADC_TREF_ROC1
+ 11, 1000, 0, 3 ! hFADC_TREF_ROC1
+ 11, 1, 9, 0 ! hFADC_TREF_ROC1
-!CAEN1190 module
+! CAEN1190 module
SLOT=2
REFINDEX=0
! A0
! chan plane bar sig
- 0, 2, 1, 1! h1X
- 1, 2, 2, 1! h1Y
- 2, 2, 3, 1! h2X
- 3, 2, 4, 1! h2Y
- 4, 2, 5, 1! h1T
- 5, 2, 6, 1! h2T
- 6, 1000, 0, 0! hTref1
- 6, 2, 7, 1! hT1
- 7, 2, 8, 1! hASUM
- 8, 2, 9, 1! hBSUM
- 9, 2, 10, 1! hCSUM
- 10, 2, 11, 1! hDSUM
- 11, 2, 12, 1! hPRLO
- 12, 2, 13, 1! hPRHI
- 13, 2, 14, 1! hSHWR
- 14, 2, 15, 1! hEDTM
- 15, 2, 16, 1! hCER
+ 0, 2, 1, 1 ! h1X
+ 1, 2, 2, 1 ! h1Y
+ 2, 2, 3, 1 ! h2X
+ 3, 2, 4, 1 ! h2Y
+ 4, 2, 5, 1 ! h1T
+ 5, 2, 6, 1 ! h2T
+ 6, 1000, 0, 0 ! hTref1
+ 6, 2, 7, 1 ! hT1
+ 7, 2, 8, 1 ! hASUM
+ 8, 2, 9, 1 ! hBSUM
+ 9, 2, 10, 1 ! hCSUM
+ 10, 2, 11, 1 ! hDSUM
+ 11, 2, 12, 1 ! hPRLO
+ 12, 2, 13, 1 ! hPRHI
+ 13, 2, 14, 1 ! hSHWR
+ 14, 2, 15, 1 ! hEDTM
+ 15, 2, 16, 1 ! hCER
! A1
- 26, 2, 22, 1! hTRIG1
- 27, 2, 23, 1! hTRIG2
- 28, 2, 24, 1! hTRIG3
- 29, 2, 25, 1! hTRIG4
- 30, 2, 26, 1! hTRIG5
- 31, 2, 27, 1! hTRIG6
- 16, 2, 28, 1! pTRIG1
- 17, 2, 29, 1! pTRIG2
- 18, 2, 30, 1! pTRIG3
- 19, 2, 31, 1! pTRIG4
- 20, 2, 32, 1! pTRIG5
- 21, 2, 33, 1! pTRIG6
+ 26, 2, 22, 1 ! hTRIG1
+ 27, 2, 23, 1 ! hTRIG2
+ 28, 2, 24, 1 ! hTRIG3
+ 29, 2, 25, 1 ! hTRIG4
+ 30, 2, 26, 1 ! hTRIG5
+ 31, 2, 27, 1 ! hTRIG6
+ 16, 2, 28, 1 ! pTRIG1
+ 17, 2, 29, 1 ! pTRIG2
+ 18, 2, 30, 1 ! pTRIG3
+ 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_LO
- 50, 2, 36, 1! pEL_LO
- 51, 2, 37, 1! pEL_HI
- 52, 2, 38, 1! pEL_REAL
- 53, 2, 39, 1! pEL_CLEAN
- 56, 2, 40, 1! hSTOF
- 57, 2, 41, 1! hEL_LO_LO
- 58, 2, 42, 1! hEL_LO
- 59, 2, 43, 1! hEL_HI
- 60, 2, 44, 1! hEL_REAL
- 61, 2, 45, 1! hEL_CLEAN
+ 48, 2, 34, 1 ! pSTOF
+ 49, 2, 35, 1 ! pEL_LO_LO
+ 50, 2, 36, 1 ! pEL_LO
+ 51, 2, 37, 1 ! pEL_HI
+ 52, 2, 38, 1 ! pEL_REAL
+ 53, 2, 39, 1 ! pEL_CLEAN
+ 56, 2, 40, 1 ! hSTOF
+ 57, 2, 41, 1 ! hEL_LO_LO
+ 58, 2, 42, 1 ! hEL_LO
+ 59, 2, 43, 1 ! hEL_HI
+ 60, 2, 44, 1 ! hEL_REAL
+ 61, 2, 45, 1 ! hEL_CLEAN
+! C0
+ 64, 2, 46, 1 ! pPRE40
+ 65, 2, 47, 1 ! pPRE100
+ 66, 2, 48, 1 ! pPRE150
+ 67, 2, 49, 1 ! pPRE200
+ 72, 2, 50, 1 ! hPRE40
+ 73, 2, 51, 1 ! hPRE100
+ 74, 2, 52, 1 ! hPRE150
+ 75, 2, 53, 1 ! hPRE200
!CAEN1190 module
@@ -83,8 +93,8 @@ REFINDEX=0
! D1
! chan plane bar sig
REFINDEX=1
- 127, 1000, 0, 1! hTref2
- 127, 2, 17, 1! hT2
+ 127, 1000, 0, 1 ! hTref2
+ 127, 2, 17, 1 ! hT2
ROC=3
diff --git a/MAPS/SCALERS/db_HScalevt.dat b/MAPS/SCALERS/db_HScalevt.dat
index c908a471..c4ad8f87 100644
--- a/MAPS/SCALERS/db_HScalevt.dat
+++ b/MAPS/SCALERS/db_HScalevt.dat
@@ -69,6 +69,12 @@ 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 5 18 1 .pEL_LO.scaler SHMS EL_LO
+variable 5 18 2 .pEL_LO.scalerRate SHMS EL_LO
+variable 4 2 1 .pPRE150.scaler SHMS PRE150
+variable 4 2 2 .pPRE150.scalerRate SHMS PRE150
+variable 4 0 1 .pPRE40.scaler SHMS PRE40
+variable 4 0 2 .pPRE40.scalerRate SHMS PRE40
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
@@ -106,10 +112,10 @@ 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 22 1 .Empty_29.scaler Empty
-variable 5 22 2 .Empty_29.scalerRate Empty
-variable 5 9 1 .Empty_28.scaler Empty
-variable 5 9 2 .Empty_28.scalerRate Empty
+variable 4 12 1 .Empty_29.scaler Empty
+variable 4 12 2 .Empty_29.scalerRate Empty
+variable 4 7 1 .Empty_28.scaler Empty
+variable 4 7 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
@@ -118,14 +124,14 @@ 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 6 1 .Empty_25.scaler Empty
-variable 5 6 2 .Empty_25.scalerRate Empty
+variable 4 4 1 .Empty_25.scaler Empty
+variable 4 4 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 7 1 .Empty_26.scaler Empty
-variable 5 7 2 .Empty_26.scalerRate Empty
+variable 4 5 1 .Empty_26.scaler Empty
+variable 4 5 2 .Empty_26.scalerRate Empty
variable 5 28 1 .hEL_REAL.scaler HMS EL_REAL
variable 5 28 2 .hEL_REAL.scalerRate HMS EL_REAL
variable 3 21 1 .hod.2y4.negScaler HMS 2Y- paddle 4
@@ -146,6 +152,8 @@ 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 4 9 1 .hPRE100.scaler HMS PRE100
+variable 4 9 2 .hPRE100.scalerRate HMS PRE100
variable 0 5 1 .hod.1x4.posScaler HMS 1X+ paddle 4
variable 0 5 2 .hod.1x4.posScalerRate HMS 1X+ paddle 4
variable 5 20 1 .pEL_REAL.scaler SHMS EL_REAL
@@ -192,6 +200,8 @@ variable 5 13 1 .hTRIG4.scaler HMS TRIG4
variable 5 13 2 .hTRIG4.scalerRate HMS TRIG4
variable 5 15 1 .hTRIG6.scaler HMS TRIG6
variable 5 15 2 .hTRIG6.scalerRate HMS TRIG6
+variable 5 10 1 .hTRIG1.scaler HMS TRIG1
+variable 5 10 2 .hTRIG1.scalerRate HMS TRIG1
variable 5 12 1 .hTRIG3.scaler HMS TRIG3
variable 5 12 2 .hTRIG3.scalerRate HMS TRIG3
variable 5 11 1 .hTRIG2.scaler HMS TRIG2
@@ -214,6 +224,8 @@ 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
variable 2 19 2 .hod.2x7.negScalerRate HMS 2X- paddle 7
+variable 4 8 1 .hPRE40.scaler HMS PRE40
+variable 4 8 2 .hPRE40.scalerRate HMS PRE40
variable 1 2 1 .hod.1y5.posScaler HMS 1Y+ paddle 5
variable 1 2 2 .hod.1y5.posScalerRate HMS 1Y+ paddle 5
variable 1 18 1 .hod.1y5.negScaler HMS 1Y- paddle 5
@@ -222,26 +234,26 @@ 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 21 1 .Empty_38.scaler Empty
-variable 6 21 2 .Empty_38.scalerRate Empty
-variable 6 22 1 .Empty_39.scaler Empty
-variable 6 22 2 .Empty_39.scalerRate Empty
-variable 5 31 1 .Empty_32.scaler Empty
-variable 5 31 2 .Empty_32.scalerRate Empty
-variable 6 16 1 .Empty_33.scaler Empty
-variable 6 16 2 .Empty_33.scalerRate Empty
-variable 5 23 1 .Empty_30.scaler Empty
-variable 5 23 2 .Empty_30.scalerRate Empty
-variable 5 30 1 .Empty_31.scaler Empty
-variable 5 30 2 .Empty_31.scalerRate Empty
-variable 6 19 1 .Empty_36.scaler Empty
-variable 6 19 2 .Empty_36.scalerRate Empty
-variable 6 20 1 .Empty_37.scaler Empty
-variable 6 20 2 .Empty_37.scalerRate Empty
-variable 6 17 1 .Empty_34.scaler Empty
-variable 6 17 2 .Empty_34.scalerRate Empty
-variable 6 18 1 .Empty_35.scaler Empty
-variable 6 18 2 .Empty_35.scalerRate Empty
+variable 5 23 1 .Empty_38.scaler Empty
+variable 5 23 2 .Empty_38.scalerRate Empty
+variable 5 30 1 .Empty_39.scaler Empty
+variable 5 30 2 .Empty_39.scalerRate Empty
+variable 4 15 1 .Empty_32.scaler Empty
+variable 4 15 2 .Empty_32.scalerRate Empty
+variable 5 6 1 .Empty_33.scaler Empty
+variable 5 6 2 .Empty_33.scalerRate Empty
+variable 4 13 1 .Empty_30.scaler Empty
+variable 4 13 2 .Empty_30.scalerRate Empty
+variable 4 14 1 .Empty_31.scaler Empty
+variable 4 14 2 .Empty_31.scalerRate Empty
+variable 5 9 1 .Empty_36.scaler Empty
+variable 5 9 2 .Empty_36.scalerRate Empty
+variable 5 22 1 .Empty_37.scaler Empty
+variable 5 22 2 .Empty_37.scalerRate Empty
+variable 5 7 1 .Empty_34.scaler Empty
+variable 5 7 2 .Empty_34.scalerRate Empty
+variable 5 8 1 .Empty_35.scaler Empty
+variable 5 8 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
@@ -258,8 +270,10 @@ 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 8 1 .Empty_27.scaler Empty
-variable 5 8 2 .Empty_27.scalerRate Empty
+variable 4 11 1 .hPRE200.scaler HMS PRE200
+variable 4 11 2 .hPRE200.scalerRate HMS PRE200
+variable 4 6 1 .Empty_27.scaler Empty
+variable 4 6 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
@@ -272,8 +286,8 @@ 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 6 18 1 .Empty_43.scaler Empty
+variable 6 18 2 .Empty_43.scalerRate Empty
variable 1 23 1 .hod.1y8.negScaler HMS 1Y- paddle 8
variable 1 23 2 .hod.1y8.negScalerRate HMS 1Y- paddle 8
variable 1 7 1 .hod.1y8.posScaler HMS 1Y+ paddle 8
@@ -326,6 +340,10 @@ variable 3 6 1 .hod.2y6.posScaler HMS 2Y+ paddle 6
variable 3 6 2 .hod.2y6.posScalerRate HMS 2Y+ paddle 6
variable 3 22 1 .hod.2y6.negScaler HMS 2Y- paddle 6
variable 3 22 2 .hod.2y6.negScalerRate HMS 2Y- paddle 6
+variable 6 20 1 .Empty_45.scaler Empty
+variable 6 20 2 .Empty_45.scalerRate Empty
+variable 4 1 1 .pPRE100.scaler SHMS PRE100
+variable 4 1 2 .pPRE100.scalerRate SHMS PRE100
variable 0 26 1 .hod.1x13.negScaler HMS 1X- paddle 13
variable 0 26 2 .hod.1x13.negScalerRate HMS 1X- paddle 13
variable 0 10 1 .hod.1x13.posScaler HMS 1X+ paddle 13
@@ -334,6 +352,8 @@ variable 2 22 1 .hod.2x6.negScaler HMS 2X- paddle 6
variable 2 22 2 .hod.2x6.negScalerRate HMS 2X- paddle 6
variable 2 6 1 .hod.2x6.posScaler HMS 2X+ paddle 6
variable 2 6 2 .hod.2x6.posScalerRate HMS 2X+ paddle 6
+variable 4 10 1 .hPRE150.scaler HMS PRE150
+variable 4 10 2 .hPRE150.scalerRate HMS PRE150
variable 6 9 1 .CSUM.scaler HMS CSUM
variable 6 9 2 .CSUM.scalerRate HMS CSUM
variable 2 0 1 .hod.2x1.posScaler HMS 2X+ paddle 1
@@ -342,12 +362,12 @@ 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 4 3 1 .pPRE200.scaler SHMS PRE200
+variable 4 3 2 .pPRE200.scalerRate SHMS PRE200
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 18 1 .pEL_LO.scaler SHMS EL_LO
-variable 5 18 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
@@ -372,14 +392,26 @@ variable 5 16 1 .pSTOF.scaler SHMS STOF
variable 5 16 2 .pSTOF.scalerRate SHMS STOF
variable 6 11 1 .PRLO.scaler HMS PRLO
variable 6 11 2 .PRLO.scalerRate HMS PRLO
+variable 6 24 1 .Empty_49.scaler Empty
+variable 6 24 2 .Empty_49.scalerRate Empty
+variable 6 23 1 .Empty_48.scaler Empty
+variable 6 23 2 .Empty_48.scalerRate Empty
variable 5 24 1 .hSTOF.scaler HMS STOF
variable 5 24 2 .hSTOF.scalerRate HMS STOF
-variable 6 24 1 .Empty_41.scaler Empty
-variable 6 24 2 .Empty_41.scalerRate Empty
-variable 6 23 1 .Empty_40.scaler Empty
-variable 6 23 2 .Empty_40.scalerRate Empty
+variable 6 17 1 .Empty_42.scaler Empty
+variable 6 17 2 .Empty_42.scalerRate Empty
+variable 6 16 1 .Empty_41.scaler Empty
+variable 6 16 2 .Empty_41.scalerRate Empty
+variable 5 31 1 .Empty_40.scaler Empty
+variable 5 31 2 .Empty_40.scalerRate Empty
+variable 6 22 1 .Empty_47.scaler Empty
+variable 6 22 2 .Empty_47.scalerRate Empty
+variable 6 21 1 .Empty_46.scaler Empty
+variable 6 21 2 .Empty_46.scalerRate Empty
variable 6 8 1 .BSUM.scaler HMS BSUM
variable 6 8 2 .BSUM.scalerRate HMS BSUM
+variable 6 19 1 .Empty_44.scaler Empty
+variable 6 19 2 .Empty_44.scalerRate Empty
variable 0 1 1 .hod.1x3.posScaler HMS 1X+ paddle 3
variable 0 1 2 .hod.1x3.posScalerRate HMS 1X+ paddle 3
variable 0 17 1 .hod.1x3.negScaler HMS 1X- paddle 3
diff --git a/MAPS/SCALERS/db_PScalevt.dat b/MAPS/SCALERS/db_PScalevt.dat
index d426fa0f..09079e6b 100644
--- a/MAPS/SCALERS/db_PScalevt.dat
+++ b/MAPS/SCALERS/db_PScalevt.dat
@@ -30,10 +30,20 @@ variable 0 17 1 .hod.1x3.negScaler SHMS 1X- paddle 3
variable 0 17 2 .hod.1x3.negScalerRate SHMS 1X- paddle 3
variable 6 25 1 .hEL_LO_LO.scaler HMS EL_LO_LO
variable 6 25 2 .hEL_LO_LO.scalerRate HMS EL_LO_LO
+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 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 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
@@ -54,8 +64,6 @@ variable 2 29 1 .hod.2x12.negScaler SHMS 2X- paddle 12
variable 2 29 2 .hod.2x12.negScalerRate SHMS 2X- paddle 12
variable 2 13 1 .hod.2x12.posScaler SHMS 2X+ paddle 12
variable 2 13 2 .hod.2x12.posScalerRate SHMS 2X+ paddle 12
-variable 3 13 1 .hod.2y12.negScaler SHMS 2y- paddle 12
-variable 3 13 2 .hod.2y12.negScalerRate SHMS 2y- paddle 12
variable 3 29 1 .hod.2y12.posScaler SHMS 2y+ paddle 12
variable 3 29 2 .hod.2y12.posScalerRate SHMS 2y+ paddle 12
variable 2 8 1 .hod.2x9.posScaler SHMS 2X+ paddle 9
@@ -82,8 +90,8 @@ 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 5 4 1 .Empty_39.scaler Empty
+variable 5 4 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
@@ -105,12 +113,12 @@ 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 7 15 1 .Empty_49.scaler Empty
-variable 7 15 2 .Empty_49.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 6 27 1 .hEL_HI.scaler HMS EL_HI
+variable 6 27 2 .hEL_HI.scalerRate HMS EL_HI
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
@@ -125,6 +133,10 @@ 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 5 2 1 .pPRE150.scaler SHMS PRE150
+variable 5 2 2 .pPRE150.scalerRate SHMS PRE150
+variable 5 10 1 .hPRE150.scaler HMS PRE150
+variable 5 10 2 .hPRE150.scalerRate HMS PRE150
variable 0 15 1 .Empty_3.scaler Empty
variable 0 15 2 .Empty_3.scalerRate Empty
variable 3 9 1 .hod.2y11.negScaler SHMS 2y- paddle 11
@@ -163,18 +175,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 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 7 20 1 .Empty_54.scaler Empty
-variable 7 20 2 .Empty_54.scalerRate Empty
+variable 6 31 1 .Empty_54.scaler Empty
+variable 6 31 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 7 18 1 .Empty_52.scaler Empty
-variable 7 18 2 .Empty_52.scalerRate Empty
+variable 6 23 1 .Empty_52.scaler Empty
+variable 6 23 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
@@ -183,8 +199,6 @@ variable 2 7 1 .hod.2x8.posScaler SHMS 2X+ paddle 8
variable 2 7 2 .hod.2x8.posScalerRate SHMS 2X+ paddle 8
variable 3 30 1 .hod.2y14.posScaler SHMS 2y+ paddle 14
variable 3 30 2 .hod.2y14.posScalerRate SHMS 2y+ paddle 14
-variable 3 14 1 .hod.2y14.negScaler SHMS 2y- paddle 14
-variable 3 14 2 .hod.2y14.negScalerRate SHMS 2y- paddle 14
variable 6 19 1 .pEL_HI.scaler SHMS EL_HI
variable 6 19 2 .pEL_HI.scalerRate SHMS EL_HI
variable 7 0 1 .S1X.scaler SHMS S1X
@@ -207,12 +221,18 @@ variable 0 21 1 .hod.1x4.negScaler SHMS 1X- paddle 4
variable 0 21 2 .hod.1x4.negScalerRate SHMS 1X- paddle 4
variable 6 21 1 .pEL_CLEAN.scaler SHMS EL_CLEAN
variable 6 21 2 .pEL_CLEAN.scalerRate SHMS EL_CLEAN
+variable 7 30 1 .Unser.scaler Unser
+variable 7 30 2 .Unser.scalerRate Unser
+variable 7 30 3 .Unser.scalerCurrent Unser
+variable 7 30 4 .Unser.scalerCharge Unser
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
@@ -257,10 +277,6 @@ variable 6 18 1 .pEL_LO.scaler SHMS EL_LO
variable 6 18 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
-variable 7 30 2 .Unser.scalerRate Unser
-variable 7 30 3 .Unser.scalerCurrent Unser
-variable 7 30 4 .Unser.scalerCharge Unser
variable 2 5 1 .hod.2x4.posScaler SHMS 2X+ paddle 4
variable 2 5 2 .hod.2x4.posScalerRate SHMS 2X+ paddle 4
variable 1 4 1 .hod.1y2.negScaler SHMS 1Y- paddle 2
@@ -279,26 +295,26 @@ 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 22 1 .Empty_43.scaler Empty
-variable 6 22 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 5 12 1 .Empty_43.scaler Empty
+variable 5 12 2 .Empty_43.scalerRate Empty
+variable 5 7 1 .Empty_42.scaler Empty
+variable 5 7 2 .Empty_42.scalerRate Empty
+variable 5 6 1 .Empty_41.scaler Empty
+variable 5 6 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 7 13 1 .Empty_47.scaler Empty
-variable 7 13 2 .Empty_47.scalerRate Empty
+variable 6 6 1 .Empty_47.scaler Empty
+variable 6 6 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 30 1 .Empty_45.scaler Empty
-variable 6 30 2 .Empty_45.scalerRate Empty
-variable 6 23 1 .Empty_44.scaler Empty
-variable 6 23 2 .Empty_44.scalerRate Empty
-variable 7 7 1 .AERO.scaler SHMS AERO
-variable 7 7 2 .AERO.scalerRate SHMS AERO
-variable 7 14 1 .Empty_48.scaler Empty
-variable 7 14 2 .Empty_48.scalerRate Empty
+variable 5 14 1 .Empty_45.scaler Empty
+variable 5 14 2 .Empty_45.scalerRate Empty
+variable 5 13 1 .Empty_44.scaler Empty
+variable 5 13 2 .Empty_44.scalerRate Empty
+variable 6 8 1 .Empty_49.scaler Empty
+variable 6 8 2 .Empty_49.scalerRate Empty
+variable 6 7 1 .Empty_48.scaler Empty
+variable 6 7 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
@@ -309,6 +325,8 @@ variable 6 26 1 .hEL_LO.scaler HMS EL_LO
variable 6 26 2 .hEL_LO.scalerRate HMS EL_LO
variable 0 13 1 .hod.1x12.posScaler SHMS 1X+ paddle 12
variable 0 13 2 .hod.1x12.posScalerRate SHMS 1X+ paddle 12
+variable 3 14 1 .hod.2y14.negScaler SHMS 2y- paddle 14
+variable 3 14 2 .hod.2y14.negScalerRate SHMS 2y- paddle 14
variable 0 30 1 .hod.1x12.negScaler SHMS 1X- paddle 12
variable 0 30 2 .hod.1x12.negScalerRate SHMS 1X- paddle 12
variable 3 18 1 .hod.2y5.posScaler SHMS 2y+ paddle 5
@@ -319,20 +337,24 @@ variable 2 30 1 .hod.2x14.negScaler SHMS 2X- paddle 14
variable 2 30 2 .hod.2x14.negScalerRate SHMS 2X- paddle 14
variable 2 14 1 .hod.2x14.posScaler SHMS 2X+ paddle 14
variable 2 14 2 .hod.2x14.posScalerRate SHMS 2X+ paddle 14
+variable 5 8 1 .hPRE40.scaler HMS PRE40
+variable 5 8 2 .hPRE40.scalerRate HMS PRE40
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 31 1 .Empty_46.scaler Empty
-variable 6 31 2 .Empty_46.scalerRate Empty
+variable 5 5 1 .Empty_40.scaler Empty
+variable 5 5 2 .Empty_40.scalerRate Empty
+variable 5 15 1 .Empty_46.scaler Empty
+variable 5 15 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
variable 4 16 2 .hod.2y17.posScalerRate SHMS 2y+ paddle 17
variable 1 7 1 .hod.1y8.negScaler SHMS 1Y- paddle 8
variable 1 7 2 .hod.1y8.negScalerRate SHMS 1Y- paddle 8
+variable 5 1 1 .pPRE100.scaler SHMS PRE100
+variable 5 1 2 .pPRE100.scalerRate SHMS PRE100
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
@@ -343,6 +365,8 @@ variable 0 18 1 .hod.1x5.negScaler SHMS 1X- paddle 5
variable 0 18 2 .hod.1x5.negScalerRate SHMS 1X- paddle 5
variable 0 2 1 .hod.1x5.posScaler SHMS 1X+ paddle 5
variable 0 2 2 .hod.1x5.posScalerRate SHMS 1X+ paddle 5
+variable 5 0 1 .pPRE40.scaler SHMS PRE40
+variable 5 0 2 .pPRE40.scalerRate SHMS PRE40
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
@@ -381,6 +405,8 @@ variable 0 9 1 .hod.1x11.posScaler SHMS 1X+ paddle 11
variable 0 9 2 .hod.1x11.posScalerRate SHMS 1X+ paddle 11
variable 0 25 1 .hod.1x11.negScaler SHMS 1X- paddle 11
variable 0 25 2 .hod.1x11.negScalerRate SHMS 1X- paddle 11
+variable 3 13 1 .hod.2y12.negScaler SHMS 2y- paddle 12
+variable 3 13 2 .hod.2y12.negScalerRate SHMS 2y- paddle 12
variable 2 9 1 .hod.2x11.posScaler SHMS 2X+ paddle 11
variable 2 9 2 .hod.2x11.posScalerRate SHMS 2X+ paddle 11
variable 2 25 1 .hod.2x11.negScaler SHMS 2X- paddle 11
@@ -399,8 +425,8 @@ 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 6 27 1 .hEL_HI.scaler HMS EL_HI
-variable 6 27 2 .hEL_HI.scalerRate HMS EL_HI
+variable 5 9 1 .hPRE100.scaler HMS PRE100
+variable 5 9 2 .hPRE100.scalerRate HMS PRE100
variable 4 25 1 .Empty_21.scaler Empty
variable 4 25 2 .Empty_21.scalerRate Empty
variable 4 24 1 .Empty_20.scaler Empty
@@ -427,28 +453,34 @@ 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
variable 1 13 2 .hod.1y12.negScalerRate SHMS 1Y- paddle 12
+variable 5 3 1 .pPRE200.scaler SHMS PRE200
+variable 5 3 2 .pPRE200.scalerRate SHMS PRE200
variable 1 21 1 .hod.1y4.posScaler SHMS 1Y+ paddle 4
variable 1 21 2 .hod.1y4.posScalerRate SHMS 1Y+ paddle 4
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 7 21 1 .Empty_55.scaler Empty
-variable 7 21 2 .Empty_55.scalerRate Empty
-variable 7 22 1 .Empty_56.scaler Empty
-variable 7 22 2 .Empty_56.scalerRate Empty
-variable 7 23 1 .Empty_57.scaler Empty
-variable 7 23 2 .Empty_57.scalerRate Empty
-variable 7 16 1 .Empty_50.scaler Empty
-variable 7 16 2 .Empty_50.scalerRate Empty
-variable 7 17 1 .Empty_51.scaler Empty
-variable 7 17 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 9 1 .Empty_50.scaler Empty
+variable 6 9 2 .Empty_50.scalerRate Empty
+variable 6 22 1 .Empty_51.scaler Empty
+variable 6 22 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 7 19 1 .Empty_53.scaler Empty
-variable 7 19 2 .Empty_53.scalerRate Empty
-variable 7 24 1 .Empty_58.scaler Empty
-variable 7 24 2 .Empty_58.scalerRate Empty
+variable 6 30 1 .Empty_53.scaler Empty
+variable 6 30 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 5 11 1 .hPRE200.scaler HMS PRE200
+variable 5 11 2 .hPRE200.scalerRate HMS PRE200
variable 4 9 1 .Empty_32.scaler Empty
variable 4 9 2 .Empty_32.scalerRate Empty
variable 6 28 1 .hEL_REAL.scaler HMS EL_REAL
diff --git a/MAPS/SCALERS/scaler.map b/MAPS/SCALERS/scaler.map
index 7862bfc5..e72365d4 100755
--- a/MAPS/SCALERS/scaler.map
+++ b/MAPS/SCALERS/scaler.map
@@ -14,9 +14,9 @@ DATE 4 1 2017
# Setup for Hall C testing HMS hodoscopes, etc.
-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-tabs HMS 0:1X 1:1Y 2:2X 3:2Y 4:Trigger 5:Trigger 6:Trigger
+xscaler-layout HMS 0:8x4 1:8x4 2:8x4 3:8x4 4:8x4 5:8x4 6:8x4
+xscaler-pageslot HMS 0:page0 1:page1 2:page2 3:page3 4:slot6 5:slot5 6:slot4
xscaler-pagename HMS 0:'HMS Hodoscope Plane 1X'
xscaler-pagename HMS 1:'HMS Hodoscope Plane 1Y'
@@ -24,15 +24,16 @@ 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-pagename HMS 6:'HMS Trigger'
xscaler-clock HMS slot:7 chan:1 rate:60
#####################################################################
# Setup for Hall C testing SHMS hodoscopes, etc.
-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-tabs SHMS 0:1X 1:1Y 2:2X 3:2Y 4:Trigger 5:Trigger 6:Trigger
+xscaler-layout SHMS 0:8x4 1:8x4 2:8x4 3:8x4 4:8x4 5:8x4 6:8x4
+xscaler-pageslot SHMS 0:page0 1:page1 2:page2 3:page3 4:slot7 5:slot6 6:slot5
xscaler-pagename SHMS 0:'SHMS Hodoscope Plane 1X'
xscaler-pagename SHMS 1:'SHMS Hodoscope Plane 1Y'
@@ -40,6 +41,7 @@ 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-pagename SHMS 6:'SHMS Trigger'
xscaler-clock SHMS slot:8 chan:1 rate:60
#####################################################################
@@ -193,6 +195,24 @@ hhod2y10- 0 4 3 28 1 3 HMS 2Y- paddle 10
9/30 0 4 3 30 1 3 Empty
9/31 0 4 3 31 1 3 Empty
+# desc hel crate slot start nchan page long-description
+pPRE40 0 4 4 0 1 -1 SHMS PRE40
+pPRE100 0 4 4 1 1 -1 SHMS PRE100
+pPRE150 0 4 4 2 1 -1 SHMS PRE150
+pPRE200 0 4 4 3 1 -1 SHMS PRE200
+10/4 0 4 4 4 1 -1 Empty
+10/5 0 4 4 5 1 -1 Empty
+10/6 0 4 4 6 1 -1 Empty
+10/7 0 4 4 7 1 -1 Empty
+hPRE40 0 4 4 8 1 -1 HMS PRE40
+hPRE100 0 4 4 9 1 -1 HMS PRE100
+hPRE150 0 4 4 10 1 -1 HMS PRE150
+hPRE200 0 4 4 11 1 -1 HMS PRE200
+10/12 0 4 4 12 1 -1 Empty
+10/13 0 4 4 13 1 -1 Empty
+10/14 0 4 4 14 1 -1 Empty
+10/15 0 4 4 15 1 -1 Empty
+
# desc hel crate slot start nchan page long-description
pTRIG1 0 4 5 0 1 -1 SHMS TRIG1
pTRIG2 0 4 5 1 1 -1 SHMS TRIG2
@@ -454,6 +474,24 @@ phod2y21- 0 5 4 2 1 -1 SHMS 2y- paddle 21
10/14 0 5 4 14 1 -1 Empty
10/15 0 5 4 15 1 -1 Empty
+# desc hel crate slot start nchan page long-description
+pPRE40 0 5 5 0 1 -1 SHMS PRE40
+pPRE100 0 5 5 1 1 -1 SHMS PRE100
+pPRE150 0 5 5 2 1 -1 SHMS PRE150
+pPRE200 0 5 5 3 1 -1 SHMS PRE200
+11/4 0 5 5 4 1 -1 Empty
+11/5 0 5 5 5 1 -1 Empty
+11/6 0 5 5 6 1 -1 Empty
+11/7 0 5 5 7 1 -1 Empty
+hPRE40 0 5 5 8 1 -1 HMS PRE40
+hPRE100 0 5 5 9 1 -1 HMS PRE100
+hPRE150 0 5 5 10 1 -1 HMS PRE150
+hPRE200 0 5 5 11 1 -1 HMS PRE200
+11/12 0 5 5 12 1 -1 Empty
+11/13 0 5 5 13 1 -1 Empty
+11/14 0 5 5 14 1 -1 Empty
+11/15 0 5 5 15 1 -1 Empty
+
# desc hel crate slot start nchan page long-description
pTRIG1 0 5 6 0 1 -1 SHMS TRIG1
pTRIG2 0 5 6 1 1 -1 SHMS TRIG2
diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
index 3fb4298e..4b37e9c4 100644
--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -12,8 +12,8 @@ REFINDEX=3
0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -61,6 +61,14 @@ REFINDEX=0
75, 2, 47, 1 ! hEL_HI
76, 2, 48, 1 ! hEL_REAL
77, 2, 49, 1 ! hEL_CLEAN
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
index cc79d537..540ba6fa 100644
--- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
+++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
@@ -12,8 +12,8 @@ REFINDEX=3
0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -61,6 +61,14 @@ REFINDEX=0
75, 2, 47, 1 ! hEL_HI
76, 2, 48, 1 ! hEL_REAL
77, 2, 49, 1 ! hEL_CLEAN
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
index b598bca4..9a342b2f 100644
--- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
+++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
@@ -12,8 +12,8 @@ REFINDEX=3
0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -61,6 +61,14 @@ REFINDEX=0
75, 2, 47, 1 ! hEL_HI
76, 2, 48, 1 ! hEL_REAL
77, 2, 49, 1 ! hEL_CLEAN
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
index 640313fc..619e65eb 100644
--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -12,8 +12,8 @@ REFINDEX=3
0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -61,6 +61,14 @@ REFINDEX=0
75, 2, 47, 1 ! hEL_HI
76, 2, 48, 1 ! hEL_REAL
77, 2, 49, 1 ! hEL_CLEAN
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
index d480ac1e..84f7836c 100644
--- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
@@ -12,8 +12,8 @@ REFINDEX=3
0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -61,6 +61,14 @@ REFINDEX=0
75, 2, 47, 1 ! hEL_HI
76, 2, 48, 1 ! hEL_REAL
77, 2, 49, 1 ! hEL_CLEAN
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
index 2f6376f5..3ae0503c 100644
--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -12,8 +12,8 @@ REFINDEX=3
0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -61,6 +61,14 @@ REFINDEX=0
75, 2, 47, 1 ! hEL_HI
76, 2, 48, 1 ! hEL_REAL
77, 2, 49, 1 ! hEL_CLEAN
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map
index 6b2b68a5..b5ffcc97 100644
--- a/MAPS/SHMS/DETEC/STACK/shms_stack.map
+++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map
@@ -18,8 +18,8 @@ REFINDEX=3
0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
REFINDEX=1
@@ -67,6 +67,14 @@ REFINDEX=0
75, 2, 47, 1 ! hEL_HI
76, 2, 48, 1 ! hEL_REAL
77, 2, 49, 1 ! hEL_CLEAN
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map
index 69f620c3..a1c9d32c 100644
--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -1,64 +1,87 @@
+! SHMS:
! TSHMS_ID=20 :: ADC,TDC
+! Plane = 1 >> ADC Only
+! Plane = 2 >> TDC Only
+
DETECTOR=20
ROC=2
+!F250 module
SLOT=14
REFINDEX=3
- 11,1000, 0, 3 ! pFADC_TREF_ROC2
- 0, 1, 1, 0 ! pAER
- 1, 1, 2, 0 ! pHGCER
- 2, 1, 3, 0 ! pNGCER
- 2, 1, 3, 0 ! pPSHWR
- 11, 1, 4, 0 ! pFADC_TREF_ROC2
-
+! chan plane bar sig
+ 11, 1000, 0, 3 ! pFADC_TREF_ROC2
+ 0, 1, 1, 0 ! pAER
+ 1, 1, 2, 0 ! pHGCER
+ 2, 1, 3, 0 ! pNGCER
+ 3, 1, 4, 0 ! pPSHWR
+ 11, 1, 5, 0 ! pFADC_TREF_ROC2
+
+! CAEN1190 module
SLOT=20
REFINDEX=1
- 15, 1000, 0, 1 ! pTRef1
- 15, 2, 1, 1 ! pT1
+! chan plane bar sig
+ 15, 1000, 0, 1 ! pTRef1
+ 15, 2, 1, 1 ! pT1
+! CAEN1190 module
SLOT=19
REFINDEX=0
- 31, 1000, 0, 0 ! pTRef2
- 31, 2, 2, 1 ! pT2
- 32, 2, 3, 1 ! p1X
- 33, 2, 4, 1 ! p1Y
- 34, 2, 5, 1 ! p2X
- 35, 2, 6, 1 ! p2Y
- 36, 2, 7, 1 ! p1T
- 37, 2, 8, 1 ! p2T
- 38, 2, 9, 1 ! pT3
- 39, 2, 10, 1 ! pAER
- 40, 2, 11, 1 ! pHGCER
- 41, 2, 12, 1 ! pNGCER
- 42, 2, 23, 1 ! pEDTM
- 43, 2, 24, 1 ! pPRLO
- 44, 2, 25, 1 ! pPRHI
- 48, 2, 26, 1 ! pTRIG1
- 49, 2, 27, 1 ! pTRIG2
- 50, 2, 28, 1 ! pTRIG3
- 51, 2, 29, 1 ! pTRIG4
- 52, 2, 30, 1 ! pTRIG5
- 53, 2, 31, 1 ! pTRIG6
- 58, 2, 32, 1 ! hTRIG1
- 59, 2, 33, 1 ! hTRIG2
- 60, 2, 34, 1 ! hTRIG3
- 61, 2, 35, 1 ! hTRIG4
- 62, 2, 36, 1 ! hTRIG5
- 63, 2, 37, 1 ! hTRIG6
- 64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO_LO
- 66, 2, 40, 1 ! pEL_LO
- 67, 2, 41, 1 ! pEL_HI
- 68, 2, 42, 1 ! pEL_REAL
- 69, 2, 43, 1 ! pEL_CLEAN
- 72, 2, 44, 1 ! hSTOF
- 73, 2, 45, 1 ! hEL_LO_LO
- 74, 2, 46, 1 ! hEL_LO
- 75, 2, 47, 1 ! hEL_HI
- 76, 2, 48, 1 ! hEL_REAL
- 77, 2, 49, 1 ! hEL_CLEAN
+! A1
+! chan plane bar sig
+ 31, 1000, 0, 0 ! pTRef2
+ 31, 2, 2, 1 ! pT2
+! B0
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAER
+ 40, 2, 11, 1 ! pHGCER
+ 41, 2, 12, 1 ! pNGCER
+ 42, 2, 23, 1 ! pEDTM
+ 43, 2, 24, 1 ! pPRLO
+ 44, 2, 25, 1 ! pPRHI
+! B1
+ 48, 2, 26, 1 ! pTRIG1
+ 49, 2, 27, 1 ! pTRIG2
+ 50, 2, 28, 1 ! pTRIG3
+ 51, 2, 29, 1 ! pTRIG4
+ 52, 2, 30, 1 ! pTRIG5
+ 53, 2, 31, 1 ! pTRIG6
+ 58, 2, 32, 1 ! hTRIG1
+ 59, 2, 33, 1 ! hTRIG2
+ 60, 2, 34, 1 ! hTRIG3
+ 61, 2, 35, 1 ! hTRIG4
+ 62, 2, 36, 1 ! hTRIG5
+ 63, 2, 37, 1 ! hTRIG6
+! C0
+ 64, 2, 38, 1 ! pSTOF
+ 65, 2, 39, 1 ! pEL_LO_LO
+ 66, 2, 40, 1 ! pEL_LO
+ 67, 2, 41, 1 ! pEL_HI
+ 68, 2, 42, 1 ! pEL_REAL
+ 69, 2, 43, 1 ! pEL_CLEAN
+ 72, 2, 44, 1 ! hSTOF
+ 73, 2, 45, 1 ! hEL_LO_LO
+ 74, 2, 46, 1 ! hEL_LO
+ 75, 2, 47, 1 ! hEL_HI
+ 76, 2, 48, 1 ! hEL_REAL
+ 77, 2, 49, 1 ! hEL_CLEAN
+! C1
+ 80, 2, 50, 1 ! pPRE40
+ 81, 2, 51, 1 ! pPRE100
+ 82, 2, 52, 1 ! pPRE150
+ 83, 2, 53, 1 ! pPRE200
+ 88, 2, 54, 1 ! hPRE40
+ 89, 2, 55, 1 ! hPRE100
+ 90, 2, 56, 1 ! hPRE150
+ 91, 2, 57, 1 ! hPRE200
ROC=6
diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param
index e349f1f5..144d3355 100644
--- a/PARAM/TRIG/tcoin.param
+++ b/PARAM/TRIG/tcoin.param
@@ -1,5 +1,5 @@
t_coin_numAdc = 14
-t_coin_numTdc = 94
+t_coin_numTdc = 110
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 14
t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1 pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
-t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1"
+; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110
+t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1 pPRE40_ROC1 pPRE100_ROC1 pPRE150_ROC1 pPRE200_ROC1 hPRE40_ROC1 hPRE100_ROC1 hPRE150_ROC1 hPRE200_ROC1 pPRE40_ROC2 pPRE100_ROC2 pPRE150_ROC2 pPRE200_ROC2 hPRE40_ROC2 hPRE100_ROC2 hPRE150_ROC2 hPRE200_ROC2"
diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param
index 7f527ef6..f89411c1 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -1,5 +1,5 @@
t_hms_numAdc = 9
-t_hms_numTdc = 45
+t_hms_numTdc = 53
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 hAER hCER hFADC_TREF_ROC1"
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
-t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN"
\ No newline at end of file
+; 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
+t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN pPRE40 pPRE100 pPRE150 pPRE200 hPRE40 hPRE100 hPRE150 hPRE200"
\ No newline at end of file
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index 07c8c676..399843ac 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,5 +1,5 @@
t_shms_numAdc = 5
-t_shms_numTdc = 49
+t_shms_numTdc = 57
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 5
t_shms_adcNames = "pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
-; BAR NUM: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
-t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN"
+; 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
+t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN pPRE40 pPRE100 pPRE150 pPRE200 hPRE40 hPRE100 hPRE150 hPRE200"
--
GitLab