Skip to content
Snippets Groups Projects
Unverified Commit 719923be authored by Eric Pooser's avatar Eric Pooser Committed by GitHub
Browse files

Map work (#353) 

* Add SHMS pre-shower sum and make naming consistant

* Update HMS maps

* Update SHMS maps

* Propagate changes to DEF-files

* Propogate changes to SHMS DEFfiles
parent 9cf7676d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MAPS/SHMS/DETEC/STACK/shms_stack.map
+ 9
− 8
View file @ 719923be
...@@ -15,9 +15,10 @@ ROC=2 ...@@ -15,9 +15,10 @@ ROC=2
SLOT=14 SLOT=14
REFINDEX=3 REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2 11,1000, 0, 3 ! pFADC_TREF_ROC2
0, 1, 1, 0 ! pAERSUM 0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCERSUM 1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCERSUM 2, 1, 3, 0 ! pNGCER
2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2 11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20 SLOT=20
...@@ -36,12 +37,12 @@ REFINDEX=0 ...@@ -36,12 +37,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T 36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T 37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3 38, 2, 9, 1 ! pT3
39, 2, 10, 1 ! pAERSUM 39, 2, 10, 1 ! pAER
40, 2, 11, 1 ! pHGCERSUM 40, 2, 11, 1 ! pHGCER
41, 2, 12, 1 ! pNGCERSUM 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM 42, 2, 23, 1 ! pEDTM
43, 2, 24, 1 ! pPRSHWRLO 43, 2, 24, 1 ! pPRLO
44, 2, 25, 1 ! pPRSHWRHI 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1 48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2 49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3 50, 2, 28, 1 ! pTRIG3
......
MAPS/SHMS/DETEC/TRIG/ptrig.map
+ 9
− 8
View file @ 719923be
...@@ -7,9 +7,10 @@ ROC=2 ...@@ -7,9 +7,10 @@ ROC=2
SLOT=14 SLOT=14
REFINDEX=3 REFINDEX=3
11,1000, 0, 3 ! pFADC_TREF_ROC2 11,1000, 0, 3 ! pFADC_TREF_ROC2
0, 1, 1, 0 ! pAERSUM 0, 1, 1, 0 ! pAER
1, 1, 2, 0 ! pHGCERSUM 1, 1, 2, 0 ! pHGCER
2, 1, 3, 0 ! pNGCERSUM 2, 1, 3, 0 ! pNGCER
2, 1, 3, 0 ! pPSHWR
11, 1, 4, 0 ! pFADC_TREF_ROC2 11, 1, 4, 0 ! pFADC_TREF_ROC2
SLOT=20 SLOT=20
...@@ -28,12 +29,12 @@ REFINDEX=0 ...@@ -28,12 +29,12 @@ REFINDEX=0
36, 2, 7, 1 ! p1T 36, 2, 7, 1 ! p1T
37, 2, 8, 1 ! p2T 37, 2, 8, 1 ! p2T
38, 2, 9, 1 ! pT3 38, 2, 9, 1 ! pT3
39, 2, 10, 1 ! pAERSUM 39, 2, 10, 1 ! pAER
40, 2, 11, 1 ! pHGCERSUM 40, 2, 11, 1 ! pHGCER
41, 2, 12, 1 ! pNGCERSUM 41, 2, 12, 1 ! pNGCER
42, 2, 23, 1 ! pEDTM 42, 2, 23, 1 ! pEDTM
43, 2, 24, 1 ! pPRSHWRLO 43, 2, 24, 1 ! pPRLO
44, 2, 25, 1 ! pPRSHWRHI 44, 2, 25, 1 ! pPRHI
48, 2, 26, 1 ! pTRIG1 48, 2, 26, 1 ! pTRIG1
49, 2, 27, 1 ! pTRIG2 49, 2, 27, 1 ! pTRIG2
50, 2, 28, 1 ! pTRIG3 50, 2, 28, 1 ! pTRIG3
......
PARAM/TRIG/tcoin.param
+ 5
− 5
View file @ 719923be
t_coin_numAdc = 13 t_coin_numAdc = 14
t_coin_numTdc = 94 t_coin_numTdc = 94
t_coin_tdcoffset = 300. t_coin_tdcoffset = 300.
t_coin_adc_tdc_offset = 200. t_coin_adc_tdc_offset = 200.
t_coin_tdcchanperns = 0.1 t_coin_tdcchanperns = 0.1
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 ; 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 hAERSUM hCERSUM hFADC_TREF_ROC1 pAERSUM pHGCSUM pNGCSUM pFADC_TREF_ROC2" t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1 pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 ; 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" 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"
PARAM/TRIG/thms.param
+ 4
− 4
View file @ 719923be
...@@ -4,8 +4,8 @@ t_hms_tdcoffset=300. ...@@ -4,8 +4,8 @@ t_hms_tdcoffset=300.
t_hms_adc_tdc_offset=300. t_hms_adc_tdc_offset=300.
t_hms_tdcchanperns=0.1 t_hms_tdcchanperns=0.1
; bar num: 1 2 3 4 5 6 7 8 9 ; 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" t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1"
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 ; 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" t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1 hTRIG2 hTRIG3 hTRIG4 hTRIG5 hTRIG6 pTRIG1 pTRIG2 pTRIG3 pTRIG4 pTRIG5 pTRIG6 pSTOF pEL_LO_LO pEL_LO pEL_HI pEL_REAL pEL_CLEAN hSTOF hEL_LO_LO hEL_LO hEL_HI hEL_REAL hEL_CLEAN"
\ No newline at end of file \ No newline at end of file
PARAM/TRIG/tshms.param
+ 5
− 5
View file @ 719923be
t_shms_numAdc = 4 t_shms_numAdc = 5
t_shms_numTdc = 49 t_shms_numTdc = 49
t_shms_tdcoffset = 300. t_shms_tdcoffset = 300.
t_shms_adc_tdc_offset = 200. t_shms_adc_tdc_offset = 200.
t_shms_tdcchanperns = 0.1 t_shms_tdcchanperns = 0.1
; bar num: 1 2 3 4 ; bar num: 1 2 3 4 5
t_shms_adcNames = "pAERSUM pHGCSUM pNGCSUM pFADC_TREF_ROC2" t_shms_adcNames = "pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2"
; BAR NUM: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 ; 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" 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"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment