Scalers map (#200)

* added HODO EDTM to Maps and Param filrs for HMS/SHMS; Added block T.hms.* in epics_short.def in order to produce HMS Hodo EDTM leaf variable; Added Hodo EDTM to scaler.map * undo changes in HMS hodo naming schemes for scalers map

Scalers map (#200)
3d051873 · Yero1990 · Eric Pooser · 4d522056 · 3d051873 · 3d051873
Commit 3d051873 authored 7 years ago by Yero1990 Committed by Eric Pooser 7 years ago
--- a/DEF-files/HMS/EPICS/epics_short.def
+++ b/DEF-files/HMS/EPICS/epics_short.def
-# See $ANALYZER/examples/output_example.def for examples
-
+block T.hms.*

 begin epics
 IBC3H00CRCUR4

--- a/MAPS/COIN/DETEC/TRIG/cointrig.map
+++ b/MAPS/COIN/DETEC/TRIG/cointrig.map
@@ -46,7 +46,7 @@ REFINDEX=0
    11,       2,     12,     1!  hPSHWRLO
    12,       2,     13,     1!  hPSHWRHI
    13,       2,     14,     1!  hSHWR
-    14,       2,     15,     1!  hAERSUM
+    14,       2,     15,     1!  hHODO_EDTM
    15,       2,     16,     1!  hCERSUM
 !CAEN1190 module
 SLOT=20
@@ -102,6 +102,7 @@ REFINDEX=0
  39,   2,  10,   1  ! pAERSUM
  40,   2,  11,   1  ! pHGCERSUM
  41,   2,  12,   1  ! pNGCERSUM
+  42,   2,  23,   1  ! pHODO_EDTM

 ROC=6


--- a/MAPS/HMS/DETEC/AERO/haero_htrig.map
+++ b/MAPS/HMS/DETEC/AERO/haero_htrig.map
@@ -32,7 +32,7 @@ REFINDEX=0
  11,   2,  12,   1  ! hPSHWRLO
  12,   2,  13,   1  ! hPSHWRHI
  13,   2,  14,   1  ! hSHWR
-  14,   2,  15,   1  ! hAERSUM
+  14,   2,  15,   1  ! hHODO_EDTM
  15,   2,  16,   1  ! hCERSUM

 SLOT=20

--- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map
@@ -32,7 +32,7 @@ REFINDEX=0
  11,   2,  12,   1  ! hPSHWRLO
  12,   2,  13,   1  ! hPSHWRHI
  13,   2,  14,   1  ! hSHWR
-  14,   2,  15,   1  ! hAERSUM
+  14,   2,  15,   1  ! hHODO_EDTM
  15,   2,  16,   1  ! hCERSUM

 SLOT=20

--- a/MAPS/HMS/DETEC/CER/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map
@@ -32,7 +32,7 @@ REFINDEX=0
  11,   2,  12,   1  ! hPSHWRLO
  12,   2,  13,   1  ! hPSHWRHI
  13,   2,  14,   1  ! hSHWR
-  14,   2,  15,   1  ! hAERSUM
+  14,   2,  15,   1  ! hHODO_EDTM
  15,   2,  16,   1  ! hCERSUM

 SLOT=20

--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -43,7 +43,7 @@ REFINDEX=0
  11,   2,  12,   1  ! hPSHWRLO
  12,   2,  13,   1  ! hPSHWRHI
  13,   2,  14,   1  ! hSHWR
-  14,   2,  15,   1  ! hAERSUM
+  14,   2,  15,   1  ! hHODO_EDTM
  15,   2,  16,   1  ! hCERSUM

 SLOT=20

--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -46,7 +46,7 @@ REFINDEX=0
    11,       2,     12,     1!  hPSHWRLO
    12,       2,     13,     1!  hPSHWRHI
    13,       2,     14,     1!  hSHWR
-    14,       2,     15,     1!  hAERSUM
+    14,       2,     15,     1!  hHODO_EDTM
    15,       2,     16,     1!  hCERSUM
 !CAEN1190 module
 SLOT=20

--- a/MAPS/SCALERS/db_HScalevt.dat
+++ b/MAPS/SCALERS/db_HScalevt.dat
@@ -141,8 +141,6 @@ variable 0 19 1 .hod.1x7.negScaler HMS 1X- paddle 7
 variable 0 19 2 .hod.1x7.negScalerRate HMS 1X- paddle 7
 variable 0 3 1 .hod.1x7.posScaler HMS 1X+ paddle 7
 variable 0 3 2 .hod.1x7.posScalerRate HMS 1X+ paddle 7
-variable 6 14 1 .AERSUM.scaler HMS AERSUM
-variable 6 14 2 .AERSUM.scalerRate HMS AERSUM
 variable 2 12 1 .hod.2x10.posScaler HMS 2X+ paddle 10
 variable 2 12 2 .hod.2x10.posScalerRate HMS 2X+ paddle 10
 variable 6 25 1 .BCM4A.scaler bcm4a
@@ -303,6 +301,8 @@ variable 1 1 1 .hod.1y3.posScaler HMS 1Y+ paddle 3
 variable 1 1 2 .hod.1y3.posScalerRate HMS 1Y+ paddle 3
 variable 1 17 1 .hod.1y3.negScaler HMS 1Y- paddle 3
 variable 1 17 2 .hod.1y3.negScalerRate HMS 1Y- paddle 3
+variable 6 14 1 .HOD_EDTM.scaler HMS HODO EDTM
+variable 6 14 2 .HOD_EDTM.scalerRate HMS HODO EDTM
 variable 0 26 1 .hod.1x13.negScaler HMS 1X- paddle 13
 variable 0 26 2 .hod.1x13.negScalerRate HMS 1X- paddle 13
 variable 0 10 1 .hod.1x13.posScaler HMS 1X+ paddle 13

--- a/MAPS/SCALERS/db_PScalevt.dat
+++ b/MAPS/SCALERS/db_PScalevt.dat
@@ -88,8 +88,6 @@ variable 2 14 1 .hod.2x14.posScaler SHMS 2X+ paddle 14
 variable 2 14 2 .hod.2x14.posScalerRate SHMS 2X+ paddle 14
 variable 3 28 1 .hod.2y10.negScaler SHMS 2y- paddle 10
 variable 3 28 2 .hod.2y10.negScalerRate SHMS 2y- paddle 10
-variable 7 10 1 .DSUM.scaler SHMS DSUM
-variable 7 10 2 .DSUM.scalerRate SHMS DSUM
 variable 3 12 1 .hod.2y10.posScaler SHMS 2y+ paddle 10
 variable 3 12 2 .hod.2y10.posScalerRate SHMS 2y+ paddle 10
 variable 3 17 1 .hod.2y3.negScaler SHMS 2y- paddle 3
@@ -162,6 +160,8 @@ variable 0 13 1 .hod.1x12.posScaler SHMS 1X+ paddle 12
 variable 0 13 2 .hod.1x12.posScalerRate SHMS 1X+ paddle 12
 variable 3 24 1 .hod.2y9.negScaler SHMS 2y- paddle 9
 variable 3 24 2 .hod.2y9.negScalerRate SHMS 2y- paddle 9
+variable 7 10 1 .HOD_EDTM.scaler SHMS HODO EDTM
+variable 7 10 2 .HOD_EDTM.scalerRate SHMS HODO EDTM
 variable 1 21 1 .hod.1y4.posScaler SHMS 1Y+ paddle 4
 variable 1 21 2 .hod.1y4.posScalerRate SHMS 1Y+ paddle 4
 variable 2 8 1 .hod.2x9.posScaler SHMS 2X+ paddle 9

--- a/MAPS/SCALERS/scaler.map
+++ b/MAPS/SCALERS/scaler.map
@@ -205,7 +205,7 @@ DSUM         0    4     6    10    1     HMS DSUM
 PSHWRLO      0    4     6    11    1     HMS PSHWRLO                                      
 PSHWRHI      0    4     6    12    1     HMS PSHWRHI                                      
 SHWR         0    4     6    13    1     HMS SHWR                                         
-AERSUM       0    4     6    14    1     HMS AERSUM                                       
+HOD_EDTM     0    4     6    14    1     HMS HODO EDTM                                       
 CERSUM       0    4     6    15    1     HMS CERSUM                                       
 BCM4A        0    4     6    25    1     bcm4a                                           
 BCM4B        0    4     6    26    1     bcm4b                                           
@@ -361,7 +361,7 @@ Trig         0    5     7    6     1     SHMS T1
 ASUM         0    5     7    7     1     SHMS ASUM                                         
 BSUM         0    5     7    8     1     SHMS BSUM                                         
 CSUM         0    5     7    9     1     SHMS CSUM                                         
-DSUM         0    5     7    10    1     SHMS DSUM                                         
+HOD_EDTM     0    5     7    10    1     SHMS HODO EDTM                                          
 PSHWRLO      0    5     7    11    1     SHMS PSHWRLO                                      
 PSHWRHI      0    5     7    12    1     SHMS PSHWRHI                                      
 SHWR         0    5     7    13    1     SHMS SHWR                                         

--- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
+++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
  39,   2,  10,   1  ! pAERSUM
  40,   2,  11,   1  ! pHGCSUM
  41,   2,  12,   1  ! pNGCSUM
+  42,   2,  23,   1  ! pHODO_EDTM

 ROC=6


--- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
  39,   2,  10,   1  ! pAERSUM
  40,   2,  11,   1  ! pHGCERSUM
  41,   2,  12,   1  ! pNGCERSUM
+  42,   2,  23,   1  ! pHODO_EDTM

 ROC=6


--- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
+++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
  39,   2,  10,   1  ! pAERSUM
  40,   2,  11,   1  ! pHGCERSUM
  41,   2,  12,   1  ! pNGCERSUM
+  42,   2,  23,   1  ! pHODO_EDTM

 ROC=6


--- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
+++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
@@ -26,6 +26,7 @@ SLOT=19
  39,   2,  10,   1  ! pAERSUM
  40,   2,  11,   1  ! pHGCERSUM
  41,   2,  12,   1  ! pNGCERSUM
+  42,   2,  23,   1  ! pHODO_EDTM

 ROC=6


--- a/MAPS/SHMS/DETEC/STACK/shms_stack.map
+++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map
@@ -36,6 +36,7 @@ REFINDEX=0
  39,   2,  10,   1  ! pAERSUM
  40,   2,  11,   1  ! pHGCERSUM
  41,   2,  12,   1  ! pNGCERSUM
+  42,   2,  23,   1  ! pHODO_EDTM

 ROC=6


--- a/MAPS/SHMS/DETEC/TRIG/ptrig.map
+++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map
@@ -31,6 +31,7 @@ REFINDEX=0
  39,   2,  10,   1  ! pAERSUM
  40,   2,  11,   1  ! pHGCERSUM
  41,   2,  12,   1  ! pNGCERSUM
+  42,   2,  23,   1  ! pHODO_EDTM

 ROC=6


--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -6,5 +6,5 @@ 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     9     10    11    12       13       14    15      16      17    18      19     20      21
-t_hms_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPSHWRLO hPSHWRHI hSHWR hAERSUM hCERSUM hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4"
+; bar num:        1   2   3   4   5   6   7   8     9     10    11    12       13       14    15         16      17  18      19      20      21
+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"
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
 t_shms_numAdc = 7
-t_shms_numTdc = 22
+t_shms_numTdc = 23
 t_shms_tdcoffset = -300.
 t_shms_tdcchanperns = 0.1

 ; bar num:            1       2       3      4     5     6     7
 t_shms_adcNames = "pAERSUM pHGCSUM pNGCSUM pFRXA pFRYA pFRXB pFRYB"

-; bar num:          1   2   3   4   5   6   7   8   9     10      11      12      13     14      15      16      17      18      19      20      21       22
-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"
\ 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
+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"
\ No newline at end of file