From 475bf67b45c31dd59832c914bc9befed2db6fcda Mon Sep 17 00:00:00 2001 From: Yero1990 <cyero002@fiu.edu> Date: Tue, 5 Dec 2017 17:22:40 -0500 Subject: [PATCH] Trig map (#304) * updated HMS map files * minor fix in HMS maps * updated SHMS map files * updated coin map * Fix typo in ptrig.map * fix minor issue in shms maps * Update coin.map --- MAPS/COIN/DETEC/TRIG/cointrig.map | 40 ++++++++------- MAPS/COIN/DETEC/coin.map | 40 ++++++++------- MAPS/HMS/DETEC/CAL/hcal_htrig.map | 18 ++++--- MAPS/HMS/DETEC/CER/hcer_htrig.map | 18 ++++--- MAPS/HMS/DETEC/DC/hdc_htrig.map | 18 ++++--- MAPS/HMS/DETEC/HODO/hhodo_htrig.map | 18 ++++--- MAPS/HMS/DETEC/STACK/hms_stack.map | 68 ++++++++++---------------- MAPS/HMS/DETEC/TRIG/htrig.map | 18 ++++--- MAPS/SHMS/DETEC/CAL/pcal_ptrig.map | 18 ++++--- MAPS/SHMS/DETEC/DC/pdc_ptrig.map | 18 ++++--- MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map | 18 ++++--- MAPS/SHMS/DETEC/HODO/phodo_ptrig.map | 18 ++++--- MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map | 18 ++++--- MAPS/SHMS/DETEC/STACK/shms_stack.map | 13 ++++- MAPS/SHMS/DETEC/TRIG/ptrig.map | 18 ++++--- PARAM/TRIG/tcoin.param | 6 +-- PARAM/TRIG/thms.param | 6 +-- PARAM/TRIG/tshms.param | 6 +-- 18 files changed, 200 insertions(+), 177 deletions(-) diff --git a/MAPS/COIN/DETEC/TRIG/cointrig.map b/MAPS/COIN/DETEC/TRIG/cointrig.map index a584433d..7ed89613 100644 --- a/MAPS/COIN/DETEC/TRIG/cointrig.map +++ b/MAPS/COIN/DETEC/TRIG/cointrig.map @@ -63,16 +63,18 @@ REFINDEX=0 20, 2, 32, 1! pTRIG5_ROC1 21, 2, 33, 1! pTRIG6_ROC1 ! B1 - 48, 2, 79, 1! pSTOF_ROC1 - 49, 2, 80, 1! pEL_LO_ROC1 - 50, 2, 81, 1! pEL_HI_ROC1 - 51, 2, 82, 1! pEL_REAL_ROC1 - 52, 2, 83, 1! pEL_CLEAN_ROC1 - 56, 2, 84, 1! hSTOF_ROC1 - 57, 2, 85, 1! hEL_LO_ROC1 - 58, 2, 86, 1! hEL_HI_ROC1 - 59, 2, 87, 1! hEL_REAL_ROC1 - 60, 2, 88, 1! hEL_CLEAN_ROC1 + 48, 2, 81, 1! pSTOF_ROC1 + 49, 2, 82, 1! pEL_LO_ROC1 + 50, 2, 83, 1! pEL_LO_CER_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 + 59, 2, 90, 1! hEL_HI_ROC1 + 60, 2, 91, 1! hEL_REAL_ROC1 + 61, 2, 92, 1! hEL_CLEAN_ROC1 !CAEN1190 module @@ -144,14 +146,16 @@ REFINDEX=0 63, 2, 68, 1 ! hTRIG6_ROC2 64, 2, 69, 1 ! pSTOF_ROC2 65, 2, 70, 1 ! pEL_LO_ROC2 - 66, 2, 71, 1 ! pEL_HI_ROC2 - 67, 2, 72, 1 ! pEL_REAL_ROC2 - 68, 2, 73, 1 ! pEL_CLEAN_ROC2 - 72, 2, 74, 1 ! hSTOF_ROC2 - 73, 2, 75, 1 ! hEL_LO_ROC2 - 74, 2, 76, 1 ! hEL_HI_ROC2 - 75, 2, 77, 1 ! hEL_REAL_ROC2 - 76, 2, 78, 1 ! hEL_CLEAN_ROC2 + 66, 2, 71, 1 ! pEL_LO_CER_ROC2 + 67, 2, 72, 1 ! pEL_HI_ROC2 + 68, 2, 73, 1 ! pEL_REAL_ROC2 + 69, 2, 74, 1 ! pEL_CLEAN_ROC2 + 72, 2, 75, 1 ! hSTOF_ROC2 + 73, 2, 76, 1 ! hEL_LO_ROC2 + 74, 2, 77, 1 ! hEL_LO_CER_ROC2 + 75, 2, 78, 1 ! hEL_HI_ROC2 + 76, 2, 79, 1 ! hEL_REAL_ROC2 + 77, 2, 80, 1 ! hEL_CLEAN_ROC2 ROC=6 diff --git a/MAPS/COIN/DETEC/coin.map b/MAPS/COIN/DETEC/coin.map index b46331d6..99312d17 100644 --- a/MAPS/COIN/DETEC/coin.map +++ b/MAPS/COIN/DETEC/coin.map @@ -3817,16 +3817,18 @@ REFINDEX=0 19, 2, 31, 1 ! pTRIG4_ROC1 20, 2, 32, 1 ! pTRIG5_ROC1 21, 2, 33, 1 ! pTRIG6_ROC1 - 48, 2, 79, 1 ! pSTOF_ROC1 - 49, 2, 80, 1 ! pEL_LO_ROC1 - 50, 2, 81, 1 ! pEL_HI_ROC1 - 51, 2, 82, 1 ! pEL_REAL_ROC1 - 52, 2, 83, 1 ! pEL_CLEAN_ROC1 - 56, 2, 84, 1 ! hSTOF_ROC1 - 57, 2, 85, 1 ! hEL_LO_ROC1 - 58, 2, 86, 1 ! hEL_HI_ROC1 - 59, 2, 87, 1 ! hEL_REAL_ROC1 - 60, 2, 88, 1 ! hEL_CLEAN_ROC1 + 48, 2, 81, 1 ! pSTOF_ROC1 + 49, 2, 82, 1 ! pEL_LO_ROC1 + 50, 2, 83, 1 ! pEL_LO_CER_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 + 59, 2, 90, 1 ! hEL_HI_ROC1 + 60, 2, 91, 1 ! hEL_REAL_ROC1 + 61, 2, 92, 1 ! hEL_CLEAN_ROC1 SLOT=20 REFINDEX=1 @@ -3890,14 +3892,16 @@ REFINDEX=0 63, 2, 68, 1 ! hTRIG6_ROC2 64, 2, 69, 1 ! pSTOF_ROC2 65, 2, 70, 1 ! pEL_LO_ROC2 - 66, 2, 71, 1 ! pEL_HI_ROC2 - 67, 2, 72, 1 ! pEL_REAL_ROC2 - 68, 2, 73, 1 ! pEL_CLEAN_ROC2 - 72, 2, 74, 1 ! hSTOF_ROC2 - 73, 2, 75, 1 ! hEL_LO_ROC2 - 74, 2, 76, 1 ! hEL_HI_ROC2 - 75, 2, 77, 1 ! hEL_REAL_ROC2 - 76, 2, 78, 1 ! hEL_CLEAN_ROC2 + 66, 2, 71, 1 ! pEL_LO_CER_ROC2 + 67, 2, 72, 1 ! pEL_HI_ROC2 + 68, 2, 73, 1 ! pEL_REAL_ROC2 + 69, 2, 74, 1 ! pEL_CLEAN_ROC2 + 72, 2, 75, 1 ! hSTOF_ROC2 + 73, 2, 76, 1 ! hEL_LO_ROC2 + 74, 2, 77, 1 ! hEL_LO_CER_ROC2 + 75, 2, 78, 1 ! hEL_HI_ROC2 + 76, 2, 79, 1 ! hEL_REAL_ROC2 + 77, 2, 80, 1 ! hEL_CLEAN_ROC2 ROC=6 diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map index 309fc625..ff777c37 100644 --- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map +++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map @@ -55,14 +55,16 @@ REFINDEX=0 21, 2, 33, 1 ! pTRIG6 48, 2, 34, 1 ! pSTOF 49, 2, 35, 1 ! pEL_LO - 50, 2, 36, 1 ! pEL_HI - 51, 2, 37, 1 ! pEL_REAL - 52, 2, 38, 1 ! pEL_CLEAN - 56, 2, 39, 1 ! hSTOF - 57, 2, 40, 1 ! hEL_LO - 58, 2, 41, 1 ! hEL_HI - 59, 2, 42, 1 ! hEL_REAL - 60, 2, 43, 1 ! hEL_CLEAN + 50, 2, 36, 1 ! pEL_LO_CER + 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 + 59, 2, 43, 1 ! hEL_HI + 60, 2, 44, 1 ! hEL_REAL + 61, 2, 45, 1 ! hEL_CLEAN SLOT=20 REFINDEX=1 diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map index 70f6e736..3f7758a2 100644 --- a/MAPS/HMS/DETEC/CER/hcer_htrig.map +++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map @@ -55,14 +55,16 @@ REFINDEX=0 21, 2, 33, 1 ! pTRIG6 48, 2, 34, 1 ! pSTOF 49, 2, 35, 1 ! pEL_LO - 50, 2, 36, 1 ! pEL_HI - 51, 2, 37, 1 ! pEL_REAL - 52, 2, 38, 1 ! pEL_CLEAN - 56, 2, 39, 1 ! hSTOF - 57, 2, 40, 1 ! hEL_LO - 58, 2, 41, 1 ! hEL_HI - 59, 2, 42, 1 ! hEL_REAL - 60, 2, 43, 1 ! hEL_CLEAN + 50, 2, 36, 1 ! pEL_LO_CER + 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 + 59, 2, 43, 1 ! hEL_HI + 60, 2, 44, 1 ! hEL_REAL + 61, 2, 45, 1 ! hEL_CLEAN SLOT=20 REFINDEX=1 diff --git a/MAPS/HMS/DETEC/DC/hdc_htrig.map b/MAPS/HMS/DETEC/DC/hdc_htrig.map index ac62395e..7d04548a 100644 --- a/MAPS/HMS/DETEC/DC/hdc_htrig.map +++ b/MAPS/HMS/DETEC/DC/hdc_htrig.map @@ -55,14 +55,16 @@ REFINDEX=0 21, 2, 33, 1 ! pTRIG6 48, 2, 34, 1 ! pSTOF 49, 2, 35, 1 ! pEL_LO - 50, 2, 36, 1 ! pEL_HI - 51, 2, 37, 1 ! pEL_REAL - 52, 2, 38, 1 ! pEL_CLEAN - 56, 2, 39, 1 ! hSTOF - 57, 2, 40, 1 ! hEL_LO - 58, 2, 41, 1 ! hEL_HI - 59, 2, 42, 1 ! hEL_REAL - 60, 2, 43, 1 ! hEL_CLEAN + 50, 2, 36, 1 ! pEL_LO_CER + 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 + 59, 2, 43, 1 ! hEL_HI + 60, 2, 44, 1 ! hEL_REAL + 61, 2, 45, 1 ! hEL_CLEAN SLOT=20 REFINDEX=1 diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map index e3cb6fd9..7c2b057d 100644 --- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map +++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map @@ -55,14 +55,16 @@ REFINDEX=0 21, 2, 33, 1 ! pTRIG6 48, 2, 34, 1 ! pSTOF 49, 2, 35, 1 ! pEL_LO - 50, 2, 36, 1 ! pEL_HI - 51, 2, 37, 1 ! pEL_REAL - 52, 2, 38, 1 ! pEL_CLEAN - 56, 2, 39, 1 ! hSTOF - 57, 2, 40, 1 ! hEL_LO - 58, 2, 41, 1 ! hEL_HI - 59, 2, 42, 1 ! hEL_REAL - 60, 2, 43, 1 ! hEL_CLEAN + 50, 2, 36, 1 ! pEL_LO_CER + 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 + 59, 2, 43, 1 ! hEL_HI + 60, 2, 44, 1 ! hEL_REAL + 61, 2, 45, 1 ! hEL_CLEAN SLOT=20 REFINDEX=1 diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map index 6033455e..13535e41 100644 --- a/MAPS/HMS/DETEC/STACK/hms_stack.map +++ b/MAPS/HMS/DETEC/STACK/hms_stack.map @@ -26,7 +26,6 @@ REFINDEX=3 11,1000, 0, 3 ! hFADC_TREF_ROC1 11, 1, 9, 0 ! hFADC_TREF_ROC1 - SLOT=2 REFINDEX=0 0, 2, 1, 1 ! h1X @@ -44,7 +43,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 @@ -58,6 +57,18 @@ REFINDEX=0 19, 2, 31, 1 ! pTRIG4 20, 2, 32, 1 ! pTRIG5 21, 2, 33, 1 ! pTRIG6 + 48, 2, 34, 1 ! pSTOF + 49, 2, 35, 1 ! pEL_LO + 50, 2, 36, 1 ! pEL_LO_CER + 51, 2, 37, 1 ! pEL_HI + 52, 2, 38, 1 ! pEL_REAL + 53, 2, 39, 1 ! pEL_CLEAN + 56, 2, 39, 1 ! hSTOF + 57, 2, 40, 1 ! hEL_LO + 58, 2, 41, 1 ! hEL_LO_CER + 59, 2, 42, 1 ! hEL_HI + 60, 2, 43, 1 ! hEL_REAL + 61, 2, 44, 1 ! hEL_CLEAN SLOT=20 REFINDEX=1 @@ -1445,48 +1456,19 @@ REFINDEX=0 SLOT=4 REFINDEX=0 -111, 1000, 0, 2 -96,9,92 ! Plane X', wire 92 -97,9,93 ! Plane X', wire 93 -98,9,94 ! Plane X', wire 94 -99,9,95 ! Plane X', wire 95 -100,9,96 ! Plane X', wire 96 -101,9,97 ! Plane X', wire 97 -102,9,98 ! Plane X', wire 98 -103,9,99 ! Plane X', wire 99 -104,9,100 ! Plane X', wire 100 -105,9,101 ! Plane X', wire 101 -106,9,102 ! Plane X', wire 102 - -DETECTOR=12 - -ROC=1 - -SLOT=18 -REFINDEX=3 - 11,1000,0,3 + 111,1000, 0, 2 + 96, 9, 92 ! Plane X', wire 92 + 97, 9, 93 ! Plane X', wire 93 + 98, 9, 94 ! Plane X', wire 94 + 99, 9, 95 ! Plane X', wire 95 + 100, 9, 96 ! Plane X', wire 96 + 101, 9, 97 ! Plane X', wire 97 + 102, 9, 98 ! Plane X', wire 98 + 103, 9, 99 ! Plane X', wire 99 + 104, 9, 100 ! Plane X', wire 100 + 105, 9, 101 ! Plane X', wire 101 + 106, 9, 102 ! Plane X', wire 102 -SLOT=16 -REFINDEX=3 - 8, 1, 1, 1 ! hAER01- - 9, 1, 2, 1 ! hAER02- - 10, 1, 3, 1 ! hAER03- - 11, 1, 4, 1 ! hAER04- - 12, 1, 5, 1 ! hAER05- - 13, 1, 6, 1 ! hAER06- - 14, 1, 7, 1 ! hAER07- - 15, 1, 8, 1 ! hAER08- - -SLOT=17 -REFINDEX=3 - 0, 1, 1, 0 ! hAER01+ - 1, 1, 2, 0 ! hAER02+ - 2, 1, 3, 0 ! hAER03+ - 3, 1, 4, 0 ! hAER04+ - 4, 1, 5, 0 ! hAER05+ - 5, 1, 6, 0 ! hAER06+ - 6, 1, 7, 0 ! hAER07+ - 7, 1, 8, 0 ! hAER08+ DETECTOR=13 diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map index df8d4635..b74c6531 100644 --- a/MAPS/HMS/DETEC/TRIG/htrig.map +++ b/MAPS/HMS/DETEC/TRIG/htrig.map @@ -65,14 +65,16 @@ REFINDEX=0 ! B1 48, 2, 34, 1! pSTOF 49, 2, 35, 1! pEL_LO - 50, 2, 36, 1! pEL_HI - 51, 2, 37, 1! pEL_REAL - 52, 2, 38, 1! pEL_CLEAN - 56, 2, 39, 1! hSTOF - 57, 2, 40, 1! hEL_LO - 58, 2, 41, 1! hEL_HI - 59, 2, 42, 1! hEL_REAL - 60, 2, 43, 1! hEL_CLEAN + 50, 2, 36, 1! pEL_LO_CER + 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 + 59, 2, 43, 1! hEL_HI + 60, 2, 44, 1! hEL_REAL + 61, 2, 45, 1! hEL_CLEAN !CAEN1190 module diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map index 43eefd1a..a6957cc9 100644 --- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map +++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map @@ -48,14 +48,16 @@ REFINDEX=0 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 + 66, 2, 38, 1 ! pEL_LO_CER + 67, 2, 39, 1 ! pEL_HI + 68, 2, 40, 1 ! pEL_REAL + 69, 2, 41, 1 ! pEL_CLEAN + 72, 2, 42, 1 ! hSTOF + 73, 2, 43, 1 ! hEL_LO + 74, 2, 44, 1 ! hEL_LO_CER + 75, 2, 45, 1 ! hEL_HI + 76, 2, 46, 1 ! hEL_REAL + 77, 2, 47, 1 ! hEL_CLEAN ROC=6 diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map index 49cbfb10..77f37a78 100644 --- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map +++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map @@ -48,14 +48,16 @@ REFINDEX=0 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 + 66, 2, 38, 1 ! pEL_LO_CER + 67, 2, 39, 1 ! pEL_HI + 68, 2, 40, 1 ! pEL_REAL + 69, 2, 41, 1 ! pEL_CLEAN + 72, 2, 42, 1 ! hSTOF + 73, 2, 43, 1 ! hEL_LO + 74, 2, 44, 1 ! hEL_LO_CER + 75, 2, 45, 1 ! hEL_HI + 76, 2, 46, 1 ! hEL_REAL + 77, 2, 47, 1 ! hEL_CLEAN ROC=6 diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map index 00e3409c..b72f6b9a 100644 --- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map +++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map @@ -48,14 +48,16 @@ REFINDEX=0 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 + 66, 2, 38, 1 ! pEL_LO_CER + 67, 2, 39, 1 ! pEL_HI + 68, 2, 40, 1 ! pEL_REAL + 69, 2, 41, 1 ! pEL_CLEAN + 72, 2, 42, 1 ! hSTOF + 73, 2, 43, 1 ! hEL_LO + 74, 2, 44, 1 ! hEL_LO_CER + 75, 2, 45, 1 ! hEL_HI + 76, 2, 46, 1 ! hEL_REAL + 77, 2, 47, 1 ! hEL_CLEAN ROC=6 diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map index c39b9976..590373b9 100644 --- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map +++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map @@ -48,14 +48,16 @@ REFINDEX=0 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 + 66, 2, 38, 1 ! pEL_LO_CER + 67, 2, 39, 1 ! pEL_HI + 68, 2, 40, 1 ! pEL_REAL + 69, 2, 41, 1 ! pEL_CLEAN + 72, 2, 42, 1 ! hSTOF + 73, 2, 43, 1 ! hEL_LO + 74, 2, 44, 1 ! hEL_LO_CER + 75, 2, 45, 1 ! hEL_HI + 76, 2, 46, 1 ! hEL_REAL + 77, 2, 47, 1 ! hEL_CLEAN ROC=6 diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map index 6ba7c4a2..c1c6aec0 100644 --- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map +++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map @@ -48,14 +48,16 @@ REFINDEX=0 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 + 66, 2, 38, 1 ! pEL_LO_CER + 67, 2, 39, 1 ! pEL_HI + 68, 2, 40, 1 ! pEL_REAL + 69, 2, 41, 1 ! pEL_CLEAN + 72, 2, 42, 1 ! hSTOF + 73, 2, 43, 1 ! hEL_LO + 74, 2, 44, 1 ! hEL_LO_CER + 75, 2, 45, 1 ! hEL_HI + 76, 2, 46, 1 ! hEL_REAL + 77, 2, 47, 1 ! hEL_CLEAN ROC=6 diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map index 85aa3d92..87f15b92 100644 --- a/MAPS/SHMS/DETEC/STACK/shms_stack.map +++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map @@ -52,7 +52,18 @@ REFINDEX=0 61, 2, 33, 1 ! hTRIG4 62, 2, 34, 1 ! hTRIG5 63, 2, 35, 1 ! hTRIG6 - + 64, 2, 36, 1 ! pSTOF + 65, 2, 37, 1 ! pEL_LO + 66, 2, 38, 1 ! pEL_LO_CER + 67, 2, 39, 1 ! pEL_HI + 68, 2, 40, 1 ! pEL_REAL + 69, 2, 41, 1 ! pEL_CLEAN + 72, 2, 42, 1 ! hSTOF + 73, 2, 43, 1 ! hEL_LO + 74, 2, 44, 1 ! hEL_LO_CER + 75, 2, 45, 1 ! hEL_HI + 76, 2, 46, 1 ! hEL_REAL + 77, 2, 47, 1 ! hEL_CLEAN ROC=6 SLOT=6 diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map index 1c9d4e54..e47f432f 100644 --- a/MAPS/SHMS/DETEC/TRIG/ptrig.map +++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map @@ -46,14 +46,16 @@ REFINDEX=0 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 + 66, 2, 38, 1 ! pEL_LO_CER + 67, 2, 39, 1 ! pEL_HI + 68, 2, 40, 1 ! pEL_REAL + 69, 2, 41, 1 ! pEL_CLEAN + 72, 2, 42, 1 ! hSTOF + 73, 2, 43, 1 ! hEL_LO + 74, 2, 44, 1 ! hEL_LO_CER + 75, 2, 45, 1 ! hEL_HI + 76, 2, 46, 1 ! hEL_REAL + 77, 2, 47, 1 ! hEL_CLEAN ROC=6 diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param index 1a0c3cc2..531faf6b 100644 --- a/PARAM/TRIG/tcoin.param +++ b/PARAM/TRIG/tcoin.param @@ -1,5 +1,5 @@ t_coin_numAdc = 13 -t_coin_numTdc = 88 +t_coin_numTdc = 92 t_coin_tdcoffset = 300. t_coin_adc_tdc_offset = 200. t_coin_tdcchanperns = 0.1 @@ -7,5 +7,5 @@ t_coin_tdcchanperns = 0.1 ; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM hFADC_TREF_ROC1 pAERSUM pHGCSUM pNGCSUM pFADC_TREF_ROC2" -; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 -t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hEDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1" +; 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 +t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hEDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_ROC2 pEL_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" diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param index cbf9b72c..58cdb625 100644 --- a/PARAM/TRIG/thms.param +++ b/PARAM/TRIG/thms.param @@ -1,5 +1,5 @@ t_hms_numAdc = 9 -t_hms_numTdc = 43 +t_hms_numTdc = 45 t_hms_tdcoffset=300. t_hms_adc_tdc_offset=300. t_hms_tdcchanperns=0.1 @@ -7,5 +7,5 @@ t_hms_tdcchanperns=0.1 ; bar num: 1 2 3 4 5 6 7 8 9 t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM hFADC_TREF_ROC1" -; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 -t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hEDTM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 pSTOF pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO hEL_HI hEL_REAL hEL_CLEAN" \ No newline at end of file +; 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 diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param index f39ab531..b7979240 100644 --- a/PARAM/TRIG/tshms.param +++ b/PARAM/TRIG/tshms.param @@ -1,5 +1,5 @@ t_shms_numAdc = 4 -t_shms_numTdc = 45 +t_shms_numTdc = 47 t_shms_tdcoffset = 300. t_shms_adc_tdc_offset = 200. @@ -8,5 +8,5 @@ t_shms_tdcchanperns = 0.1 ; bar num: 1 2 3 4 t_shms_adcNames = "pAERSUM pHGCSUM pNGCSUM pFADC_TREF_ROC2" -; BAR NUM: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 -t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO hEL_HI hEL_REAL hEL_CLEAN" +; 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 +t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAERSUM pHGCSUM pNGCSUM pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO pEL_LO_CER pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO hEL_LO_CER hEL_HI hEL_REAL hEL_CLEAN" -- GitLab