diff --git a/MAPS/HMS/DETEC/AERO/haero_htrig.map b/MAPS/HMS/DETEC/AERO/haero_htrig.map index e8f952774b9ea4749b7500ce0a74a7ad373552c3..1fcbbf6f896f570f809ce86f28815700dbc122f3 100644 --- a/MAPS/HMS/DETEC/AERO/haero_htrig.map +++ b/MAPS/HMS/DETEC/AERO/haero_htrig.map @@ -40,6 +40,12 @@ REFINDEX=0 29, 2, 25, 1 ! hTRIG4 30, 2, 26, 1 ! hTRIG5 31, 2, 27, 1 ! hTRIG6 + 16, 2, 28, 1 ! pTRIG1 + 17, 2, 29, 1 ! pTRIG2 + 18, 2, 30, 1 ! pTRIG3 + 19, 2, 31, 1 ! pTRIG4 + 20, 2, 32, 1 ! pTRIG5 + 21, 2, 33, 1 ! pTRIG6 SLOT=20 127, 2, 17, 1 ! hT2 diff --git a/MAPS/HMS/DETEC/CAL/hcal_htrig.map b/MAPS/HMS/DETEC/CAL/hcal_htrig.map index 2bd95b593b5c1ba90575c6ccba02f8d6a448cee5..7d42faa27de0159d8d1fe18004671673fe5f065a 100644 --- a/MAPS/HMS/DETEC/CAL/hcal_htrig.map +++ b/MAPS/HMS/DETEC/CAL/hcal_htrig.map @@ -40,6 +40,12 @@ REFINDEX=0 29, 2, 25, 1 ! hTRIG4 30, 2, 26, 1 ! hTRIG5 31, 2, 27, 1 ! hTRIG6 + 16, 2, 28, 1 ! pTRIG1 + 17, 2, 29, 1 ! pTRIG2 + 18, 2, 30, 1 ! pTRIG3 + 19, 2, 31, 1 ! pTRIG4 + 20, 2, 32, 1 ! pTRIG5 + 21, 2, 33, 1 ! pTRIG6 SLOT=20 127, 2, 17, 1 ! hT2 diff --git a/MAPS/HMS/DETEC/CER/hcer_htrig.map b/MAPS/HMS/DETEC/CER/hcer_htrig.map index d0bcff8316b971eccbd2a4460d5c673b0645edaf..f1282cf3c8efffd21aa62a7cd952530a67d4d9f5 100644 --- a/MAPS/HMS/DETEC/CER/hcer_htrig.map +++ b/MAPS/HMS/DETEC/CER/hcer_htrig.map @@ -40,6 +40,12 @@ REFINDEX=0 29, 2, 25, 1 ! hTRIG4 30, 2, 26, 1 ! hTRIG5 31, 2, 27, 1 ! hTRIG6 + 16, 2, 28, 1 ! pTRIG1 + 17, 2, 29, 1 ! pTRIG2 + 18, 2, 30, 1 ! pTRIG3 + 19, 2, 31, 1 ! pTRIG4 + 20, 2, 32, 1 ! pTRIG5 + 21, 2, 33, 1 ! pTRIG6 SLOT=20 127, 2, 17, 1 ! hT2 diff --git a/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map b/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map index 873e201cd984b0d7dcbb9d5cc5c3a577a73e6d60..262db594c1275ea961c158fefb282fdf01912d4c 100644 --- a/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map +++ b/MAPS/HMS/DETEC/DC/hdc_6gev_htrig.map @@ -32,8 +32,20 @@ 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 + 26, 2, 22, 1 ! hTRIG1 + 27, 2, 23, 1 ! hTRIG2 + 28, 2, 24, 1 ! hTRIG3 + 29, 2, 25, 1 ! hTRIG4 + 30, 2, 26, 1 ! hTRIG5 + 31, 2, 27, 1 ! hTRIG6 + 16, 2, 28, 1 ! pTRIG1 + 17, 2, 29, 1 ! pTRIG2 + 18, 2, 30, 1 ! pTRIG3 + 19, 2, 31, 1 ! pTRIG4 + 20, 2, 32, 1 ! pTRIG5 + 21, 2, 33, 1 ! pTRIG6 SLOT=20 127, 2, 17, 1 ! hT2 diff --git a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map index b72712cd996c7ee4de678d15952581fe97ca66bb..4c89e16d911c6e0f22f8d27337f2274b5b55c303 100644 --- a/MAPS/HMS/DETEC/HODO/hhodo_htrig.map +++ b/MAPS/HMS/DETEC/HODO/hhodo_htrig.map @@ -40,6 +40,12 @@ REFINDEX=0 29, 2, 25, 1 ! hTRIG4 30, 2, 26, 1 ! hTRIG5 31, 2, 27, 1 ! hTRIG6 + 16, 2, 28, 1 ! pTRIG1 + 17, 2, 29, 1 ! pTRIG2 + 18, 2, 30, 1 ! pTRIG3 + 19, 2, 31, 1 ! pTRIG4 + 20, 2, 32, 1 ! pTRIG5 + 21, 2, 33, 1 ! pTRIG6 SLOT=20 127, 2, 17, 1 ! hT2 diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map index 5660f713478c7991226e376e2f9ac2bea2fe8308..7931481834d23cc26fe4dad82645b5121957d6b2 100644 --- a/MAPS/HMS/DETEC/STACK/hms_stack.map +++ b/MAPS/HMS/DETEC/STACK/hms_stack.map @@ -2,6 +2,7 @@ ! HDC_ID=11 :: TDC ! HAERO_ID=12 :: (TDC),ADC ! HSCIN_ID=13 :: ADC+,ADC-,TDC+,TDC- +! HCER_ID=14 :: (TDC),ADC ! HCAL_ID=15 :: ADC ! HRASTER_ID=18 :: ADC @@ -44,6 +45,12 @@ REFINDEX=0 29, 2, 25, 1 ! hTRIG4 30, 2, 26, 1 ! hTRIG5 31, 2, 27, 1 ! hTRIG6 + 16, 2, 28, 1 ! pTRIG1 + 17, 2, 29, 1 ! pTRIG2 + 18, 2, 30, 1 ! pTRIG3 + 19, 2, 31, 1 ! pTRIG4 + 20, 2, 32, 1 ! pTRIG5 + 21, 2, 33, 1 ! pTRIG6 SLOT=20 127, 2, 17, 1 ! hT2 @@ -1480,6 +1487,15 @@ REFINDEX=0 124, 4, 10, 3 ! h2y10T- +DETECTOR=14 + +ROC=1 + +SLOT=7 + 14, 1, 1, 0 ! hCER01 + 15, 1, 2, 0 ! hCER02 + + DETECTOR=15 ROC=1 diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map index 35cc2d5e494c1f0a66cbe9281581f141ddd57b53..1bdacb08469c6cb2df9a77deb725f4899b39931b 100644 --- a/MAPS/HMS/DETEC/TRIG/htrig.map +++ b/MAPS/HMS/DETEC/TRIG/htrig.map @@ -48,6 +48,13 @@ REFINDEX=0 29, 2, 25, 1! hTRIG4 30, 2, 26, 1! hTRIG5 31, 2, 27, 1! hTRIG6 + 16, 2, 28, 1! pTRIG1 + 17, 2, 29, 1! pTRIG2 + 18, 2, 30, 1! pTRIG3 + 19, 2, 31, 1! pTRIG4 + 20, 2, 32, 1! pTRIG5 + 21, 2, 33, 1! pTRIG6 + !CAEN1190 module SLOT=20 diff --git a/MAPS/SCALERS/db_HScalevt.dat b/MAPS/SCALERS/db_HScalevt.dat index e1b51064e28b261ca0c5a708e7246ff26e5110df..e4a5ef1af221db6a5df01b6d4dd5ff259b3aa051 100644 --- a/MAPS/SCALERS/db_HScalevt.dat +++ b/MAPS/SCALERS/db_HScalevt.dat @@ -153,6 +153,8 @@ variable 0 15 1 .hod.1x16.posScaler HMS 1X+ paddle 16 variable 0 15 2 .hod.1x16.posScalerRate HMS 1X+ paddle 16 variable 3 13 1 .Empty_16.scaler Empty variable 3 13 2 .Empty_16.scalerRate Empty +variable 5 3 1 .pTRIG4.scaler SHMS TRIG4 +variable 5 3 2 .pTRIG4.scalerRate SHMS TRIG4 variable 1 24 1 .hod.1y9.negScaler HMS 1Y- paddle 9 variable 1 24 2 .hod.1y9.negScalerRate HMS 1Y- paddle 9 variable 2 4 1 .hod.2x2.posScaler HMS 2X+ paddle 2 @@ -179,12 +181,14 @@ variable 1 22 1 .hod.1y6.negScaler HMS 1Y- paddle 6 variable 1 22 2 .hod.1y6.negScalerRate HMS 1Y- paddle 6 variable 0 5 1 .hod.1x4.posScaler HMS 1X+ paddle 4 variable 0 5 2 .hod.1x4.posScalerRate HMS 1X+ paddle 4 +variable 5 1 1 .pTRIG2.scaler SHMS TRIG2 +variable 5 1 2 .pTRIG2.scalerRate SHMS TRIG2 variable 0 21 1 .hod.1x4.negScaler HMS 1X- paddle 4 variable 0 21 2 .hod.1x4.negScalerRate HMS 1X- paddle 4 variable 3 7 1 .hod.2y8.posScaler HMS 2Y+ paddle 8 variable 3 7 2 .hod.2y8.posScalerRate HMS 2Y+ paddle 8 -variable 5 15 1 .hTRIG6.scaler HMS TRIG6 -variable 5 15 2 .hTRIG6.scalerRate HMS TRIG6 +variable 5 15 1 .hTRIG6.scaler HMS TRIG6 +variable 5 15 2 .hTRIG6.scalerRate HMS TRIG6 variable 3 23 1 .hod.2y8.negScaler HMS 2Y- paddle 8 variable 3 23 2 .hod.2y8.negScalerRate HMS 2Y- paddle 8 variable 2 18 1 .hod.2x5.negScaler HMS 2X- paddle 5 @@ -235,24 +239,32 @@ variable 1 28 1 .hod.1y10.negScaler HMS 1Y- paddle 10 variable 1 28 2 .hod.1y10.negScalerRate HMS 1Y- paddle 10 variable 1 12 1 .hod.1y10.posScaler HMS 1Y+ paddle 10 variable 1 12 2 .hod.1y10.posScalerRate HMS 1Y+ paddle 10 +variable 5 4 1 .pTRIG5.scaler SHMS TRIG5 +variable 5 4 2 .pTRIG5.scalerRate SHMS TRIG5 variable 3 24 1 .hod.2y9.negScaler HMS 2Y- paddle 9 variable 3 24 2 .hod.2y9.negScalerRate HMS 2Y- paddle 9 +variable 5 5 1 .pTRIG6.scaler SHMS TRIG6 +variable 5 5 2 .pTRIG6.scalerRate SHMS TRIG6 +variable 5 0 1 .pTRIG1.scaler SHMS TRIG1 +variable 5 0 2 .pTRIG1.scalerRate SHMS TRIG1 +variable 5 2 1 .pTRIG3.scaler SHMS TRIG3 +variable 5 2 2 .pTRIG3.scalerRate SHMS TRIG3 variable 3 8 1 .hod.2y9.posScaler HMS 2Y+ paddle 9 variable 3 8 2 .hod.2y9.posScalerRate HMS 2Y+ paddle 9 -variable 5 14 1 .hTRIG5.scaler HMS TRIG5 -variable 5 14 2 .hTRIG5.scalerRate HMS TRIG5 -variable 5 13 1 .hTRIG4.scaler HMS TRIG4 -variable 5 13 2 .hTRIG4.scalerRate HMS TRIG4 +variable 5 14 1 .hTRIG5.scaler HMS TRIG5 +variable 5 14 2 .hTRIG5.scalerRate HMS TRIG5 +variable 5 13 1 .hTRIG4.scaler HMS TRIG4 +variable 5 13 2 .hTRIG4.scalerRate HMS TRIG4 variable 2 21 1 .hod.2x4.negScaler HMS 2X- paddle 4 variable 2 21 2 .hod.2x4.negScalerRate HMS 2X- paddle 4 -variable 5 10 1 .hTRIG1.scaler HMS TRIG1 -variable 5 10 2 .hTRIG1.scalerRate HMS TRIG1 +variable 5 10 1 .hTRIG1.scaler HMS TRIG1 +variable 5 10 2 .hTRIG1.scalerRate HMS TRIG1 variable 2 5 1 .hod.2x4.posScaler HMS 2X+ paddle 4 variable 2 5 2 .hod.2x4.posScalerRate HMS 2X+ paddle 4 -variable 5 12 1 .hTRIG3.scaler HMS TRIG3 -variable 5 12 2 .hTRIG3.scalerRate HMS TRIG3 -variable 5 11 1 .hTRIG2.scaler HMS TRIG2 -variable 5 11 2 .hTRIG2.scalerRate HMS TRIG2 +variable 5 12 1 .hTRIG3.scaler HMS TRIG3 +variable 5 12 2 .hTRIG3.scalerRate HMS TRIG3 +variable 5 11 1 .hTRIG2.scaler HMS TRIG2 +variable 5 11 2 .hTRIG2.scalerRate HMS TRIG2 variable 6 15 1 .CERSUM.scaler HMS CERSUM variable 6 15 2 .CERSUM.scalerRate HMS CERSUM variable 6 13 1 .SHWR.scaler HMS SHWR diff --git a/MAPS/SCALERS/db_PScalevt.dat b/MAPS/SCALERS/db_PScalevt.dat index 29a1f5aa0ecfe8c55e1162dae9f6a1ef8b3bc424..f7a5466d4b9405cec5076045c985a8d7b6a3f62e 100644 --- a/MAPS/SCALERS/db_PScalevt.dat +++ b/MAPS/SCALERS/db_PScalevt.dat @@ -30,6 +30,8 @@ variable 3 23 1 .hod.2y8.negScaler SHMS 2y- paddle 8 variable 3 23 2 .hod.2y8.negScalerRate SHMS 2y- paddle 8 variable 0 4 1 .hod.1x2.posScaler SHMS 1X+ paddle 2 variable 0 4 2 .hod.1x2.posScalerRate SHMS 1X+ paddle 2 +variable 0 10 1 .hod.1x13.posScaler SHMS 1X+ paddle 13 +variable 0 10 2 .hod.1x13.posScalerRate SHMS 1X+ paddle 13 variable 0 20 1 .hod.1x2.negScaler SHMS 1X- paddle 2 variable 0 20 2 .hod.1x2.negScalerRate SHMS 1X- paddle 2 variable 7 6 1 .Trig.scaler SHMS T1 @@ -66,8 +68,16 @@ variable 7 13 1 .SHWR.scaler SHMS SHWR variable 7 13 2 .SHWR.scalerRate SHMS SHWR variable 0 17 1 .hod.1x3.negScaler SHMS 1X- paddle 3 variable 0 17 2 .hod.1x3.negScalerRate SHMS 1X- paddle 3 +variable 6 14 1 .hTRIG5.scaler HMS TRIG5 +variable 6 14 2 .hTRIG5.scalerRate HMS TRIG5 +variable 6 13 1 .hTRIG4.scaler HMS TRIG4 +variable 6 13 2 .hTRIG4.scalerRate HMS TRIG4 variable 1 29 1 .hod.1y12.posScaler SHMS 1Y+ paddle 12 variable 1 29 2 .hod.1y12.posScalerRate SHMS 1Y+ paddle 12 +variable 6 10 1 .hTRIG1.scaler HMS TRIG1 +variable 6 10 2 .hTRIG1.scalerRate HMS TRIG1 +variable 6 12 1 .hTRIG3.scaler HMS TRIG3 +variable 6 12 2 .hTRIG3.scalerRate HMS TRIG3 variable 1 17 1 .hod.1y3.posScaler SHMS 1Y+ paddle 3 variable 1 17 2 .hod.1y3.posScalerRate SHMS 1Y+ paddle 3 variable 1 1 1 .hod.1y3.negScaler SHMS 1Y- paddle 3 @@ -108,14 +118,16 @@ variable 2 5 1 .hod.2x4.posScaler SHMS 2X+ paddle 4 variable 2 5 2 .hod.2x4.posScalerRate SHMS 2X+ paddle 4 variable 7 15 1 .CERSUM.scaler SHMS CERSUM variable 7 15 2 .CERSUM.scalerRate SHMS CERSUM +variable 6 15 1 .hTRIG6.scaler HMS TRIG6 +variable 6 15 2 .hTRIG6.scalerRate HMS TRIG6 variable 1 4 1 .hod.1y2.negScaler SHMS 1Y- paddle 2 variable 1 4 2 .hod.1y2.negScalerRate SHMS 1Y- paddle 2 variable 0 3 1 .hod.1x7.posScaler SHMS 1X+ paddle 7 variable 0 3 2 .hod.1x7.posScalerRate SHMS 1X+ paddle 7 variable 1 9 1 .hod.1y11.negScaler SHMS 1Y- paddle 11 variable 1 9 2 .hod.1y11.negScalerRate SHMS 1Y- paddle 11 -variable 7 7 1 .ASUM.scaler SHMS ASUM -variable 7 7 2 .ASUM.scalerRate SHMS ASUM +variable 6 11 1 .hTRIG2.scaler HMS TRIG2 +variable 6 11 2 .hTRIG2.scalerRate HMS TRIG2 variable 7 3 1 .S2Y.scaler SHMS S2Y variable 7 3 2 .S2Y.scalerRate SHMS S2Y variable 7 2 1 .S2X.scaler SHMS S2X @@ -156,12 +168,14 @@ variable 7 14 1 .AERSUM.scaler SHMS AERSUM variable 7 14 2 .AERSUM.scalerRate SHMS AERSUM variable 0 26 1 .hod.1x13.negScaler SHMS 1X- paddle 13 variable 0 26 2 .hod.1x13.negScalerRate SHMS 1X- paddle 13 -variable 0 10 1 .hod.1x13.posScaler SHMS 1X+ paddle 13 -variable 0 10 2 .hod.1x13.posScalerRate SHMS 1X+ paddle 13 +variable 0 28 1 .hod.1x10.negScaler SHMS 1X- paddle 10 +variable 0 28 2 .hod.1x10.negScalerRate SHMS 1X- paddle 10 variable 6 4 1 .pTRIG5.scaler SHMS TRIG5 variable 6 4 2 .pTRIG5.scalerRate SHMS TRIG5 variable 6 3 1 .pTRIG4.scaler SHMS TRIG4 variable 6 3 2 .pTRIG4.scalerRate SHMS TRIG4 +variable 7 7 1 .ASUM.scaler SHMS ASUM +variable 7 7 2 .ASUM.scalerRate SHMS ASUM variable 1 23 1 .hod.1y8.posScaler SHMS 1Y+ paddle 8 variable 1 23 2 .hod.1y8.posScalerRate SHMS 1Y+ paddle 8 variable 0 13 1 .hod.1x12.posScaler SHMS 1X+ paddle 12 @@ -218,8 +232,6 @@ variable 6 5 1 .pTRIG6.scaler SHMS TRIG6 variable 6 5 2 .pTRIG6.scalerRate SHMS TRIG6 variable 7 1 1 .S1Y.scaler SHMS S1Y variable 7 1 2 .S1Y.scalerRate SHMS S1Y -variable 0 28 1 .hod.1x10.negScaler SHMS 1X- paddle 10 -variable 0 28 2 .hod.1x10.negScalerRate SHMS 1X- paddle 10 variable 3 14 1 .hod.2y14.posScaler SHMS 2y+ paddle 14 variable 3 14 2 .hod.2y14.posScalerRate SHMS 2y+ paddle 14 variable 1 8 1 .hod.1y9.negScaler SHMS 1Y- paddle 9 diff --git a/MAPS/SCALERS/scaler.map b/MAPS/SCALERS/scaler.map index 5f222acdf016326cd98f0ba4747d3230e8419e24..e9fb06773196ebdf71fbe0de1db7998bfe30344b 100755 --- a/MAPS/SCALERS/scaler.map +++ b/MAPS/SCALERS/scaler.map @@ -193,12 +193,18 @@ Empty 0 4 3 30 1 Empty Empty 0 4 3 31 1 Empty # desc hel crate slot start nchan long-description -hTRIG1 0 4 5 10 1 HMS TRIG1 -hTRIG2 0 4 5 11 1 HMS TRIG2 -hTRIG3 0 4 5 12 1 HMS TRIG3 -hTRIG4 0 4 5 13 1 HMS TRIG4 -hTRIG5 0 4 5 14 1 HMS TRIG5 -hTRIG6 0 4 5 15 1 HMS TRIG6 +hTRIG1 0 4 5 10 1 HMS TRIG1 +hTRIG2 0 4 5 11 1 HMS TRIG2 +hTRIG3 0 4 5 12 1 HMS TRIG3 +hTRIG4 0 4 5 13 1 HMS TRIG4 +hTRIG5 0 4 5 14 1 HMS TRIG5 +hTRIG6 0 4 5 15 1 HMS TRIG6 +pTRIG1 0 4 5 0 1 SHMS TRIG1 +pTRIG2 0 4 5 1 1 SHMS TRIG2 +pTRIG3 0 4 5 2 1 SHMS TRIG3 +pTRIG4 0 4 5 3 1 SHMS TRIG4 +pTRIG5 0 4 5 4 1 SHMS TRIG5 +pTRIG6 0 4 5 5 1 SHMS TRIG6 # desc hel crate slot start nchan long-description S1X 0 4 6 0 1 HMS S1X @@ -367,6 +373,12 @@ pTRIG3 0 5 6 2 1 SHMS TRIG3 pTRIG4 0 5 6 3 1 SHMS TRIG4 pTRIG5 0 5 6 4 1 SHMS TRIG5 pTRIG6 0 5 6 5 1 SHMS TRIG6 +hTRIG1 0 5 6 10 1 HMS TRIG1 +hTRIG2 0 5 6 11 1 HMS TRIG2 +hTRIG3 0 5 6 12 1 HMS TRIG3 +hTRIG4 0 5 6 13 1 HMS TRIG4 +hTRIG5 0 5 6 14 1 HMS TRIG5 +hTRIG6 0 5 6 15 1 HMS TRIG6 # desc hel crate slot start nchan long-description S1X 0 5 7 0 1 SHMS S1X diff --git a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map index ec462c71d6e01f653e74ce6fe38bdb95d25a80b3..5474bb70339eff1530ff20731518474fb8930d6c 100644 --- a/MAPS/SHMS/DETEC/AERO/paero_ptrig.map +++ b/MAPS/SHMS/DETEC/AERO/paero_ptrig.map @@ -34,6 +34,12 @@ REFINDEX=0 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 diff --git a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map index 495f4acb21e81f86755a7c08e06fe44207291745..a30d3e801f22434c84d761eda25b2e3c849a38fb 100644 --- a/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map +++ b/MAPS/SHMS/DETEC/CAL/pcal_ptrig.map @@ -34,6 +34,12 @@ REFINDEX=0 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 diff --git a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map index 936fb0b754f71ed378c86511fe2517500a00d269..120acf9cb6c7448b064fe14d5c6ce0352fc44b29 100644 --- a/MAPS/SHMS/DETEC/DC/pdc_ptrig.map +++ b/MAPS/SHMS/DETEC/DC/pdc_ptrig.map @@ -34,6 +34,12 @@ REFINDEX=0 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 diff --git a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map index d23464c63bf72663d6c3e6cba9c22a560415e88e..008c15e5fc2be1af80abbe6bd59abb1a5d7f14af 100644 --- a/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map +++ b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map @@ -34,6 +34,12 @@ REFINDEX=0 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 diff --git a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map index 3643385bd851553bc5d05bd50d736f40da292b34..a047aaa2988881b5346e6088fcead91e042c4fd7 100644 --- a/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map +++ b/MAPS/SHMS/DETEC/HODO/phodo_ptrig.map @@ -34,6 +34,12 @@ REFINDEX=0 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 diff --git a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map index e7d8b1de2371840a93e1c8fbaa4bd6c0a32a09d4..2daed3ff8b603826f3e00e1b03447460000f2060 100644 --- a/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map +++ b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map @@ -34,6 +34,12 @@ REFINDEX=0 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 diff --git a/MAPS/SHMS/DETEC/STACK/shms_stack.map b/MAPS/SHMS/DETEC/STACK/shms_stack.map index 09e9537fb640f1433ea055654f0241b97fd0d585..94d29d5c03a2bff0b6023484b5aadeba0e4ec5c5 100644 --- a/MAPS/SHMS/DETEC/STACK/shms_stack.map +++ b/MAPS/SHMS/DETEC/STACK/shms_stack.map @@ -40,6 +40,12 @@ REFINDEX=0 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 diff --git a/MAPS/SHMS/DETEC/TRIG/ptrig.map b/MAPS/SHMS/DETEC/TRIG/ptrig.map index 6da8831f26894737e9bdf3cd609c49bf09e82d0f..4a5c9fd6afa95cd1e1915087c3dd9fa0d04a01af 100644 --- a/MAPS/SHMS/DETEC/TRIG/ptrig.map +++ b/MAPS/SHMS/DETEC/TRIG/ptrig.map @@ -33,6 +33,12 @@ REFINDEX=0 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 diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param index cf8f29148e5636fad803c17dd221e5c64691a134..8cd13ea246603cd7c1c254e8e7b13279a707a785 100644 --- a/PARAM/TRIG/thms.param +++ b/PARAM/TRIG/thms.param @@ -1,10 +1,10 @@ t_hms_numAdc = 12 -t_hms_numTdc = 27 +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 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 -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" \ 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 +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 041ac0bd7086b2f631252a8e9920e423f46cd03f..95c395a21b655a7594252838462052187028413c 100644 --- a/PARAM/TRIG/tshms.param +++ b/PARAM/TRIG/tshms.param @@ -1,5 +1,5 @@ t_shms_numAdc = 3 -t_shms_numTdc = 29 +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 t_shms_adcNames = "pAERSUM pHGCSUM pNGCSUM" -; 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 -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" +; 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" diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C index 3536e682c942e7768bda0cf94824c179b25d9fa4..3ffd686599417edbbd4bd8a22d490991692ac027 100644 --- a/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C +++ b/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C @@ -90,7 +90,7 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) { analyzer->SetEvent(event); analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat"); analyzer->SetOutFile(ROOTFileName.Data()); - analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/DC/hdcana.def"); + analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/DC/hdc_6gev_histos.def"); analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def"); // optional // File to record cuts accounting information