From 896464a87991a824ad60b16a7daf788956442a63 Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Thu, 4 Jan 2018 18:16:59 -0500
Subject: [PATCH] El lo renaming (#350)
* Update leaf names
* Update SHMS maps with new naming convention
* Update coin maps
* Update HMS maps
* Update scaler maps
* Update SHMS & HMS report files
---
MAPS/COIN/DETEC/TRIG/cointrig.map | 16 +-
MAPS/COIN/DETEC/coin.map | 16 +-
MAPS/HMS/DETEC/AERO/haero_htrig.map | 33 +-
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 | 8 +-
MAPS/SCALERS/db_HScalevt.dat | 140 ++++----
MAPS/SCALERS/db_PScalevt.dat | 300 +++++++++---------
MAPS/SCALERS/scaler.map | 81 +++--
MAPS/SHMS/DETEC/AERO/paero_ptrig.map | 48 +--
MAPS/SHMS/DETEC/CAL/pcal_ptrig.map | 8 +-
MAPS/SHMS/DETEC/DC/pdc_ptrig.map | 8 +-
MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map | 8 +-
MAPS/SHMS/DETEC/HODO/phodo_ptrig.map | 8 +-
MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map | 8 +-
MAPS/SHMS/DETEC/STACK/shms_stack.map | 8 +-
MAPS/SHMS/DETEC/TRIG/ptrig.map | 8 +-
PARAM/TRIG/tcoin.param | 4 +-
PARAM/TRIG/thms.param | 4 +-
PARAM/TRIG/tshms.param | 4 +-
.../PRODUCTION/hstackana_production.template | 164 ++++++----
TEMPLATES/HMS/SCALERS/hscalers.template | 146 +++++----
.../PRODUCTION/pstackana_production.template | 176 +++++-----
TEMPLATES/SHMS/SCALERS/pscalers.template | 142 +++++----
27 files changed, 752 insertions(+), 626 deletions(-)
diff --git a/MAPS/COIN/DETEC/TRIG/cointrig.map b/MAPS/COIN/DETEC/TRIG/cointrig.map
index 61dd8df1..e3c99fc5 100644
--- a/MAPS/COIN/DETEC/TRIG/cointrig.map
+++ b/MAPS/COIN/DETEC/TRIG/cointrig.map
@@ -64,14 +64,14 @@ REFINDEX=0
21, 2, 33, 1! pTRIG6_ROC1
! B1
48, 2, 81, 1! pSTOF_ROC1
- 49, 2, 82, 1! pEL_LO_ROC1
- 50, 2, 83, 1! pEL_LO_CER_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_ROC1
- 58, 2, 89, 1! hEL_LO_CER_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
@@ -147,14 +147,14 @@ REFINDEX=0
62, 2, 69, 1 ! hTRIG5_ROC2
63, 2, 70, 1 ! hTRIG6_ROC2
64, 2, 71, 1 ! pSTOF_ROC2
- 65, 2, 72, 1 ! pEL_LO_ROC2
- 66, 2, 73, 1 ! pEL_LO_CER_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_ROC2
- 74, 2, 79, 1 ! hEL_LO_CER_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
diff --git a/MAPS/COIN/DETEC/coin.map b/MAPS/COIN/DETEC/coin.map
index fe01e8de..a66acd0f 100644
--- a/MAPS/COIN/DETEC/coin.map
+++ b/MAPS/COIN/DETEC/coin.map
@@ -3818,14 +3818,14 @@ REFINDEX=0
20, 2, 32, 1 ! pTRIG5_ROC1
21, 2, 33, 1 ! pTRIG6_ROC1
48, 2, 81, 1 ! pSTOF_ROC1
- 49, 2, 82, 1 ! pEL_LO_ROC1
- 50, 2, 83, 1 ! pEL_LO_CER_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_ROC1
- 58, 2, 89, 1 ! hEL_LO_CER_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
@@ -3893,14 +3893,14 @@ REFINDEX=0
62, 2, 69, 1 ! hTRIG5_ROC2
63, 2, 70, 1 ! hTRIG6_ROC2
64, 2, 71, 1 ! pSTOF_ROC2
- 65, 2, 72, 1 ! pEL_LO_ROC2
- 66, 2, 73, 1 ! pEL_LO_CER_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_ROC2
- 74, 2, 79, 1 ! hEL_LO_CER_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
diff --git a/MAPS/HMS/DETEC/AERO/haero_htrig.map b/MAPS/HMS/DETEC/AERO/haero_htrig.map
index d94779a8..13b36e4a 100644
--- a/MAPS/HMS/DETEC/AERO/haero_htrig.map
+++ b/MAPS/HMS/DETEC/AERO/haero_htrig.map
@@ -7,6 +7,7 @@ DETECTOR=10
ROC=1
SLOT=17
+REFINDEX=3
8, 1, 1, 0 ! hASUM
9, 1, 2, 0 ! hBSUM
10, 1, 3, 0 ! hCSUM
@@ -17,6 +18,8 @@ SLOT=17
15, 1, 8, 0 ! hCERSUM
SLOT=18
+REFINDEX=3
+ 11,1000, 0, 3 ! hFADC_TREF_ROC1
11, 1, 9, 0 ! hFADC_TREF_ROC1
SLOT=2
@@ -27,7 +30,7 @@ REFINDEX=0
3, 2, 4, 1 ! h2Y
4, 2, 5, 1 ! h1T
5, 2, 6, 1 ! h2T
- 6,1000, 0, 0 ! hTref
+ 6,1000, 0, 0 ! hTref1
6, 2, 7, 1 ! hT1
7, 2, 8, 1 ! hASUM
8, 2, 9, 1 ! hBSUM
@@ -36,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
@@ -50,30 +53,49 @@ 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_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
SLOT=20
+REFINDEX=1
+ 127,1000, 0, 1 ! hTref2
127, 2, 17, 1 ! hT2
ROC=3
SLOT=8
- 15, 2, 18, 1 ! hDCREF1
+ 15, 2, 18, 1 ! hDCREF1
SLOT=16
- 63, 2, 19, 1 ! hDCREF2
+ 63, 2, 19, 1 ! hDCREF2
SLOT=4
111, 2, 20, 1 ! hDCREF3
SLOT=13
- 95, 2, 21, 1 ! hDCREF4
+ 95, 2, 21, 1 ! hDCREF4
DETECTOR=12
ROC=1
+SLOT=18
+REFINDEX=3
+ 11,1000, 0, 3 ! hFADC_TREF_ROC1
+
SLOT=16
+REFINDEX=3
8, 1, 1, 1 ! hAER01-
9, 1, 2, 1 ! hAER02-
10, 1, 3, 1 ! hAER03-
@@ -84,6 +106,7 @@ SLOT=16
15, 1, 8, 1 ! hAER08-
SLOT=17
+REFINDEX=3
0, 1, 1, 0 ! hAER01+
1, 1, 2, 0 ! hAER02+
2, 1, 3, 0 ! hAER03+
diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
index ff777c37..47c46a48 100644
--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -54,14 +54,14 @@ REFINDEX=0
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_LO_CER
+ 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
- 58, 2, 42, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map
index 3f7758a2..b3b5827b 100644
--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -54,14 +54,14 @@ REFINDEX=0
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_LO_CER
+ 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
- 58, 2, 42, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/HMS/DETEC/DC/hdc_htrig.map b/MAPS/HMS/DETEC/DC/hdc_htrig.map
index 7d04548a..53455c31 100644
--- a/MAPS/HMS/DETEC/DC/hdc_htrig.map
+++ b/MAPS/HMS/DETEC/DC/hdc_htrig.map
@@ -54,14 +54,14 @@ REFINDEX=0
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_LO_CER
+ 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
- 58, 2, 42, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
index 7c2b057d..106cb040 100644
--- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
@@ -54,14 +54,14 @@ REFINDEX=0
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_LO_CER
+ 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
- 58, 2, 42, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map
index 5cb1c645..7e2c5d39 100644
--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -58,14 +58,14 @@ REFINDEX=0
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_LO_CER
+ 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
- 58, 2, 42, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index b74c6531..1a7a05c2 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -64,14 +64,14 @@ REFINDEX=0
21, 2, 33, 1! pTRIG6
! B1
48, 2, 34, 1! pSTOF
- 49, 2, 35, 1! pEL_LO
- 50, 2, 36, 1! pEL_LO_CER
+ 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
- 58, 2, 42, 1! hEL_LO_CER
+ 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
diff --git a/MAPS/SCALERS/db_HScalevt.dat b/MAPS/SCALERS/db_HScalevt.dat
index 71453635..c908a471 100644
--- a/MAPS/SCALERS/db_HScalevt.dat
+++ b/MAPS/SCALERS/db_HScalevt.dat
@@ -5,14 +5,14 @@ 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 5 19 1 .pEL_HI.scaler SHMS EL_HI
+variable 5 19 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 6 12 1 .PRHI.scaler HMS PRHI
+variable 6 12 2 .PRHI.scalerRate HMS PRHI
variable 3 19 1 .hod.2y7.negScaler HMS 2Y- paddle 7
variable 3 19 2 .hod.2y7.negScalerRate HMS 2Y- paddle 7
-variable 6 11 1 .PSHWRLO.scaler HMS PSHWRLO
-variable 6 11 2 .PSHWRLO.scalerRate HMS PSHWRLO
variable 0 13 1 .hod.1x12.posScaler HMS 1X+ paddle 12
variable 0 13 2 .hod.1x12.posScalerRate HMS 1X+ paddle 12
variable 0 29 1 .hod.1x12.negScaler HMS 1X- paddle 12
@@ -21,8 +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 5 27 1 .hEL_HI.scaler HMS EL_HI
+variable 5 27 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
@@ -85,8 +85,8 @@ 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 5 25 1 .hEL_LO.scaler HMS EL_LO
-variable 5 25 2 .hEL_LO.scalerRate HMS EL_LO
+variable 5 26 1 .hEL_LO.scaler HMS EL_LO
+variable 5 26 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
@@ -106,10 +106,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 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 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 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,16 +118,16 @@ 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 5 6 1 .Empty_25.scaler Empty
+variable 5 6 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 5 7 1 .Empty_26.scaler Empty
+variable 5 7 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
variable 3 21 2 .hod.2y4.negScalerRate HMS 2Y- paddle 4
variable 3 5 1 .hod.2y4.posScaler HMS 2Y+ paddle 4
@@ -140,16 +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 5 29 1 .hEL_CLEAN.scaler HMS EL_CLEAN
+variable 5 29 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 5 20 1 .pEL_REAL.scaler SHMS EL_REAL
+variable 5 20 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
@@ -162,6 +162,8 @@ variable 1 22 1 .hod.1y6.negScaler HMS 1Y- paddle 6
variable 1 22 2 .hod.1y6.negScalerRate HMS 1Y- paddle 6
variable 0 21 1 .hod.1x4.negScaler HMS 1X- paddle 4
variable 0 21 2 .hod.1x4.negScalerRate HMS 1X- paddle 4
+variable 5 25 1 .hEL_LO_LO.scaler HMS EL_LO_LO
+variable 5 25 2 .hEL_LO_LO.scalerRate HMS EL_LO_LO
variable 2 29 1 .hod.2x12.negScaler HMS 2X- paddle 12
variable 2 29 2 .hod.2x12.negScalerRate HMS 2X- paddle 12
variable 2 13 1 .hod.2x12.posScaler HMS 2X+ paddle 12
@@ -184,24 +186,22 @@ variable 3 24 1 .hod.2y9.negScaler HMS 2Y- paddle 9
variable 3 24 2 .hod.2y9.negScalerRate HMS 2Y- paddle 9
variable 3 8 1 .hod.2y9.posScaler HMS 2Y+ paddle 9
variable 3 8 2 .hod.2y9.posScalerRate HMS 2Y+ paddle 9
-variable 5 14 1 .hTRIG5.scaler HMS TRIG5
-variable 5 14 2 .hTRIG5.scalerRate HMS TRIG5
-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 12 1 .hTRIG3.scaler HMS TRIG3
-variable 5 12 2 .hTRIG3.scalerRate HMS TRIG3
-variable 5 11 1 .hTRIG2.scaler HMS TRIG2
-variable 5 11 2 .hTRIG2.scalerRate HMS TRIG2
-variable 6 15 1 .CERSUM.scaler HMS CERSUM
-variable 6 15 2 .CERSUM.scalerRate HMS CERSUM
+variable 5 14 1 .hTRIG5.scaler HMS TRIG5
+variable 5 14 2 .hTRIG5.scalerRate HMS TRIG5
+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 12 1 .hTRIG3.scaler HMS TRIG3
+variable 5 12 2 .hTRIG3.scalerRate HMS TRIG3
+variable 5 11 1 .hTRIG2.scaler HMS TRIG2
+variable 5 11 2 .hTRIG2.scalerRate HMS TRIG2
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 5 20 1 .pEL_CLEAN.scaler SHMS EL_CLEAN
-variable 5 20 2 .pEL_CLEAN.scalerRate SHMS EL_CLEAN
+variable 5 21 1 .pEL_CLEAN.scaler SHMS EL_CLEAN
+variable 5 21 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
@@ -222,26 +222,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 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 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 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 +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 5 8 1 .Empty_27.scaler Empty
+variable 5 8 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 +272,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 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
variable 1 23 2 .hod.1y8.negScalerRate HMS 1Y- paddle 8
variable 1 7 1 .hod.1y8.posScaler HMS 1Y+ paddle 8
@@ -292,6 +292,8 @@ variable 0 18 1 .hod.1x5.negScaler HMS 1X- paddle 5
variable 0 18 2 .hod.1x5.negScalerRate HMS 1X- paddle 5
variable 0 2 1 .hod.1x5.posScaler HMS 1X+ paddle 5
variable 0 2 2 .hod.1x5.posScalerRate HMS 1X+ paddle 5
+variable 5 17 1 .pEL_LO_LO.scaler SHMS EL_LO_LO
+variable 5 17 2 .pEL_LO_LO.scalerRate SHMS EL_LO_LO
variable 1 28 1 .hod.1y10.negScaler HMS 1Y- paddle 10
variable 1 28 2 .hod.1y10.negScalerRate HMS 1Y- paddle 10
variable 1 12 1 .hod.1y10.posScaler HMS 1Y+ paddle 10
@@ -308,8 +310,6 @@ variable 5 2 1 .pTRIG3.scaler SHMS TRIG3
variable 5 2 2 .pTRIG3.scalerRate SHMS TRIG3
variable 5 1 1 .pTRIG2.scaler SHMS TRIG2
variable 5 1 2 .pTRIG2.scalerRate SHMS TRIG2
-variable 6 13 1 .SHWR.scaler HMS SHWR
-variable 6 13 2 .SHWR.scalerRate HMS SHWR
variable 2 10 1 .hod.2x13.posScaler HMS 2X+ paddle 13
variable 2 10 2 .hod.2x13.posScalerRate HMS 2X+ paddle 13
variable 3 16 1 .hod.2y1.negScaler HMS 2Y- paddle 1
@@ -346,8 +346,8 @@ 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 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
@@ -360,16 +360,24 @@ variable 3 4 1 .hod.2y2.posScaler HMS 2Y+ paddle 2
variable 3 4 2 .hod.2y2.posScalerRate HMS 2Y+ paddle 2
variable 2 28 1 .hod.2x10.negScaler HMS 2X- paddle 10
variable 2 28 2 .hod.2x10.negScalerRate HMS 2X- paddle 10
-variable 6 12 1 .PSHWRHI.scaler HMS PSHWRHI
-variable 6 12 2 .PSHWRHI.scalerRate HMS PSHWRHI
+variable 6 13 1 .SHLO.scaler HMS SHLO
+variable 6 13 2 .SHLO.scalerRate HMS SHLO
+variable 6 15 1 .CER.scaler HMS CER
+variable 6 15 2 .CER.scalerRate HMS CER
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 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 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 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
diff --git a/MAPS/SCALERS/db_PScalevt.dat b/MAPS/SCALERS/db_PScalevt.dat
index 6eeb1aa9..d426fa0f 100644
--- a/MAPS/SCALERS/db_PScalevt.dat
+++ b/MAPS/SCALERS/db_PScalevt.dat
@@ -12,8 +12,10 @@ 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 6 28 1 .hEL_CLEAN.scaler HMS EL_CLEAN
-variable 6 28 2 .hEL_CLEAN.scalerRate HMS EL_CLEAN
+variable 6 29 1 .hEL_CLEAN.scaler HMS EL_CLEAN
+variable 6 29 2 .hEL_CLEAN.scalerRate HMS EL_CLEAN
+variable 7 11 1 .PRLO.scaler SHMS PRLO
+variable 7 11 2 .PRLO.scalerRate SHMS PRLO
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
@@ -26,20 +28,12 @@ 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 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 6 25 1 .hEL_LO_LO.scaler HMS EL_LO_LO
+variable 6 25 2 .hEL_LO_LO.scalerRate HMS EL_LO_LO
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
@@ -72,30 +66,32 @@ 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 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 3 27 1 .hod.2y15.posScaler SHMS 2y+ paddle 15
variable 3 27 2 .hod.2y15.posScalerRate SHMS 2y+ paddle 15
-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 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 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
variable 1 10 2 .hod.1y13.negScalerRate SHMS 1Y- paddle 13
variable 1 26 1 .hod.1y13.posScaler SHMS 1Y+ paddle 13
variable 1 26 2 .hod.1y13.posScalerRate SHMS 1Y+ paddle 13
+variable 7 12 1 .PRHI.scaler SHMS PRHI
+variable 7 12 2 .PRHI.scalerRate SHMS PRHI
variable 1 3 1 .hod.1y7.negScaler SHMS 1Y- paddle 7
variable 1 3 2 .hod.1y7.negScalerRate SHMS 1Y- paddle 7
variable 1 19 1 .hod.1y7.posScaler SHMS 1Y+ paddle 7
@@ -107,8 +103,10 @@ 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 6 6 1 .Empty.scaler Empty
-variable 6 6 2 .Empty.scalerRate Empty
+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
@@ -127,14 +125,14 @@ 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 6 8 1 .Empty_3.scaler Empty
-variable 6 8 2 .Empty_3.scalerRate Empty
+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
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 0 15 1 .Empty_7.scaler Empty
-variable 0 15 2 .Empty_7.scalerRate Empty
+variable 1 27 1 .Empty_7.scaler Empty
+variable 1 27 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
@@ -151,8 +149,8 @@ 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 6 19 1 .pEL_REAL.scaler SHMS EL_REAL
-variable 6 19 2 .pEL_REAL.scalerRate SHMS EL_REAL
+variable 6 20 1 .pEL_REAL.scaler SHMS EL_REAL
+variable 6 20 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 6 11 1 .hTRIG2.scaler HMS TRIG2
@@ -165,22 +163,18 @@ 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 12 1 .Empty_54.scaler Empty
-variable 7 12 2 .Empty_54.scalerRate Empty
+variable 7 20 1 .Empty_54.scaler Empty
+variable 7 20 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 31 1 .Empty_52.scaler Empty
-variable 6 31 2 .Empty_52.scalerRate Empty
+variable 7 18 1 .Empty_52.scaler Empty
+variable 7 18 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
@@ -191,12 +185,16 @@ 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
variable 7 0 2 .S1X.scalerRate SHMS S1X
variable 7 1 1 .S1Y.scaler SHMS S1Y
variable 7 1 2 .S1Y.scalerRate SHMS S1Y
variable 1 8 1 .hod.1y9.negScaler SHMS 1Y- paddle 9
variable 1 8 2 .hod.1y9.negScalerRate SHMS 1Y- paddle 9
+variable 7 8 1 .HCER.scaler SHMS HGC
+variable 7 8 2 .HCER.scalerRate SHMS HGC
variable 1 24 1 .hod.1y9.posScaler SHMS 1Y+ paddle 9
variable 1 24 2 .hod.1y9.posScalerRate SHMS 1Y+ paddle 9
variable 1 22 1 .hod.1y6.posScaler SHMS 1Y+ paddle 6
@@ -207,38 +205,36 @@ 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 6 21 1 .pEL_CLEAN.scaler SHMS EL_CLEAN
+variable 6 21 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 6 7 1 .Empty_2.scaler Empty
-variable 6 7 2 .Empty_2.scalerRate Empty
+variable 0 14 1 .Empty_2.scaler Empty
+variable 0 14 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 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 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 6 14 1 .hTRIG5.scaler HMS TRIG5
variable 6 14 2 .hTRIG5.scalerRate HMS TRIG5
variable 6 13 1 .hTRIG4.scaler HMS TRIG4
@@ -257,8 +253,8 @@ variable 2 23 1 .hod.2x8.negScaler SHMS 2X- paddle 8
variable 2 23 2 .hod.2x8.negScalerRate SHMS 2X- paddle 8
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 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
@@ -283,38 +279,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 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 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 0 0 1 .hod.1x1.posScaler SHMS 1X+ paddle 1
variable 0 0 2 .hod.1x1.posScalerRate SHMS 1X+ paddle 1
-variable 6 21 1 .Empty_47.scaler Empty
-variable 6 21 2 .Empty_47.scalerRate Empty
+variable 7 13 1 .Empty_47.scaler Empty
+variable 7 13 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 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 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 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 2 27 1 .Empty_19.scaler Empty
-variable 2 27 2 .Empty_19.scalerRate Empty
+variable 4 23 1 .Empty_19.scaler Empty
+variable 4 23 2 .Empty_19.scalerRate Empty
+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 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 +323,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 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 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 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
@@ -351,24 +347,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 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 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 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
@@ -403,28 +399,30 @@ 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 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 6 27 1 .hEL_HI.scaler HMS EL_HI
+variable 6 27 2 .hEL_HI.scalerRate HMS EL_HI
+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 17 1 .pEL_LO_LO.scaler SHMS EL_LO_LO
+variable 6 17 2 .pEL_LO_LO.scalerRate SHMS EL_LO_LO
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
@@ -435,40 +433,34 @@ 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 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 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 0 6 1 .hod.1x6.posScaler SHMS 1X+ paddle 6
variable 0 6 2 .hod.1x6.posScalerRate SHMS 1X+ paddle 6
-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 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 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
+variable 6 28 2 .hEL_REAL.scalerRate HMS EL_REAL
variable 3 4 1 .hod.2y2.negScaler SHMS 2y- paddle 2
variable 3 4 2 .hod.2y2.negScalerRate SHMS 2y- paddle 2
-variable 4 7 1 .Empty_34.scaler Empty
-variable 4 7 2 .Empty_34.scalerRate Empty
+variable 4 11 1 .Empty_34.scaler Empty
+variable 4 11 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 7 9 1 .NCER.scaler SHMS NGC
+variable 7 9 2 .NCER.scalerRate SHMS NGC
variable 2 18 1 .hod.2x5.negScaler SHMS 2X- paddle 5
variable 2 18 2 .hod.2x5.negScalerRate SHMS 2X- paddle 5
variable 2 2 1 .hod.2x5.posScaler SHMS 2X+ paddle 5
diff --git a/MAPS/SCALERS/scaler.map b/MAPS/SCALERS/scaler.map
index cf63d61c..7862bfc5 100755
--- a/MAPS/SCALERS/scaler.map
+++ b/MAPS/SCALERS/scaler.map
@@ -200,34 +200,33 @@ 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
+12/6 0 4 5 6 1 -1 Empty
+12/7 0 4 5 7 1 -1 Empty
+12/8 0 4 5 8 1 -1 Empty
+12/9 0 4 5 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
+pEL_LO_LO 0 4 5 17 1 -1 SHMS EL_LO_LO
+pEL_LO 0 4 5 18 1 -1 SHMS EL_LO
+pEL_HI 0 4 5 19 1 -1 SHMS EL_HI
+pEL_REAL 0 4 5 20 1 -1 SHMS EL_REAL
+pEL_CLEAN 0 4 5 21 1 -1 SHMS EL_CLEAN
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
+hEL_LO_LO 0 4 5 25 1 -1 HMS EL_LO_LO
+hEL_LO 0 4 5 26 1 -1 HMS EL_LO
+hEL_HI 0 4 5 27 1 -1 HMS EL_HI
+hEL_REAL 0 4 5 28 1 -1 HMS EL_REAL
+hEL_CLEAN 0 4 5 29 1 -1 HMS EL_CLEAN
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
S1Y 0 4 6 1 1 -1 HMS S1Y
@@ -240,11 +239,11 @@ 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
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
+PRLO 0 4 6 11 1 -1 HMS PRLO
+PRHI 0 4 6 12 1 -1 HMS PRHI
+SHLO 0 4 6 13 1 -1 HMS SHLO
EDTM 0 4 6 14 1 -1 HMS EDTM
-CERSUM 0 4 6 15 1 -1 HMS CERSUM
+CER 0 4 6 15 1 -1 HMS CER
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
@@ -473,21 +472,21 @@ 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
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
+pEL_LO_LO 0 5 6 17 1 -1 SHMS EL_LO_LO
+pEL_LO 0 5 6 18 1 -1 SHMS EL_LO
+pEL_HI 0 5 6 19 1 -1 SHMS EL_HI
+pEL_REAL 0 5 6 20 1 -1 SHMS EL_REAL
+pEL_CLEAN 0 5 6 21 1 -1 SHMS EL_CLEAN
12/22 0 5 6 22 1 -1 Empty
12/23 0 5 6 23 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
+hEL_LO_LO 0 5 6 25 1 -1 HMS EL_LO_LO
+hEL_LO 0 5 6 26 1 -1 HMS EL_LO
+hEL_HI 0 5 6 27 1 -1 HMS EL_HI
+hEL_REAL 0 5 6 28 1 -1 HMS EL_REAL
+hEL_CLEAN 0 5 6 29 1 -1 HMS EL_CLEAN
+12/29 0 5 6 30 1 -1 Empty
+12/30 0 5 6 31 1 -1 Empty
# desc hel crate slot start nchan page long-description
S1X 0 5 7 0 1 -1 SHMS S1X
@@ -498,11 +497,11 @@ S1XS1Y 0 5 7 4 1 -1 SHMS S1T
S2XS2Y 0 5 7 5 1 -1 SHMS S2T
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
+HCER 0 5 7 8 1 -1 SHMS HGC
+NCER 0 5 7 9 1 -1 SHMS NGC
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
+PRLO 0 5 7 11 1 -1 SHMS PRLO
+PRHI 0 5 7 12 1 -1 SHMS PRHI
13/13 0 5 7 13 1 -1 Empty
13/14 0 5 7 14 1 -1 Empty
13/15 0 5 7 15 1 -1 Empty
diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
index 5bbd5209..a1a49744 100644
--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -34,28 +34,32 @@ REFINDEX=0
40, 2, 11, 1 ! pHGCERSUM
41, 2, 12, 1 ! pNGCERSUM
42, 2, 23, 1 ! pEDTM
- 48, 2, 24, 1 ! pTRIG1
- 49, 2, 25, 1 ! pTRIG2
- 50, 2, 26, 1 ! pTRIG3
- 51, 2, 27, 1 ! pTRIG4
- 52, 2, 28, 1 ! pTRIG5
- 53, 2, 29, 1 ! pTRIG6
- 58, 2, 30, 1 ! hTRIG1
- 59, 2, 31, 1 ! hTRIG2
- 60, 2, 32, 1 ! hTRIG3
- 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
+ 43, 2, 24, 1 ! pPRSHWRLO
+ 44, 2, 25, 1 ! pPRSHWRHI
+ 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
ROC=6
diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
index 7c8e6dae..b425d26c 100644
--- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
+++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
@@ -49,14 +49,14 @@ REFINDEX=0
62, 2, 36, 1 ! hTRIG5
63, 2, 37, 1 ! hTRIG6
64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO
- 66, 2, 40, 1 ! pEL_LO_CER
+ 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
- 74, 2, 46, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
index c3662816..a69c36d4 100644
--- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
+++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
@@ -49,14 +49,14 @@ REFINDEX=0
62, 2, 36, 1 ! hTRIG5
63, 2, 37, 1 ! hTRIG6
64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO
- 66, 2, 40, 1 ! pEL_LO_CER
+ 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
- 74, 2, 46, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
index a514fb6d..08b08ef8 100644
--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -49,14 +49,14 @@ REFINDEX=0
62, 2, 36, 1 ! hTRIG5
63, 2, 37, 1 ! hTRIG6
64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO
- 66, 2, 40, 1 ! pEL_LO_CER
+ 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
- 74, 2, 46, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
index 07df6fc8..d4e58afd 100644
--- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
@@ -49,14 +49,14 @@ REFINDEX=0
62, 2, 36, 1 ! hTRIG5
63, 2, 37, 1 ! hTRIG6
64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO
- 66, 2, 40, 1 ! pEL_LO_CER
+ 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
- 74, 2, 46, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
index 1fc53393..d1913eab 100644
--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -49,14 +49,14 @@ REFINDEX=0
62, 2, 36, 1 ! hTRIG5
63, 2, 37, 1 ! hTRIG6
64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO
- 66, 2, 40, 1 ! pEL_LO_CER
+ 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
- 74, 2, 46, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map
index a75585c0..9d94b46c 100644
--- a/MAPS/SHMS/DETEC/STACK/shms_stack.map
+++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map
@@ -55,14 +55,14 @@ REFINDEX=0
62, 2, 36, 1 ! hTRIG5
63, 2, 37, 1 ! hTRIG6
64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO
- 66, 2, 40, 1 ! pEL_LO_CER
+ 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
- 74, 2, 46, 1 ! hEL_LO_CER
+ 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
diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map
index e050a080..32bf4f69 100644
--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -47,14 +47,14 @@ REFINDEX=0
62, 2, 36, 1 ! hTRIG5
63, 2, 37, 1 ! hTRIG6
64, 2, 38, 1 ! pSTOF
- 65, 2, 39, 1 ! pEL_LO
- 66, 2, 40, 1 ! pEL_LO_CER
+ 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
- 74, 2, 46, 1 ! hEL_LO_CER
+ 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
diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param
index c8fa837b..c3192d25 100644
--- a/PARAM/TRIG/tcoin.param
+++ b/PARAM/TRIG/tcoin.param
@@ -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 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 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 pPRSHWRLO pPRSHWRHI 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_LO_CER_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_ROC2 hEL_LO_CER_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_ROC1 pEL_LO_CER_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_ROC1 hEL_LO_CER_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
+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 pPRSHWRLO pPRSHWRHI 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"
diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param
index 58cdb625..66c6615d 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -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 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 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_LO_CER pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO hEL_LO_CER 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
+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_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
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index 863e9956..c332262a 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -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 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 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRSHWRLO pPRSHWRHI pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO pEL_LO_CER pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO hEL_LO_CER 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
+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 pPRSHWRLO pPRSHWRHI 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"
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
index fbc4d028..a975bdc3 100644
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
+++ b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
@@ -1,4 +1,4 @@
-Run #{gen_run_number}
+Run # : {gen_run_number}
**************************
* General Run Information
@@ -25,13 +25,6 @@ BCM1 Counts: {H.BCM1.scalerCut} Total Charge: {H.BCM1.scalerChargeCut:%.3f} uC
BCM2 Counts: {H.BCM2.scalerCut} Total Charge: {H.BCM2.scalerChargeCut:%.3f} uC
Unser Counts: {H.Unser.scalerCut} Total Charge: {H.Unser.scalerChargeCut:%.3f} uC
-{hdc_plane_names}
-Horizontal drift chamber z positions:
-Chamber 1: {hdc_zpos[0]:%6.2f} {hdc_zpos[1]:%6.2f} {hdc_zpos[2]:%6.2f}
- {hdc_zpos[3]:%6.2f} {hdc_zpos[4]:%6.2f} {hdc_zpos[5]:%6.2f}
-Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
- {hdc_zpos[9]:%6.2f} {hdc_zpos[10]:%6.2f} {hdc_zpos[11]:%6.2f}
-
********************
* DAQ Configuration
********************
@@ -43,9 +36,13 @@ Ps4_factor = {ghconfig_ti_ps_factors[3]}
Ps5_factor = {ghconfig_ti_ps_factors[4]}
Ps6_factor = {ghconfig_ti_ps_factors[5]}
-***************
-* 3/4 Triggers
-***************
+***********
+* Triggers
+***********
+
+=:=:=:=:=:=:=:=:
+= 3/4 Triggers
+=:=:=:=:=:=:=:=:
HMS 3/4 Triggers : {H.hTRIG1.scaler} [ {H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]} ]
Estimated HMS 3/4 Triggers : {H.hTRIG1.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
@@ -56,36 +53,87 @@ HMS Event Types : {HMS_Pretrig.npassed}
HMS Computer Live Time : {(TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
HMS Computer Dead Time : {100.0 - (TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-*************
-* MORE TRIGGERS
-**************
-HMS TRIG
-hEL_LO : {H.hEL_LO.scaler} [{H.hEL_LO.scaler/H.1Mhz.scalerTime}]
-hEL_HI : {H.hEL_HI.scaler} [{H.hEL_HI.scaler/H.1Mhz.scalerTime}]
-hEL_REAL : {H.hEL_REAL.scaler} [{H.hEL_REAL.scaler/H.1Mhz.scalerTime}]
-hEL_CLEAN : {H.hEL_CLEAN.scaler} [{H.hEL_CLEAN.scaler/H.1Mhz.scalerTime}]
-hSTOF: {H.hSTOF.scaler} [{H.hSTOF.scaler/H.1Mhz.scalerTime}]
-
-hTRIG1: {H.hTRIG1.scaler} [{H.hTRIG1.scaler/H.1Mhz.scalerTime}]
-hTRIG2: {H.hTRIG2.scaler} [{H.hTRIG2.scaler/H.1Mhz.scalerTime}]
-hTRIG3: {H.hTRIG3.scaler} [{H.hTRIG3.scaler/H.1Mhz.scalerTime}]
-hTRIG4: {H.hTRIG4.scaler} [{H.hTRIG4.scaler/H.1Mhz.scalerTime}]
-hTRIG5: {H.hTRIG5.scaler} [{H.hTRIG5.scaler/H.1Mhz.scalerTime}]
-hTRIG6: {H.hTRIG6.scaler} [{H.hTRIG6.scaler/H.1Mhz.scalerTime}]
-
-SHMS TRIG
-pEL_LO : {H.pEL_LO.scaler} [{H.pEL_LO.scaler/H.1Mhz.scalerTime}]
-pEL_HI : {H.pEL_HI.scaler} [{H.pEL_HI.scaler/H.1Mhz.scalerTime}]
-pEL_REAL : {H.pEL_REAL.scaler} [{H.pEL_REAL.scaler/H.1Mhz.scalerTime}]
-pEL_CLEAN : {H.pEL_CLEAN.scaler} [{H.pEL_CLEAN.scaler/H.1Mhz.scalerTime}]
-pSTOF: {H.pSTOF.scaler} [{H.pSTOF.scaler/H.1Mhz.scalerTime}]
-
-pTRIG1: {H.pTRIG1.scaler} [{H.pTRIG1.scaler/H.1Mhz.scalerTime}]
-pTRIG2: {H.pTRIG2.scaler} [{H.pTRIG2.scaler/H.1Mhz.scalerTime}]
-pTRIG3: {H.pTRIG3.scaler} [{H.pTRIG3.scaler/H.1Mhz.scalerTime}]
-pTRIG4: {H.pTRIG4.scaler} [{H.pTRIG4.scaler/H.1Mhz.scalerTime}]
-pTRIG5: {H.pTRIG5.scaler} [{H.pTRIG5.scaler/H.1Mhz.scalerTime}]
-pTRIG6: {H.pTRIG6.scaler} [{H.pTRIG6.scaler/H.1Mhz.scalerTime}]
+=:=:=:=:=:=:=:=:=:=:=:=:
+= Physics 3/4 Triggers
+=:=:=:=:=:=:=:=:=:=:=:=:
+
+Physics Triggers : {H.hTRIG1.scaler - H.EDTM.scaler}
+Estimated Physics Triggers : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
+Physics Trigger Rate : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
+Accepted Physics Triggers : {physics_accepted.npassed}
+
+=:=:=:=:=:=:=:=:
+= HMS Triggers
+=:=:=:=:=:=:=:=:
+
+hEL_LO_LO : {H.hEL_LO_LO.scaler} [ {(H.hEL_LO_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_LO : {H.hEL_LO.scaler} [ {(H.hEL_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_HI : {H.hEL_HI.scaler} [ {(H.hEL_HI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_REAL : {H.hEL_REAL.scaler} [ {(H.hEL_REAL.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_CLEAN : {H.hEL_CLEAN.scaler} [ {(H.hEL_CLEAN.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hSTOF : {H.hSTOF.scaler} [ {(H.hSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+hTRIG1 : {H.hTRIG1.scaler} [ {(H.hTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG2 : {H.hTRIG2.scaler} [ {(H.hTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG3 : {H.hTRIG3.scaler} [ {(H.hTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG4 : {H.hTRIG4.scaler} [ {(H.hTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG5 : {H.hTRIG5.scaler} [ {(H.hTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG6 : {H.hTRIG6.scaler} [ {(H.hTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:=:=:=:=:
+= SHMS Triggers
+=:=:=:=:=:=:=:=:
+
+pEL_LO_LO : {H.pEL_LO_LO.scaler} [ {(H.pEL_LO_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_LO : {H.pEL_LO.scaler} [ {(H.pEL_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_HI : {H.pEL_HI.scaler} [ {(H.pEL_HI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_REAL : {H.pEL_REAL.scaler} [ {(H.pEL_REAL.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_CLEAN : {H.pEL_CLEAN.scaler} [ {(H.pEL_CLEAN.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pSTOF : {H.pSTOF.scaler} [ {(H.pSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+pTRIG1 : {H.pTRIG1.scaler} [ {(H.pTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG2 : {H.pTRIG2.scaler} [ {(H.pTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG3 : {H.pTRIG3.scaler} [ {(H.pTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG4 : {H.pTRIG4.scaler} [ {(H.pTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG5 : {H.pTRIG5.scaler} [ {(H.pTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG6 : {H.pTRIG6.scaler} [ {(H.pTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:
+= EDTM
+=:=:=:=:
+
+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.EDTM.scaler)*100.0:%3.4f} %
+Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
+
+=:=:=:=:=:=:=:
+= Hodoscopes
+=:=:=:=:=:=:=:
+
+H1X : {H.S1X.scaler} [ {(H.S1X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1X
+H1Y : {H.S1Y.scaler} [ {(H.S1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1Y
+H2X : {H.S2X.scaler} [ {(H.S2X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2X
+H2Y : {H.S2Y.scaler} [ {(H.S2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2Y
+
+H1XH1Y : {H.S1XS1Y.scaler} [ {(H.S1XS1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between H1X and H1Y planes
+H2XH2Y : {H.S2XS2Y.scaler} [ {(H.S2XS2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between H2X and H2Y planes
+
+=:=:=:=:=:=:
+= CER, CAL
+=:=:=:=:=:=:
+
+CER : {H.CER.scaler} [ {(H.CER.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRLO : {H.PRLO.scaler} [ {(H.PRLO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRHI : {H.PRHI.scaler} [ {(H.PRHI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+SHLO : {H.SHLO.scaler} [ {(H.SHLO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+ASUM : {H.ASUM.scaler} [ {(H.ASUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+BSUM : {H.BSUM.scaler} [ {(H.BSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+CSUM : {H.CSUM.scaler} [ {(H.CSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+DSUM : {H.DSUM.scaler} [ {(H.DSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
****************
* Chamber Hits *
@@ -196,6 +244,7 @@ cer_pi: {cer_pi.npassed}
*****************************
*HMS TRACKING EFFICIENCIES *
*****************************
+
htrig : {hms_trigs.npassed}
hhitslt = passed hits/cham : {hmsHitsLt.npassed}
hhitsplanes = +planes >= 5/6 : {hmsHitsPlanes.npassed}
@@ -223,7 +272,7 @@ SING FID TRACK EFFIC : {HMSScinDid.npassed/(HMSScinShould.npassed+0.
E SING FID TRACK EFFIC : {HMSScinDide.npassed/(HMSScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShoulde.npassed-HMSScinDide.npassed)/(HMSScinShoulde.npassed+.0001)):%8.4f}
HADRON SING FID TRACK EFFIC : {HMSScinDidh.npassed/(HMSScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShouldh.npassed-HMSScinDidh.npassed)/(HMSScinShouldh.npassed+.0001)):%8.4f}
-************
+****************
* HGC Cerenkov *
****************
@@ -241,6 +290,7 @@ Overall HGC Efficiency: {HMS_hcer_track_fired_tot.npassed/HMS_hcer_track_matched
****************************
* Calorimeter Efficiencies *
****************************
+
Efficiencies for calorimeter is the fraction of times block was hit when track
with chisquared/dof < {hstat_cal_maxchisq:%5.1f} came within {hstat_cal_slop:%4.1f} cm of the center.
and scal_npe_sum > 3.0 (hardwired). (is this still true?)
@@ -260,6 +310,7 @@ hD Counts: {H.cal.stat_trksum4} eff : {H.cal.stat_hitsum4 / H.cal.stat_trks
**************************
* Hodoscope Efficiencies *
**************************
+
Efficiencies for hodoscopes is the fraction of times scin. was hit when track
with chisquared/dof < {hstat_maxchisq:%5.1f} came within {hstat_slop:%4.1f} cm of the center.
@@ -343,7 +394,10 @@ H2Y10 {hhodo_pos_eff[39]} {hhodo_neg_eff[39]} {hhodo_or_eff[39]} {
* Hardware Scalers
*******************
-*HODOSCOPES*
+=:=:=:=:=:=:=:=:
+= HODOSCOPES
+=:=:=:=:=:=:=:=:
+
Scint Counts Rate
H1X1+: {H.hod.1x1.posScaler} [ {(H.hod.1x1.posScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
H1X2+: {H.hod.1x2.posScaler} [ {(H.hod.1x2.posScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
@@ -455,26 +509,4 @@ H2Y6-: {H.hod.2y6.negScaler} [ {(H.hod.2y6.negScaler/H.1Mhz.scalerTime)/1000.:%
H2Y7-: {H.hod.2y7.negScaler} [ {(H.hod.2y7.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
H2Y8-: {H.hod.2y8.negScaler} [ {(H.hod.2y8.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
H2Y9-: {H.hod.2y9.negScaler} [ {(H.hod.2y9.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-H2Y10-: {H.hod.2y10.negScaler} [ {(H.hod.2y10.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-
-H1X: {H.S1X.scaler} [ {(H.S1X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1X
-H1Y: {H.S1Y.scaler} [ {(H.S1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1Y
-H2X: {H.S2X.scaler} [ {(H.S2X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2X
-H2Y: {H.S2Y.scaler} [ {(H.S2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2Y
-H1XH1Y: {H.S1XS1Y.scaler} [{(H.S1XS1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f}] AND between H1X and H1Y planes
-H2XH2Y: {H.S2XS2Y.scaler} [{(H.S2XS2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f}] OR between H2X and H2Y planes (just for kpp, will be AND)
-
-*Cerenkov*
-CERSUM: {H.CERSUM.scaler} [{(H.CERSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-
-*Calorimeter*
-PRESHOWERLO: {H.PSHWRLO.scaler} [{(H.PSHWRLO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-PRESHOWERHI: {H.PSHWRHI.scaler} [{(H.PSHWRHI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-SHWR: {H.SHWR.scaler} [{(H.SHWR.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-ASUM: {H.ASUM.scaler} [{(H.ASUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-BSUM: {H.BSUM.scaler} [{(H.BSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-CSUM: {H.CSUM.scaler} [{(H.CSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-DSUM: {H.DSUM.scaler} [{(H.DSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz]
-
-
-
+H2Y10-: {H.hod.2y10.negScaler} [ {(H.hod.2y10.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
\ No newline at end of file
diff --git a/TEMPLATES/HMS/SCALERS/hscalers.template b/TEMPLATES/HMS/SCALERS/hscalers.template
index 61507a4d..223c9b5b 100644
--- a/TEMPLATES/HMS/SCALERS/hscalers.template
+++ b/TEMPLATES/HMS/SCALERS/hscalers.template
@@ -1,4 +1,5 @@
-Run #: {gen_run_number}
+Run # : {gen_run_number}
+
**************************
* General Run Information
**************************
@@ -39,6 +40,10 @@ Ps6_factor = {ghconfig_ti_ps_factors[5]}
* Triggers
***********
+=:=:=:=:=:=:=:=:
+= 3/4 Triggers
+=:=:=:=:=:=:=:=:
+
HMS 3/4 Triggers : {H.hTRIG1.scaler} [ {H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]} ]
Estimated HMS 3/4 Triggers : {H.hTRIG1.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
HMS 3/4 Trigger Rate : {H.hTRIG1.scalerRate/1000.:%.3f} kHz
@@ -48,40 +53,54 @@ HMS Event Types : {HMS_Pretrig.npassed}
HMS Computer Live Time : {(TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
HMS Computer Dead Time : {100.0 - (TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-**************
-* MORE TRIGGERS
-**************
-HMS TRIG
-hEL_LO : {H.hEL_LO.scaler} [{H.hEL_LO.scaler/H.1Mhz.scalerTime}]
-hEL_HI : {H.hEL_HI.scaler} [{H.hEL_HI.scaler/H.1Mhz.scalerTime}]
-hEL_REAL : {H.hEL_REAL.scaler} [{H.hEL_REAL.scaler/H.1Mhz.scalerTime}]
-hEL_CLEAN : {H.hEL_CLEAN.scaler} [{H.hEL_CLEAN.scaler/H.1Mhz.scalerTime}]
-hSTOF: {H.hSTOF.scaler} [{H.hSTOF.scaler/H.1Mhz.scalerTime}]
-
-hTRIG1: {H.hTRIG1.scaler} [{H.hTRIG1.scaler/H.1Mhz.scalerTime}]
-hTRIG2: {H.hTRIG2.scaler} [{H.hTRIG2.scaler/H.1Mhz.scalerTime}]
-hTRIG3: {H.hTRIG3.scaler} [{H.hTRIG3.scaler/H.1Mhz.scalerTime}]
-hTRIG4: {H.hTRIG4.scaler} [{H.hTRIG4.scaler/H.1Mhz.scalerTime}]
-hTRIG5: {H.hTRIG5.scaler} [{H.hTRIG5.scaler/H.1Mhz.scalerTime}]
-hTRIG6: {H.hTRIG6.scaler} [{H.hTRIG6.scaler/H.1Mhz.scalerTime}]
-
-SHMS TRIG
-pEL_LO : {H.pEL_LO.scaler} [{H.pEL_LO.scaler/H.1Mhz.scalerTime}]
-pEL_HI : {H.pEL_HI.scaler} [{H.pEL_HI.scaler/H.1Mhz.scalerTime}]
-pEL_REAL : {H.pEL_REAL.scaler} [{H.pEL_REAL.scaler/H.1Mhz.scalerTime}]
-pEL_CLEAN : {H.pEL_CLEAN.scaler} [{H.pEL_CLEAN.scaler/H.1Mhz.scalerTime}]
-pSTOF: {H.pSTOF.scaler} [{H.pSTOF.scaler/H.1Mhz.scalerTime}]
-
-pTRIG1: {H.pTRIG1.scaler} [{H.pTRIG1.scaler/H.1Mhz.scalerTime}]
-pTRIG2: {H.pTRIG2.scaler} [{H.pTRIG2.scaler/H.1Mhz.scalerTime}]
-pTRIG3: {H.pTRIG3.scaler} [{H.pTRIG3.scaler/H.1Mhz.scalerTime}]
-pTRIG4: {H.pTRIG4.scaler} [{H.pTRIG4.scaler/H.1Mhz.scalerTime}]
-pTRIG5: {H.pTRIG5.scaler} [{H.pTRIG5.scaler/H.1Mhz.scalerTime}]
-pTRIG6: {H.pTRIG6.scaler} [{H.pTRIG6.scaler/H.1Mhz.scalerTime}]
-
-*******
-* EDTM
-*******
+=:=:=:=:=:=:=:=:=:=:=:=:
+= Physics 3/4 Triggers
+=:=:=:=:=:=:=:=:=:=:=:=:
+
+Physics Triggers : {H.hTRIG1.scaler - H.EDTM.scaler}
+Estimated Physics Triggers : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
+Physics Trigger Rate : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
+Accepted Physics Triggers : {physics_accepted.npassed}
+
+=:=:=:=:=:=:=:=:
+= HMS Triggers
+=:=:=:=:=:=:=:=:
+
+hEL_LO_LO : {H.hEL_LO_LO.scaler} [ {(H.hEL_LO_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_LO : {H.hEL_LO.scaler} [ {(H.hEL_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_HI : {H.hEL_HI.scaler} [ {(H.hEL_HI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_REAL : {H.hEL_REAL.scaler} [ {(H.hEL_REAL.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_CLEAN : {H.hEL_CLEAN.scaler} [ {(H.hEL_CLEAN.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hSTOF : {H.hSTOF.scaler} [ {(H.hSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+hTRIG1 : {H.hTRIG1.scaler} [ {(H.hTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG2 : {H.hTRIG2.scaler} [ {(H.hTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG3 : {H.hTRIG3.scaler} [ {(H.hTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG4 : {H.hTRIG4.scaler} [ {(H.hTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG5 : {H.hTRIG5.scaler} [ {(H.hTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG6 : {H.hTRIG6.scaler} [ {(H.hTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:=:=:=:=:
+= SHMS Triggers
+=:=:=:=:=:=:=:=:
+
+pEL_LO_LO : {H.pEL_LO_LO.scaler} [ {(H.pEL_LO_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_LO : {H.pEL_LO.scaler} [ {(H.pEL_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_HI : {H.pEL_HI.scaler} [ {(H.pEL_HI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_REAL : {H.pEL_REAL.scaler} [ {(H.pEL_REAL.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_CLEAN : {H.pEL_CLEAN.scaler} [ {(H.pEL_CLEAN.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pSTOF : {H.pSTOF.scaler} [ {(H.pSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+pTRIG1 : {H.pTRIG1.scaler} [ {(H.pTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG2 : {H.pTRIG2.scaler} [ {(H.pTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG3 : {H.pTRIG3.scaler} [ {(H.pTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG4 : {H.pTRIG4.scaler} [ {(H.pTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG5 : {H.pTRIG5.scaler} [ {(H.pTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG6 : {H.pTRIG6.scaler} [ {(H.pTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:
+= EDTM
+=:=:=:=:
EDTM Triggers : {H.EDTM.scaler}
Estimated EDTM Triggers : {H.EDTM.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
@@ -91,20 +110,39 @@ Accepted EDTM Triggers : {edtm_accepted.npassed}
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 3/4 Triggers
-*******************
+=:=:=:=:=:=:=:
+= Hodoscopes
+=:=:=:=:=:=:=:
-Physics Triggers : {H.hTRIG1.scaler - H.EDTM.scaler}
-Estimated Physics Triggers : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
-Physics Trigger Rate : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
-Accepted Physics Triggers : {physics_accepted.npassed}
+H1X : {H.S1X.scaler} [ {(H.S1X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1X
+H1Y : {H.S1Y.scaler} [ {(H.S1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1Y
+H2X : {H.S2X.scaler} [ {(H.S2X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2X
+H2Y : {H.S2Y.scaler} [ {(H.S2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2Y
+
+H1XH1Y : {H.S1XS1Y.scaler} [ {(H.S1XS1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between H1X and H1Y planes
+H2XH2Y : {H.S2XS2Y.scaler} [ {(H.S2XS2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between H2X and H2Y planes
+
+=:=:=:=:=:=:
+= CER, CAL
+=:=:=:=:=:=:
+
+CER : {H.CER.scaler} [ {(H.CER.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRLO : {H.PRLO.scaler} [ {(H.PRLO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRHI : {H.PRHI.scaler} [ {(H.PRHI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+SHLO : {H.SHLO.scaler} [ {(H.SHLO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+ASUM : {H.ASUM.scaler} [ {(H.ASUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+BSUM : {H.BSUM.scaler} [ {(H.BSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+CSUM : {H.CSUM.scaler} [ {(H.CSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+DSUM : {H.DSUM.scaler} [ {(H.DSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
*******************
* Hardware Scalers
*******************
-*HODOSCOPES*
+=:=:=:=:=:=:=:=:
+= HODOSCOPES
+=:=:=:=:=:=:=:=:
+
Scint Counts Rate
H1X1+: {H.hod.1x1.posScaler} [ {(H.hod.1x1.posScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
H1X2+: {H.hod.1x2.posScaler} [ {(H.hod.1x2.posScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
@@ -216,24 +254,4 @@ H2Y6-: {H.hod.2y6.negScaler} [ {(H.hod.2y6.negScaler/H.1Mhz.scalerTime)/1000.:%
H2Y7-: {H.hod.2y7.negScaler} [ {(H.hod.2y7.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
H2Y8-: {H.hod.2y8.negScaler} [ {(H.hod.2y8.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
H2Y9-: {H.hod.2y9.negScaler} [ {(H.hod.2y9.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-H2Y10-: {H.hod.2y10.negScaler} [ {(H.hod.2y10.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-
-H1X: {H.S1X.scaler} [ {(H.S1X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1X
-H1Y: {H.S1Y.scaler} [ {(H.S1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H1Y
-H2X: {H.S2X.scaler} [ {(H.S2X.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2X
-H2Y: {H.S2Y.scaler} [ {(H.S2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of H2Y
-H1XH1Y: {H.S1XS1Y.scaler} [{(H.S1XS1Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between H1X and H1Y planes
-H2XH2Y: {H.S2XS2Y.scaler} [{(H.S2XS2Y.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ] OR between H2X and H2Y planes (just for kpp, will be AND)
-
-*Cerenkov*
-CERSUM: {H.CERSUM.scaler} [{(H.CERSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-
-*Calorimeter*
-PRESHOWERLO: {H.PSHWRLO.scaler} [{(H.PSHWRLO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-PRESHOWERHI: {H.PSHWRHI.scaler} [{(H.PSHWRHI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-SHWR: {H.SHWR.scaler} [{(H.SHWR.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-ASUM: {H.ASUM.scaler} [{(H.ASUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-BSUM: {H.BSUM.scaler} [{(H.BSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-CSUM: {H.CSUM.scaler} [{(H.CSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-DSUM: {H.DSUM.scaler} [{(H.DSUM.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-
+H2Y10-: {H.hod.2y10.negScaler} [ {(H.hod.2y10.negScaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
\ No newline at end of file
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index b6c1d913..f3169e73 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -1,5 +1,9 @@
Run #: {gen_run_number}
+**************************
+* General Run Information
+**************************
+
1 MhZ Pulses : {P.1Mhz.scaler}
Run Length : {P.1Mhz.scalerTime:%.3f} sec
@@ -32,9 +36,13 @@ Ps4_factor = {gpconfig_ti_ps_factors[3]}
Ps5_factor = {gpconfig_ti_ps_factors[4]}
Ps6_factor = {gpconfig_ti_ps_factors[5]}
-***************
-* 3/4 Triggers
-***************
+***********
+* Triggers
+***********
+
+=:=:=:=:=:=:=:
+= 3/4 Trigger
+=:=:=:=:=:=:=:
SHMS 3/4 Triggers : {P.pTRIG1.scaler} [ {P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]} ]
Estimated SHMS 3/4 Triggers : {P.pTRIG1.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
@@ -45,41 +53,54 @@ SHMS Event Types : {SHMS_Pretrig.npassed}
SHMS Computer Live Time : {(TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
SHMS Computer Dead Time : {100.0 - (TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-*************
-* MORE TRIGGERS
-**************
-HMS TRIG
-hEL_LO : {P.hEL_LO.scaler} [{P.hEL_LO.scaler/P.1Mhz.scalerTime}]
-hEL_HI : {P.hEL_HI.scaler} [{P.hEL_HI.scaler/P.1Mhz.scalerTime}]
-hEL_REAL : {P.hEL_REAL.scaler} [{P.hEL_REAL.scaler/P.1Mhz.scalerTime]
-hEL_CLEAN : {P.hEL_CLEAN.scaler} [{P.hEL_CLEAN.scaler/P.1Mhz.scalerTime}]
-hSTOF: {P.hSTOF.scaler} [{P.hSTOF.scaler/P.1Mhz.scalerTime}]
-
-hTRIG1: {P.hTRIG1.scaler} [{P.hTRIG1.scaler/P.1Mhz.scalerTime}]
-hTRIG2: {P.hTRIG2.scaler} [{P.hTRIG2.scaler/P.1Mhz.scalerTime}]
-hTRIG3: {P.hTRIG3.scaler} [{P.hTRIG3.scaler/P.1Mhz.scalerTime}]
-hTRIG4: {P.hTRIG4.scaler} [{P.hTRIG4.scaler/P.1Mhz.scalerTime}]
-hTRIG5: {P.hTRIG5.scaler} [{P.hTRIG5.scaler/P.1Mhz.scalerTime}]
-hTRIG6: {P.hTRIG6.scaler} [{P.hTRIG6.scaler/P.1Mhz.scalerTime}]
-
-SHMS TRIG
-pEL_LO : {P.pEL_LO.scaler} [{P.pEL_LO.scaler/P.1Mhz.scalerTime}]
-pEL_HI : {P.pEL_HI.scaler} [{P.pEL_HI.scaler/P.1Mhz.scalerTime}]
-pEL_REAL : {P.pEL_REAL.scaler} [{P.pEL_REAL.scaler/P.1Mhz.scalerTime}]
-pEL_CLEAN : {P.pEL_CLEAN.scaler} [{P.pEL_CLEAN.scaler/P.1Mhz.scalerTime}]
-pSTOF: {P.pSTOF.scaler} [{P.pSTOF.scaler/P.1Mhz.scalerTime}]
-pTREF3: {P.pTREF3.scaler} [{P.pTREF3.scaler/P.1Mhz.scalerTime}]
-
-pTRIG1: {P.pTRIG1.scaler} [{P.pTRIG1.scaler/P.1Mhz.scalerTime}]
-pTRIG2: {P.pTRIG2.scaler} [{P.pTRIG2.scaler/P.1Mhz.scalerTime}]
-pTRIG3: {P.pTRIG3.scaler} [{P.pTRIG3.scaler/P.1Mhz.scalerTime}]
-pTRIG4: {P.pTRIG4.scaler} [{P.pTRIG4.scaler/P.1Mhz.scalerTime}]
-pTRIG5: {P.pTRIG5.scaler} [{P.pTRIG5.scaler/P.1Mhz.scalerTime}]
-pTRIG6: {P.pTRIG6.scaler} [{P.pTRIG6.scaler/P.1Mhz.scalerTime}]
-
-*******
-* EDTM
-*******
+=:=:=:=:=:=:=:=:=:=:=:=:
+= Physics 3/4 Triggers
+=:=:=:=:=:=:=:=:=:=:=:=:
+
+Physics 3/4 Triggers : {P.pTRIG1.scaler - P.EDTM.scaler}
+Estimated Physics 3/4 Triggers : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
+Physics 3/4 Trigger Rate : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
+Accepted Physics Triggers : {physics_accepted.npassed}
+
+=:=:=:=:=:=:=:=:
+= HMS Triggers
+=:=:=:=:=:=:=:=:
+
+hEL_LO_LO : {P.hEL_LO_LO.scaler} [ {(P.hEL_LO_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_LO : {P.hEL_LO.scaler} [ {(P.hEL_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_HI : {P.hEL_HI.scaler} [ {(P.hEL_HI.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_REAL : {P.hEL_REAL.scaler} [ {(P.hEL_REAL.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_CLEAN : {P.hEL_CLEAN.scaler} [ {(P.hEL_CLEAN.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hSTOF : {P.hSTOF.scaler} [ {(P.hSTOF.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+hTRIG1 : {P.hTRIG1.scaler} [ {(P.hTRIG1.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG2 : {P.hTRIG2.scaler} [ {(P.hTRIG2.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG3 : {P.hTRIG3.scaler} [ {(P.hTRIG3.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG4 : {P.hTRIG4.scaler} [ {(P.hTRIG4.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG5 : {P.hTRIG5.scaler} [ {(P.hTRIG5.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG6 : {P.hTRIG6.scaler} [ {(P.hTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:=:=:=:=:
+= SHMS Triggers
+=:=:=:=:=:=:=:=:
+
+pEL_LO_LO : {P.pEL_LO_LO.scaler} [ {(P.pEL_LO_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_LO : {P.pEL_LO.scaler} [ {(P.pEL_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_HI : {P.pEL_HI.scaler} [ {(P.pEL_HI.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_REAL : {P.pEL_REAL.scaler} [ {(P.pEL_REAL.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_CLEAN : {P.pEL_CLEAN.scaler} [ {(P.pEL_CLEAN.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pSTOF : {P.pSTOF.scaler} [ {(P.pSTOF.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+pTRIG1 : {P.pTRIG1.scaler} [ {(P.pTRIG1.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG2 : {P.pTRIG2.scaler} [ {(P.pTRIG2.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG3 : {P.pTRIG3.scaler} [ {(P.pTRIG3.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG4 : {P.pTRIG4.scaler} [ {(P.pTRIG4.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG5 : {P.pTRIG5.scaler} [ {(P.pTRIG5.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG6 : {P.pTRIG6.scaler} [ {(P.pTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:
+= EDTM
+=:=:=:=:
EDTM Triggers : {P.EDTM.scaler}
Estimated EDTM Triggers : {P.EDTM.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
@@ -89,18 +110,32 @@ Accepted EDTM Triggers : {edtm_accepted.npassed}
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 3/4 Triggers
-*******************
+=:=:=:=:=:=:=:
+= Hodoscopes
+=:=:=:=:=:=:=:
-Physics 3/4 Triggers : {P.pTRIG1.scaler - P.EDTM.scaler}
-Estimated Physics 3/4 Triggers : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
-Physics 3/4 Trigger Rate : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
-Accepted Physics Triggers : {physics_accepted.npassed}
+P1X : {P.S1X.scaler} [ {(P.S1X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1X
+P1Y : {P.S1Y.scaler} [ {(P.S1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1Y
+P2X : {P.S2X.scaler} [ {(P.S2X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2X
+P2Y : {P.S2Y.scaler} [ {(P.S2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2Y
+
+P1XP1Y : {P.S1XS1Y.scaler} [ {(P.S1XS1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P1X and P1Y planes
+P2XP2Y : {P.S2XS2Y.scaler} [ {(P.S2XS2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P2X and P2Y planes
+
+=:=:=:=:=:=:=:=:=:=:=:=:=
+= Aerogel, HGC, NGC, CAL
+=:=:=:=:=:=:=:=:=:=:=:=:=
+
+AERO : {P.AERO.scaler} [ {(P.AERO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] Aerogel sum currently not available
+HGC : {P.HCER.scaler} [ {(P.HCER.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+NGC : {P.NCER.scaler} [ {(P.NCER.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRLO : {P.PRLO.scaler} [ {(P.PRLO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRHI : {P.PRHI.scaler} [ {(P.PRHI.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+***********
+* Chambers
+***********
-****************
-* Chamber *
-****************
good_S1_time Counts: {good_S1_time.npassed} / shms_trigs.scaler : {good_S1_time.npassed / shms_trigs.npassed}
good_S2X_time Counts: {good_S2X_time.npassed} / shms_trigs.scaler : {good_S2X_time.npassed / shms_trigs.npassed}
good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / shms_trigs.scaler : {good_S1_S2X_time.npassed / shms_trigs.npassed}
@@ -244,6 +279,7 @@ p1hit1_cal_elec : {p1hit1_cal_elec.npassed}
******************************
* SHMS TRACKING EFFICIENCIES *
******************************
+
ptrig : {SHMS_event.npassed}
phitslt = passed hits/cham : {shmsHitsLt.npassed}
phitsplanes = +planes >= 5/6 : {shmsHitsPlanes.npassed}
@@ -271,9 +307,10 @@ SING FID TRACK EFFIC : {shmsScinDid.npassed / (shmsScinShould.npassed+
E SING FID TRACK EFFIC : {shmsScinDide.npassed / (shmsScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShoulde.npassed-shmsScinDide.npassed) / (shmsScinShoulde.npassed+.0001)):%8.4f}
HADRON SING FID TRACK EFFIC : {shmsScinDidh.npassed / (shmsScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShouldh.npassed-shmsScinDidh.npassed) / (shmsScinShouldh.npassed+.0001)):%8.4f}
-************
-* HGC Cerenkov *
-************
+***************
+* HGC Cerenkov
+***************
+
Good Track Requirements:
1. Only one track found in the focal plane
2. chisq/dof < {phgcer_red_chi2_max:%5.1f}
@@ -287,9 +324,10 @@ SHMS HGC Region 3 efficiency: {SHMS_hgcer_track_fired_region_3.npassed/SHMS_hgce
SHMS HGC Region 4 efficiency: {SHMS_hgcer_track_fired_region_4.npassed/SHMS_hgcer_track_matched_region_4.npassed} = {SHMS_hgcer_track_fired_region_4.npassed} of {SHMS_hgcer_track_matched_region_4.npassed} good tracks.
Overall HGC Efficiency: {SHMS_hgcer_track_fired_tot.npassed/SHMS_hgcer_track_matched_tot.npassed} = {SHMS_hgcer_track_fired_tot.npassed} of {SHMS_hgcer_track_matched_tot.npassed} good tracks.
-************
-* NGC Cerenkov *
-************
+***************
+* NGC Cerenkov
+***************
+
Good Track Requirements:
1. Only one track found in the focal plane
2. chisq/dof < {pngcer_red_chi2_max:%5.1f}
@@ -303,9 +341,10 @@ SHMS NGC Region 3 efficiency: {SHMS_ngcer_track_fired_region_3.npassed/SHMS_ngce
SHMS NGC Region 4 efficiency: {SHMS_ngcer_track_fired_region_4.npassed/SHMS_ngcer_track_matched_region_4.npassed} = {SHMS_ngcer_track_fired_region_4.npassed} of {SHMS_ngcer_track_matched_region_4.npassed} good tracks.
Overall NGC Efficiency: {SHMS_ngcer_track_fired_tot.npassed/SHMS_ngcer_track_matched_tot.npassed} = {SHMS_ngcer_track_fired_tot.npassed} of {SHMS_ngcer_track_matched_tot.npassed} good tracks.
-************
-* Aerogel Cerenkov *
-************
+**********
+* Aerogel
+**********
+
Good Track Requirements:
1. Only one track found in the focal plane
2. chisq/dof < {paero_red_chi2_max:%5.1f}
@@ -326,6 +365,7 @@ Overall AERO Efficiency: {SHMS_aero_track_fired_tot.npassed/SHMS_aero_track_matc
****************************
* Calorimeter Efficiencies *
****************************
+
Efficiencies for calorimeter is the fraction of times block was hit when track
with chisquared/dof < {pstat_cal_maxchisq:%5.1f} came within {pstat_cal_slop:%4.1f} cm of the center.
and scal_npe_sum > 3.0 (hardwired). (is this still true?)
@@ -340,6 +380,7 @@ shmsShowerArray Counts: {P.cal.stat_trksum_array} eff : {P.cal.stat_hitsum_
**************************
* Hodoscope Efficiencies *
**************************
+
Efficiencies for hodoscopes is the fraction of times scin. was hit when track
with chisquared/dof < {pstat_maxchisq:%5.1f} came within {pstat_slop:%4.1f} cm of the center.
@@ -431,7 +472,10 @@ P2Y21 {phodo_pos_eff[83]} {phodo_neg_eff[83]} {phodo_or_eff[83]} {p
* Hardware Scalers
*******************
-*HODOSCOPES*
+=:=:=:=:=:=:=
+= HODOSCOPES
+=:=:=:=:=:=:=
+
Scint Counts Rate
P1X1+: {P.hod.1x1.posScaler} [ {(P.hod.1x1.posScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
P1X2+: {P.hod.1x2.posScaler} [ {(P.hod.1x2.posScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
@@ -561,18 +605,4 @@ P2Y17-: {P.hod.2y17.negScaler} [ {(P.hod.2y17.negScaler/P.1Mhz.scalerTime)/1000.
P2Y18-: {P.hod.2y18.negScaler} [ {(P.hod.2y18.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
P2Y19-: {P.hod.2y19.negScaler} [ {(P.hod.2y19.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
P2Y20-: {P.hod.2y20.negScaler} [ {(P.hod.2y20.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-P2Y21-: {P.hod.2y21.negScaler} [ {(P.hod.2y21.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-
-P1X: {P.S1X.scaler} [ {(P.S1X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1X
-P1Y: {P.S1Y.scaler} [ {(P.S1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1Y
-P2X: {P.S2X.scaler} [ {(P.S2X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2X
-P2Y: {P.S2Y.scaler} [ {(P.S2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2Y
-
-P1XP1Y: {P.S1XS1Y.scaler} [ {(P.S1XS1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P1X and P1Y planes
-P2XP2Y: {P.S2XS2Y.scaler} [ {(P.S2XS2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] OR between P2X and P2Y planes (just for kpp, will be AND)
-
-*Aerogel, NGC, HGC*
-AERO: {P.AERO.scaler} [ {(P.AERO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] Aerogel sum currently not available
-HGC:{P.HGC.scaler} [ {(P.HGC.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-NGC:{P.NGC.scaler} [ {(P.NGC.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-
+P2Y21-: {P.hod.2y21.negScaler} [ {(P.hod.2y21.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
\ No newline at end of file
diff --git a/TEMPLATES/SHMS/SCALERS/pscalers.template b/TEMPLATES/SHMS/SCALERS/pscalers.template
index ce02d1e5..0403c252 100644
--- a/TEMPLATES/SHMS/SCALERS/pscalers.template
+++ b/TEMPLATES/SHMS/SCALERS/pscalers.template
@@ -37,53 +37,70 @@ Ps5_factor = {gpconfig_ti_ps_factors[4]}
Ps6_factor = {gpconfig_ti_ps_factors[5]}
***********
-* 3/4 Triggers
+* Triggers
***********
+=:=:=:=:=:=:=:
+= 3/4 Trigger
+=:=:=:=:=:=:=:
+
SHMS 3/4 Triggers : {P.pTRIG1.scaler} [ {P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]} ]
Estimated SHMS 3/4 Triggers : {P.pTRIG1.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
SHMS 3/4 Trigger Rate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
Accepted SHMS Triggers : {TRIG1.npassed}
SHMS Event Types : {SHMS_Pretrig.npassed}
-SHMS Computer Live Time : {(TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-SHMS Computer Dead Time : {100.0 - (TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-
-*************
-* MORE TRIGGERS
-**************
-HMS TRIG
-hEL_LO : {P.hEL_LO.scaler} [{P.hEL_LO.scaler/P.1Mhz.scalerTime:%.3f}]
-hEL_HI : {P.hEL_HI.scaler} [{P.hEL_HI.scaler/P.1Mhz.scalerTime:%.3f}]
-hEL_REAL : {P.hEL_REAL.scaler} [{P.hEL_REAL.scaler/P.1Mhz.scalerTime:%.3f}]
-hEL_CLEAN : {P.hEL_CLEAN.scaler} [{P.hEL_CLEAN.scaler/P.1Mhz.scalerTime:%.3f}]
-hSTOF: {P.hSTOF.scaler} [{P.hSTOF.scaler/P.1Mhz.scalerTime:%.3f}]
-
-hTRIG1: {P.hTRIG1.scaler} [{P.hTRIG1.scaler/P.1Mhz.scalerTime:%.3f}]
-hTRIG2: {P.hTRIG2.scaler} [{P.hTRIG2.scaler/P.1Mhz.scalerTime:%.3f}]
-hTRIG3: {P.hTRIG3.scaler} [{P.hTRIG3.scaler/P.1Mhz.scalerTime:%.3f}]
-hTRIG4: {P.hTRIG4.scaler} [{P.hTRIG4.scaler/P.1Mhz.scalerTime:%.3f}}
-hTRIG5: {P.hTRIG5.scaler} [{P.hTRIG5.scaler/P.1Mhz.scalerTime:%.3f}]
-hTRIG6: {P.hTRIG6.scaler} [{P.hTRIG6.scaler/P.1Mhz.scalerTime:%.3f}]
-
-SHMS TRIG
-pEL_LO : {P.pEL_LO.scaler} [{P.pEL_LO.scaler/P.1Mhz.scalerTime:%.3f}]
-pEL_HI : {P.pEL_HI.scaler} [{P.pEL_HI.scaler/P.1Mhz.scalerTime:%.3f}]
-pEL_REAL : {P.pEL_REAL.scaler} [{P.pEL_REAL.scaler/P.1Mhz.scalerTime:%.3f}]
-pEL_CLEAN : {P.pEL_CLEAN.scaler} [{P.pEL_CLEAN.scaler/P.1Mhz.scalerTime:%.3f}]
-pSTOF: {P.pSTOF.scaler} [{P.pSTOF.scaler/P.1Mhz.scalerTime:%.3f}]
-pTREF3: {P.pTREF3.scaler} [{P.pTREF3.scaler/P.1Mhz.scalerTime:%.3f}]
-
-pTRIG1: {P.pTRIG1.scaler} [{P.pTRIG1.scaler/P.1Mhz.scalerTime:%.3f}]
-pTRIG2: {P.pTRIG2.scaler} [{P.pTRIG2.scaler/P.1Mhz.scalerTime:%.3f}]
-pTRIG3: {P.pTRIG3.scaler} [{P.pTRIG3.scaler/P.1Mhz.scalerTime:%.3f}]
-pTRIG4: {P.pTRIG4.scaler} [{P.pTRIG4.scaler/P.1Mhz.scalerTime:%.3f}]
-pTRIG5: {P.pTRIG5.scaler} [{P.pTRIG5.scaler/P.1Mhz.scalerTime:%.3f}]
-pTRIG6: {P.pTRIG6.scaler} [{P.pTRIG6.scaler/P.1Mhz.scalerTime:%.3f}]
-
-*******
-* EDTM
-*******
+SHMS Computer Live Time : {(TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+SHMS Computer Dead Time : {100.0 - (TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+
+=:=:=:=:=:=:=:=:=:=:=:=:
+= Physics 3/4 Triggers
+=:=:=:=:=:=:=:=:=:=:=:=:
+
+Physics 3/4 Triggers : {P.pTRIG1.scaler - P.EDTM.scaler}
+Estimated Physics 3/4 Triggers : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
+Physics 3/4 Trigger Rate : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
+Accepted Physics Triggers : {physics_accepted.npassed}
+
+=:=:=:=:=:=:=:=:
+= HMS Triggers
+=:=:=:=:=:=:=:=:
+
+hEL_LO_LO : {P.hEL_LO_LO.scaler} [ {(P.hEL_LO_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_LO : {P.hEL_LO.scaler} [ {(P.hEL_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_HI : {P.hEL_HI.scaler} [ {(P.hEL_HI.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_REAL : {P.hEL_REAL.scaler} [ {(P.hEL_REAL.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_CLEAN : {P.hEL_CLEAN.scaler} [ {(P.hEL_CLEAN.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hSTOF : {P.hSTOF.scaler} [ {(P.hSTOF.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+hTRIG1 : {P.hTRIG1.scaler} [ {(P.hTRIG1.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG2 : {P.hTRIG2.scaler} [ {(P.hTRIG2.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG3 : {P.hTRIG3.scaler} [ {(P.hTRIG3.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG4 : {P.hTRIG4.scaler} [ {(P.hTRIG4.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG5 : {P.hTRIG5.scaler} [ {(P.hTRIG5.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG6 : {P.hTRIG6.scaler} [ {(P.hTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:=:=:=:=:
+= SHMS Triggers
+=:=:=:=:=:=:=:=:
+
+pEL_LO_LO : {P.pEL_LO_LO.scaler} [ {(P.pEL_LO_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_LO : {P.pEL_LO.scaler} [ {(P.pEL_LO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_HI : {P.pEL_HI.scaler} [ {(P.pEL_HI.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_REAL : {P.pEL_REAL.scaler} [ {(P.pEL_REAL.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pEL_CLEAN : {P.pEL_CLEAN.scaler} [ {(P.pEL_CLEAN.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pSTOF : {P.pSTOF.scaler} [ {(P.pSTOF.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+pTRIG1 : {P.pTRIG1.scaler} [ {(P.pTRIG1.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG2 : {P.pTRIG2.scaler} [ {(P.pTRIG2.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG3 : {P.pTRIG3.scaler} [ {(P.pTRIG3.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG4 : {P.pTRIG4.scaler} [ {(P.pTRIG4.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG5 : {P.pTRIG5.scaler} [ {(P.pTRIG5.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG6 : {P.pTRIG6.scaler} [ {(P.pTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
+=:=:=:=:
+= EDTM
+=:=:=:=:
EDTM Triggers : {P.EDTM.scaler}
Estimated EDTM Triggers : {P.EDTM.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
@@ -93,20 +110,36 @@ Accepted EDTM Triggers : {edtm_accepted.npassed}
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 3/4 Triggers
-*******************
+=:=:=:=:=:=:=:
+= Hodoscopes
+=:=:=:=:=:=:=:
-Physics 3/4 Triggers : {P.pTRIG1.scaler - P.EDTM.scaler}
-Estimated Physics 3/4 Triggers : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
-Physics 3/4 Trigger Rate : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
-Accepted Physics Triggers : {physics_accepted.npassed}
+P1X : {P.S1X.scaler} [ {(P.S1X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1X
+P1Y : {P.S1Y.scaler} [ {(P.S1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1Y
+P2X : {P.S2X.scaler} [ {(P.S2X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2X
+P2Y : {P.S2Y.scaler} [ {(P.S2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2Y
+
+P1XP1Y : {P.S1XS1Y.scaler} [ {(P.S1XS1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P1X and P1Y planes
+P2XP2Y : {P.S2XS2Y.scaler} [ {(P.S2XS2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P2X and P2Y planes
+
+=:=:=:=:=:=:=:=:=:=:=:=:=
+= Aerogel, HGC, NGC, CAL
+=:=:=:=:=:=:=:=:=:=:=:=:=
+
+AERO : {P.AERO.scaler} [ {(P.AERO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] Aerogel sum currently not available
+HGC : {P.HCER.scaler} [ {(P.HCER.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+NGC : {P.NCER.scaler} [ {(P.NCER.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRLO : {P.PRLO.scaler} [ {(P.PRLO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+PRHI : {P.PRHI.scaler} [ {(P.PRHI.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
*******************
* Hardware Scalers
*******************
-*HODOSCOPES*
+=:=:=:=:=:=:=:
+= HODOSCOPES
+=:=:=:=:=:=:=:
+
Scint Counts Rate
P1X1+: {P.hod.1x1.posScaler} [ {(P.hod.1x1.posScalerRate/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
P1X2+: {P.hod.1x2.posScaler} [ {(P.hod.1x2.posScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
@@ -236,17 +269,4 @@ P2Y17-: {P.hod.2y17.negScaler} [ {(P.hod.2y17.negScaler/P.1Mhz.scalerTime)/1000.
P2Y18-: {P.hod.2y18.negScaler} [ {(P.hod.2y18.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
P2Y19-: {P.hod.2y19.negScaler} [ {(P.hod.2y19.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
P2Y20-: {P.hod.2y20.negScaler} [ {(P.hod.2y20.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-P2Y21-: {P.hod.2y21.negScaler} [ {(P.hod.2y21.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-
-P1X: {P.S1X.scaler} [ {(P.S1X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1X
-P1Y: {P.S1Y.scaler} [ {(P.S1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P1Y
-P2X: {P.S2X.scaler} [ {(P.S2X.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2X
-P2Y: {P.S2Y.scaler} [ {(P.S2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between + and - sides of P2Y
-
-P1XP1Y: {P.S1XS1Y.scaler} [ {(P.S1XS1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P1X and P1Y planes
-P2XP2Y: {P.S2XS2Y.scaler} [ {(P.S2XS2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] OR between P2X and P2Y planes (just for kpp, will be AND)
-
-*Aerogel, NGC, HGC*
-AERO: {P.AERO.scaler} [ {(P.AERO.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] Aerogel sum currently not available
-HGC:{P.HGC.scaler} [ {(P.HGC.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-NGC:{P.NGC.scaler} [ {(P.NGC.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+P2Y21-: {P.hod.2y21.negScaler} [ {(P.hod.2y21.negScaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
\ No newline at end of file
--
GitLab