From 46e8d950cd27d23f3e0ed008dacc50082a391363 Mon Sep 17 00:00:00 2001
From: Yero1990 <cyero002@fiu.edu>
Date: Tue, 30 Jan 2018 15:35:35 -0500
Subject: [PATCH] added SHMS HGC/NGC Sums without EDTM to the ROC02 fadc SLOT14
map (#381)
---
MAPS/COIN/DETEC/TRIG/cointrig.map | 2 ++
MAPS/COIN/DETEC/coin.map | 2 ++
MAPS/SHMS/DETEC/AERO/paero_ptrig.map | 2 ++
MAPS/SHMS/DETEC/CAL/pcal_ptrig.map | 2 ++
MAPS/SHMS/DETEC/DC/pdc_ptrig.map | 2 ++
MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map | 2 ++
MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map | 2 ++
MAPS/SHMS/DETEC/STACK/shms_stack.map | 2 ++
MAPS/SHMS/DETEC/TRIG/ptrig.map | 4 +++-
PARAM/TRIG/tcoin.param | 6 +++---
PARAM/TRIG/tshms.param | 6 +++---
11 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/MAPS/COIN/DETEC/TRIG/cointrig.map b/MAPS/COIN/DETEC/TRIG/cointrig.map
index f053837c..8ad2b5d0 100644
--- a/MAPS/COIN/DETEC/TRIG/cointrig.map
+++ b/MAPS/COIN/DETEC/TRIG/cointrig.map
@@ -122,6 +122,8 @@ REFINDEX=3
1, 1, 11, 0 ! pHGCER
2, 1, 12, 0 ! pNGCER
3, 1, 13, 0 ! pPSHWR
+ 4, 1, 15, 0 ! pHGCER_MOD
+ 5, 1, 16, 0 ! pNGCER_MOD
11, 1, 14, 0 ! pFADC_TREF_ROC2
! F250 module
diff --git a/MAPS/COIN/DETEC/coin.map b/MAPS/COIN/DETEC/coin.map
index 74a3cf06..18092962 100644
--- a/MAPS/COIN/DETEC/coin.map
+++ b/MAPS/COIN/DETEC/coin.map
@@ -3865,6 +3865,8 @@ REFINDEX=3
1, 1, 11, 0 ! pHGCER
2, 1, 12, 0 ! pNGCER
3, 1, 13, 0 ! pPSHWR
+ 4, 1, 15, 0 ! pHGCER_MOD
+ 5, 1, 16, 0 ! pNGCER_MOD
11, 1, 14, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
index 4b37e9c4..c42d2564 100644
--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -13,6 +13,8 @@ REFINDEX=3
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
3, 1, 4, 0 ! pPSHWR
+ 4, 1, 6, 0 ! pHGCER_MOD
+ 5, 1, 7, 0 ! pNGCER_MOD
11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
index 540ba6fa..a14b1b2f 100644
--- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
+++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map
@@ -13,6 +13,8 @@ REFINDEX=3
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
3, 1, 4, 0 ! pPSHWR
+ 4, 1, 6, 0 ! pHGCER_MOD
+ 5, 1, 7, 0 ! pNGCER_MOD
11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
index 9a342b2f..c2cb7bec 100644
--- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
+++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map
@@ -13,6 +13,8 @@ REFINDEX=3
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
3, 1, 4, 0 ! pPSHWR
+ 4, 1, 6, 0 ! pHGCER_MOD
+ 5, 1, 7, 0 ! pNGCER_MOD
11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
index 619e65eb..1fae6fb5 100644
--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -13,6 +13,8 @@ REFINDEX=3
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
3, 1, 4, 0 ! pPSHWR
+ 4, 1, 6, 0 ! pHGCER_MOD
+ 5, 1, 7, 0 ! pNGCER_MOD
11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
index 3ae0503c..b117ca1d 100644
--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -13,6 +13,8 @@ REFINDEX=3
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
3, 1, 4, 0 ! pPSHWR
+ 4, 1, 6, 0 ! pHGCER_MOD
+ 5, 1, 7, 0 ! pNGCER_MOD
11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map
index b5ffcc97..23fb47db 100644
--- a/MAPS/SHMS/DETEC/STACK/shms_stack.map
+++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map
@@ -19,6 +19,8 @@ REFINDEX=3
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
3, 1, 4, 0 ! pPSHWR
+ 4, 1, 6, 0 ! pHGCER_MOD
+ 5, 1, 7, 0 ! pNGCER_MOD
11, 1, 5, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map
index a1c9d32c..3d2413ea 100644
--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -17,8 +17,10 @@ REFINDEX=3
1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCER
3, 1, 4, 0 ! pPSHWR
+ 4, 1, 6, 0 ! pHGCER_MOD
+ 5, 1, 7, 0 ! pNGCER_MOD
11, 1, 5, 0 ! pFADC_TREF_ROC2
-
+
! CAEN1190 module
SLOT=20
REFINDEX=1
diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param
index 144d3355..6e38bd80 100644
--- a/PARAM/TRIG/tcoin.param
+++ b/PARAM/TRIG/tcoin.param
@@ -1,11 +1,11 @@
-t_coin_numAdc = 14
+t_coin_numAdc = 16
t_coin_numTdc = 110
t_coin_tdcoffset = 300.
t_coin_adc_tdc_offset = 200.
t_coin_tdcchanperns = 0.1
-; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14
-t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1 pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
+; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1 pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2 pHGCER_MOD pNGCER_MOD"
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110
t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1 pPRE40_ROC1 pPRE100_ROC1 pPRE150_ROC1 pPRE200_ROC1 hPRE40_ROC1 hPRE100_ROC1 hPRE150_ROC1 hPRE200_ROC1 pPRE40_ROC2 pPRE100_ROC2 pPRE150_ROC2 pPRE200_ROC2 hPRE40_ROC2 hPRE100_ROC2 hPRE150_ROC2 hPRE200_ROC2"
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index 399843ac..d8ba2862 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,12 +1,12 @@
-t_shms_numAdc = 5
+t_shms_numAdc = 7
t_shms_numTdc = 57
t_shms_tdcoffset = 300.
t_shms_adc_tdc_offset = 200.
t_shms_tdcchanperns = 0.1
-; bar num: 1 2 3 4 5
-t_shms_adcNames = "pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
+; bar num: 1 2 3 4 5 6 7
+t_shms_adcNames = "pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2 pHGCER_MOD pNGCER_MOD"
; BAR NUM: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
t_shms_tdcNames = "pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN pPRE40 pPRE100 pPRE150 pPRE200 hPRE40 hPRE100 hPRE150 hPRE200"
--
GitLab