From e89237351b8f3dddfdfd155781c0c351293903af Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Thu, 12 Oct 2017 09:00:45 -0400
Subject: [PATCH] Ref rime work (#221)
* Include trigger apparatus reference time into param list
* Inlcude trigger apparatus reference times into trigger maps
* Update HMS maps accordingly
* Update SHMS maps accordingly
---
MAPS/HMS/DETEC/AERO/haero_htrig.map | 1 +
MAPS/HMS/DETEC/CAL/hcal_htrig.map | 1 +
MAPS/HMS/DETEC/CER/hcer_htrig.map | 1 +
MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map | 1 +
MAPS/HMS/DETEC/HODO/hhodo_htrig.map | 1 +
MAPS/HMS/DETEC/STACK/hms_stack.map | 1 +
MAPS/HMS/DETEC/TRIG/htrig.map | 1 +
MAPS/SHMS/DETEC/AERO/paero_ptrig.map | 67 +++++++++++++-------------
MAPS/SHMS/DETEC/CAL/pcal_ptrig.map | 67 +++++++++++++-------------
MAPS/SHMS/DETEC/DC/pdc_ptrig.map | 67 +++++++++++++-------------
MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map | 67 +++++++++++++-------------
MAPS/SHMS/DETEC/HODO/phodo_ptrig.map | 67 +++++++++++++-------------
MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map | 67 +++++++++++++-------------
MAPS/SHMS/DETEC/STACK/shms_stack.map | 67 +++++++++++++-------------
MAPS/SHMS/DETEC/TRIG/ptrig.map | 67 +++++++++++++-------------
PARAM/TRIG/thms.param | 6 +--
PARAM/TRIG/tshms.param | 6 +--
17 files changed, 285 insertions(+), 270 deletions(-)
diff --git a/MAPS/HMS/DETEC/AERO/haero_htrig.map b/MAPS/HMS/DETEC/AERO/haero_htrig.map
index 1fcbbf6f..6dfd846a 100644
--- a/MAPS/HMS/DETEC/AERO/haero_htrig.map
+++ b/MAPS/HMS/DETEC/AERO/haero_htrig.map
@@ -25,6 +25,7 @@ REFINDEX=0
4, 2, 5, 1 ! h1T
5, 2, 6, 1 ! h2T
6,1000, 0, 0 ! hTref
+ 6, 2, 7, 1 ! hT1
7, 2, 8, 1 ! hASUM
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
index 7d42faa2..3285b65e 100644
--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -25,6 +25,7 @@ REFINDEX=0
4, 2, 5, 1 ! h1T
5, 2, 6, 1 ! h2T
6,1000, 0, 0 ! hTref
+ 6, 2, 7, 1 ! hT1
7, 2, 8, 1 ! hASUM
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map
index f1282cf3..efe69dc5 100644
--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -25,6 +25,7 @@ REFINDEX=0
4, 2, 5, 1 ! h1T
5, 2, 6, 1 ! h2T
6,1000, 0, 0 ! hTref
+ 6, 2, 7, 1 ! hT1
7, 2, 8, 1 ! hASUM
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
diff --git a/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map b/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map
index 262db594..30f4fb7e 100644
--- a/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map
+++ b/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map
@@ -25,6 +25,7 @@ REFINDEX=0
4, 2, 5, 1 ! h1T
5, 2, 6, 1 ! h2T
6,1000, 0, 0 ! hTref
+ 6, 2, 7, 1 ! hT1
7, 2, 8, 1 ! hASUM
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
index 4c89e16d..8a58ec0a 100644
--- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map
@@ -25,6 +25,7 @@ REFINDEX=0
4, 2, 5, 1 ! h1T
5, 2, 6, 1 ! h2T
6,1000, 0, 0 ! hTref
+ 6, 2, 7, 1 ! hT1
7, 2, 8, 1 ! hASUM
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map
index 79314818..5d0de882 100644
--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -30,6 +30,7 @@ REFINDEX=0
4, 2, 5, 1 ! h1T
5, 2, 6, 1 ! h2T
6,1000, 0, 0 ! hTref
+ 6, 2, 7, 1 ! hT1
7, 2, 8, 1 ! hASUM
8, 2, 9, 1 ! hBSUM
9, 2, 10, 1 ! hCSUM
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index 1bdacb08..e1c98e2b 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -32,6 +32,7 @@ REFINDEX=0
4, 2, 5, 1! h1T
5, 2, 6, 1! h2T
6, 1000, 0, 0! hTref
+ 6, 2, 7, 1! hT1
7, 2, 8, 1! hASUM
8, 2, 9, 1! hBSUM
9, 2, 10, 1! hCSUM
diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
index f9d29dc2..7cb7ff67 100644
--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -18,61 +18,62 @@ SLOT=20
SLOT=19
REFINDEX=0
31,1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
DETECTOR=25
diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
index cd37e77d..fda6ef50 100644
--- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
+++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
@@ -18,61 +18,62 @@ SLOT=20
SLOT=19
REFINDEX=0
31,1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
DETECTOR=26
diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
index 8a3bc626..7df55695 100644
--- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
+++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
@@ -18,61 +18,62 @@ SLOT=20
SLOT=19
REFINDEX=0
31,1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
DETECTOR=22 ! SHMS chambers
diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
index 64b2ce54..5657fdea 100644
--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -18,61 +18,62 @@ SLOT=20
SLOT=19
REFINDEX=0
31,1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
DETECTOR=24
diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
index 641a408d..1a07fec9 100644
--- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
@@ -18,61 +18,62 @@ SLOT=20
SLOT=19
REFINDEX=0
31,1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
DETECTOR=23
diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
index 6500875e..8d7b3fbd 100644
--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -18,61 +18,62 @@ SLOT=20
SLOT=19
REFINDEX=0
31,1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
DETECTOR=21
diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map
index 7ce4b4ac..ca4fe047 100644
--- a/MAPS/SHMS/DETEC/STACK/shms_stack.map
+++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map
@@ -24,61 +24,62 @@ SLOT=20
SLOT=19
REFINDEX=0
31,1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
DETECTOR=21
diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map
index 35ccb62c..b09ebb52 100644
--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -17,58 +17,59 @@ SLOT=20
SLOT=19
REFINDEX=0
31, 1000, 0, 0 ! pTRef
- 32, 2, 2, 1 ! p1X
- 33, 2, 3, 1 ! p1Y
- 34, 2, 4, 1 ! p2X
- 35, 2, 5, 1 ! p2Y
- 36, 2, 6, 1 ! p1T
- 37, 2, 7, 1 ! p2T
- 38, 2, 8, 1 ! pT2
- 39, 2, 9, 1 ! pAERSUM
- 40, 2, 10, 1 ! pHGCERSUM
- 41, 2, 11, 1 ! pNGCERSUM
- 42, 2, 22, 1 ! pHODO_EDTM
- 48, 2, 23, 1 ! pTRIG1
- 49, 2, 24, 1 ! pTRIG2
- 50, 2, 25, 1 ! pTRIG3
- 51, 2, 26, 1 ! pTRIG4
- 52, 2, 27, 1 ! pTRIG5
- 53, 2, 28, 1 ! pTRIG6
- 58, 2, 29, 1 ! hTRIG1
- 59, 2, 30, 1 ! hTRIG2
- 60, 2, 31, 1 ! hTRIG3
- 61, 2, 32, 1 ! hTRIG4
- 62, 2, 33, 1 ! hTRIG5
- 63, 2, 34, 1 ! hTRIG6
+ 31, 2, 2, 1 ! pT2
+ 32, 2, 3, 1 ! p1X
+ 33, 2, 4, 1 ! p1Y
+ 34, 2, 5, 1 ! p2X
+ 35, 2, 6, 1 ! p2Y
+ 36, 2, 7, 1 ! p1T
+ 37, 2, 8, 1 ! p2T
+ 38, 2, 9, 1 ! pT3
+ 39, 2, 10, 1 ! pAERSUM
+ 40, 2, 11, 1 ! pHGCERSUM
+ 41, 2, 12, 1 ! pNGCERSUM
+ 42, 2, 23, 1 ! pHODO_EDTM
+ 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
ROC=6
SLOT=6
- 79, 2, 12, 1 ! pDCREF1
+ 79, 2, 13, 1 ! pDCREF1
SLOT=7
- 79, 2, 13, 1 ! pDCREF2
+ 79, 2, 14, 1 ! pDCREF2
SLOT=8
- 79, 2, 14, 1 ! pDCREF3
+ 79, 2, 15, 1 ! pDCREF3
SLOT=9
- 79, 2, 15, 1 ! pDCREF4
+ 79, 2, 16, 1 ! pDCREF4
SLOT=10
- 79, 2, 16, 1 ! pDCREF5
+ 79, 2, 17, 1 ! pDCREF5
SLOT=11
- 47, 2, 17, 1 ! pDCREF6
+ 47, 2, 18, 1 ! pDCREF6
SLOT=12
- 47, 2, 18, 1 ! pDCREF7
+ 47, 2, 19, 1 ! pDCREF7
SLOT=13
- 47, 2, 19, 1 ! pDCREF8
+ 47, 2, 20, 1 ! pDCREF8
SLOT=14
- 15, 2, 20, 1 ! pDCREF9
+ 15, 2, 21, 1 ! pDCREF9
SLOT=15
- 47, 2, 21, 1 ! pDCREF10
+ 47, 2, 22, 1 ! pDCREF10
diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param
index 8cd13ea2..3d986888 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -1,10 +1,10 @@
-t_hms_numAdc = 12
+t_hms_numAdc = 8
t_hms_numTdc = 33
t_hms_tdcoffset=-300.
t_hms_tdcchanperns=0.1
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12
-t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM hFRXA hFRYA hFRXB hFRYB"
+; bar num: 1 2 3 4 5 6 7 8
+t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM"
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hHODO_EDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6"
\ No newline at end of file
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index ac7c688a..8a3b1f66 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,5 +1,5 @@
t_shms_numAdc = 4
-t_shms_numTdc = 34
+t_shms_numTdc = 35
t_shms_tdcoffset = -300.
t_shms_tdcchanperns = 0.1
@@ -7,5 +7,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
-t_shms_tdcNames = "pT1 p1X p1Y p2X p2Y p1T p2T pT2 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pHODO_EDTM pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6"
+; BAR NUM: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
+t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pHODO_EDTM pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6"
--
GitLab