From b184324acec52e7cc7dc4e3b5e4fa018c3cd3bc9 Mon Sep 17 00:00:00 2001
From: Hall C Online Analyzer User <brad.hallc-online@swatter.net>
Date: Fri, 22 Sep 2017 15:56:07 -0400
Subject: [PATCH] Pooser edtm work (#215)
* Add SHMS FADC reference time signal
* Modify report files and templates to better quantify the deadtimes
* Push initial changes for Steve
* Include failed state of HMS scalers replay script
* Include proper(?) method for obtaining event 129 scaler reads
* Ensure that trigger apparatus cut file has similar flow to stack and production to avoid confusion
* Remove reference time which serves as a reference time for the trigger apparatus
* Update maps corresponding to previous commit
* Ignore # files
* Update test stand cuts file to match production and stack
* Update test stand cuts file to match production and stack on HMS side
* Update cuts files to handle new event type stucture corresponding to mulitple triggers
* Make cuts only HMS specific
* Do the same for the SHMS and correct the template files
* Correct template files
* Add pedestal event because of historical reasons (needs to be fixed)
* Do the same for the SHMS
---
.../PRODUCTION/hstackana_production_cuts.def | 25 ++++-----
DEF-files/HMS/SCALERS/hscaler_cuts.def | 19 +++----
DEF-files/HMS/STACK/hstackana_cuts.def | 27 +++------
.../HMS/TEST_STANDS/AERO/haeroana_cuts.def | 16 +++---
.../HMS/TEST_STANDS/CAL/hcalana_cuts.def | 16 +++---
.../HMS/TEST_STANDS/CER/hcerana_cuts.def | 16 +++---
DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def | 16 +++---
.../HMS/TEST_STANDS/HODO/hhodoana_cuts.def | 16 +++---
.../HMS/TEST_STANDS/TRIG/htrigana_cuts.def | 18 +++---
.../PRODUCTION/pstackana_production_cuts.def | 21 ++++---
DEF-files/SHMS/SCALERS/pscaler_cuts.def | 21 +++----
DEF-files/SHMS/STACK/pstackana_cuts.def | 21 ++++---
.../SHMS/TEST_STANDS/AERO/paeroana_cuts.def | 16 +++---
.../SHMS/TEST_STANDS/CAL/pcalana_cuts.def | 16 +++---
DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def | 16 +++---
.../SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def | 16 +++---
.../SHMS/TEST_STANDS/HODO/phodoana_cuts.def | 16 +++---
.../SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def | 16 +++---
.../SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def | 16 +++---
.../PRODUCTION/hstackana_production.template | 14 ++---
TEMPLATES/HMS/STACK/hstackana.template | 10 ++--
.../PRODUCTION/pstackana_production.template | 56 +++++++++----------
TEMPLATES/SHMS/STACK/pstackana.template | 52 ++++++++---------
23 files changed, 212 insertions(+), 264 deletions(-)
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
index 9f6cbece..becf341f 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
@@ -2,26 +2,21 @@
Block: RawDecode
-Pedestal_event g.evtyp==4
-scalar_event g.evtyp==0
-HMS_event g.evtyp==1
-SHMS_event g.evtyp==1
-coin_event g.evtyp==3
-tr4_event g.evtyp==4
-tr5_event g.evtyp==5
-tr6_event g.evtyp==6
-misc_event g.evtyp>=10
-hmscoin_event g.evtyp==1||g.evtyp==3
-shmscoin_event g.evtyp==2||g.evtyp==3
-all_event g.evtyp==1||g.evtyp==2||g.evtyp==3
+Pedestal_event g.evtyp == 99
+
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
Block: Decode
-all_trigs g.evtyp==1 || g.evtyp==2 || g.evtyp==3
-hms_shms_trig g.evtyp==1 || g.evtyp==2
-hms_coin_trig g.evtyp==1 || g.evtyp==3
+hms_trigs HMS_event
Decode_master HMS_event
diff --git a/DEF-files/HMS/SCALERS/hscaler_cuts.def b/DEF-files/HMS/SCALERS/hscaler_cuts.def
index 9ee7252c..5c4e0b37 100644
--- a/DEF-files/HMS/SCALERS/hscaler_cuts.def
+++ b/DEF-files/HMS/SCALERS/hscaler_cuts.def
@@ -2,24 +2,19 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
Block: Decode
-all_trigs HMS_event || SHMS_event || coin_event
hms_trigs HMS_event
-hms_coin_trig HMS_event || coin_event
-
edtm_accepted T.hms.hHODO_EDTM_tdcTime != 0.0
physics_accepted T.hms.hHODO_EDTM_tdcTime == 0.0
triggers_accepted T.hms.hT1_tdcTime == 0.0
diff --git a/DEF-files/HMS/STACK/hstackana_cuts.def b/DEF-files/HMS/STACK/hstackana_cuts.def
index 7c5d068e..4fd8c884 100644
--- a/DEF-files/HMS/STACK/hstackana_cuts.def
+++ b/DEF-files/HMS/STACK/hstackana_cuts.def
@@ -1,29 +1,20 @@
-# Demo cuts for hodtest
-#
Block: RawDecode
-Pedestal_event g.evtyp==4
-scalar_event g.evtyp==0
-HMS_event g.evtyp==1
-SHMS_event g.evtyp==1
-coin_event g.evtyp==3
-tr4_event g.evtyp==4
-tr5_event g.evtyp==5
-tr6_event g.evtyp==6
-misc_event g.evtyp>=10
-hmscoin_event g.evtyp==1||g.evtyp==3
-shmscoin_event g.evtyp==2||g.evtyp==3
-all_event g.evtyp==1||g.evtyp==2||g.evtyp==3
+Pedestal_event g.evtyp == 99
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
Block: Decode
-all_trigs g.evtyp==1 || g.evtyp==2 || g.evtyp==3
-hms_shms_trig g.evtyp==1 || g.evtyp==2
-hms_coin_trig g.evtyp==1 || g.evtyp==3
-
+hms_trigs HMS_event
Decode_master HMS_event
diff --git a/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def b/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def
index 544428a9..f702cbcf 100644
--- a/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
index 544428a9..f702cbcf 100644
--- a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def b/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
index 544428a9..f702cbcf 100644
--- a/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def b/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
index 544428a9..f702cbcf 100644
--- a/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
index 544428a9..f702cbcf 100644
--- a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
index 544428a9..72efdaa3 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+HMS_trig_2_event g.evtyp == 2
+HMS_trig_3_event g.evtyp == 3
+HMS_trig_4_event g.evtyp == 4
+HMS_trig_5_event g.evtyp == 5
+HMS_trig_6_event g.evtyp == 6
+HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
RawDecode_master 1
@@ -20,4 +18,4 @@ Block: CoarseTracking
CoarseTracking_master HMS_event
Block: CoarseReconstruct
-CourseReconstruct HMS_event
+CourseReconstruct HMS_event
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
index de1a1358..6dfd0058 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
@@ -2,22 +2,21 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+Pedestal_event g.evtyp == 99
+
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
Block: Decode
-all_trigs HMS_event || SHMS_event || coin_event
-shms_coin_trig SHMS_event || coin_event
+shms_trigs SHMS_event
good_S1_time T.shms.p1T_tdcTime > 241 && T.shms.p1T_tdcTime < 243
good_S2X_time T.shms.p2X_tdcTime > 180 && T.shms.p2X_tdcTime < 220
diff --git a/DEF-files/SHMS/SCALERS/pscaler_cuts.def b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
index ea90f7a3..b28e50ca 100644
--- a/DEF-files/SHMS/SCALERS/pscaler_cuts.def
+++ b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
@@ -2,24 +2,19 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
Block: Decode
-all_trigs HMS_event || SHMS_event || coin_event
-shms_trigs SHMS_event
-shms_coin_trig SHMS_event || coin_event
-
+shms_trigs SHMS_event
edtm_accepted T.shms.pHODO_EDTM_tdcTime != 0.0
physics_accepted T.shms.pHODO_EDTM_tdcTime == 0.0
triggers_accepted T.shms.pT2_tdcTime == 0.0
diff --git a/DEF-files/SHMS/STACK/pstackana_cuts.def b/DEF-files/SHMS/STACK/pstackana_cuts.def
index de1a1358..8d17822a 100644
--- a/DEF-files/SHMS/STACK/pstackana_cuts.def
+++ b/DEF-files/SHMS/STACK/pstackana_cuts.def
@@ -2,22 +2,21 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+Pedestal_event g.evtyp == 99
+
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
Block: Decode
-all_trigs HMS_event || SHMS_event || coin_event
-shms_coin_trig SHMS_event || coin_event
+shms_trigs SHMS_event
good_S1_time T.shms.p1T_tdcTime > 241 && T.shms.p1T_tdcTime < 243
good_S2X_time T.shms.p2X_tdcTime > 180 && T.shms.p2X_tdcTime < 220
diff --git a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
index 0b830404..264c1689 100644
--- a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
index e5e8e4c0..37cd1bcf 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
index e5e8e4c0..37cd1bcf 100644
--- a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
index e5e8e4c0..a5181ea7 100644
--- a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+HMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
index e5e8e4c0..37cd1bcf 100644
--- a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
index e5e8e4c0..37cd1bcf 100644
--- a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
index e5e8e4c0..37cd1bcf 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
@@ -1,14 +1,12 @@
Block: RawDecode
-Pedestal_event g.evtyp == 4
-scalar_event g.evtyp == 0
-HMS_event g.evtyp == 1
-SHMS_event g.evtyp == 1
-coin_event g.evtyp == 3
-misc_event g.evtyp >= 5
-hmscoin_event HMS_event || coin_event
-shmscoin_event SHMS_event || coin_event
-all_event HMS_event || SHMS_event || coin_event
+SHMS_trig_1_event g.evtyp == 1
+SHMS_trig_2_event g.evtyp == 2
+SHMS_trig_3_event g.evtyp == 3
+SHMS_trig_4_event g.evtyp == 4
+SHMS_trig_5_event g.evtyp == 5
+SHMS_trig_6_event g.evtyp == 6
+SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
RawDecode_master 1
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
index 9f039bba..b1514669 100644
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
+++ b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
@@ -13,18 +13,18 @@ Chamber 1: {hdc_zpos[0]:%6.2f} {hdc_zpos[1]:%6.2f} {hdc_zpos[2]:%6.2f}
Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
{hdc_zpos[9]:%6.2f} {hdc_zpos[10]:%6.2f} {hdc_zpos[11]:%6.2f}
-All triggers: {all_trigs.npassed}
+HMS triggers: {hms_trigs.npassed}
Rate : {H.Trig.scalerRate/1000.:%7.3f} kHz
-Live Time : {(all_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
-Dead Time : {100.0 - (all_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
+Live Time : {(hms_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
+Dead Time : {100.0 - (hms_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
-hmsDC1Planes_large Counts: {hmsDC1Planes_large.npassed} /all_trigs : {hmsDC1Planes_large.npassed/all_trigs.npassed}
-hmsDC2Planes_large Counts: {hmsDC2Planes_large.npassed} /all_trigs : {hmsDC2Planes_large.npassed/all_trigs.npassed}
+hmsDC1Planes_large Counts: {hmsDC1Planes_large.npassed} /hms_trigs : {hmsDC1Planes_large.npassed/hms_trigs.npassed}
+hmsDC2Planes_large Counts: {hmsDC2Planes_large.npassed} /hms_trigs : {hmsDC2Planes_large.npassed/hms_trigs.npassed}
-hmsDC1Planes6 Counts: {hmsDC1Planes6hits.npassed} /all_trigs : {hmsDC1Planes6hits.npassed/all_trigs.npassed}
-hmsDC2Planes6 Counts: {hmsDC2Planes6hits.npassed} /all_trigs : {hmsDC2Planes6hits.npassed/all_trigs.npassed}
+hmsDC1Planes6 Counts: {hmsDC1Planes6hits.npassed} /hms_trigs : {hmsDC1Planes6hits.npassed/hms_trigs.npassed}
+hmsDC2Planes6 Counts: {hmsDC2Planes6hits.npassed} /hms_trigs : {hmsDC2Planes6hits.npassed/hms_trigs.npassed}
hmsDC1x1Planes5 Counts: {hmsDC1_5hits_x1.npassed} eff : {hmsDC1_6hits_x1.npassed/hmsDC1_5hits_x1.npassed}
hmsDC1u1Planes5 Counts: {hmsDC1_5hits_u1.npassed} eff : {hmsDC1_6hits_u1.npassed/hmsDC1_5hits_u1.npassed}
diff --git a/TEMPLATES/HMS/STACK/hstackana.template b/TEMPLATES/HMS/STACK/hstackana.template
index 827cea20..0b54523f 100644
--- a/TEMPLATES/HMS/STACK/hstackana.template
+++ b/TEMPLATES/HMS/STACK/hstackana.template
@@ -7,13 +7,13 @@ Chamber 1: {hdc_zpos[0]:%6.2f} {hdc_zpos[1]:%6.2f} {hdc_zpos[2]:%6.2f}
Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
{hdc_zpos[9]:%6.2f} {hdc_zpos[10]:%6.2f} {hdc_zpos[11]:%6.2f}
-All triggers: {all_trigs.npassed}
+HMS triggers: {hms_trigs.npassed}
-hmsDC1Planes_large Counts: {hmsDC1Planes_large.npassed} /all_trigs : {hmsDC1Planes_large.npassed/all_trigs.npassed}
-hmsDC2Planes_large Counts: {hmsDC2Planes_large.npassed} /all_trigs : {hmsDC2Planes_large.npassed/all_trigs.npassed}
+hmsDC1Planes_large Counts: {hmsDC1Planes_large.npassed} /hms_trigs : {hmsDC1Planes_large.npassed/hms_trigs.npassed}
+hmsDC2Planes_large Counts: {hmsDC2Planes_large.npassed} /hms_trigs : {hmsDC2Planes_large.npassed/hms_trigs.npassed}
-hmsDC1Planes6 Counts: {hmsDC1Planes6hits.npassed} /all_trigs : {hmsDC1Planes6hits.npassed/all_trigs.npassed}
-hmsDC2Planes6 Counts: {hmsDC2Planes6hits.npassed} /all_trigs : {hmsDC2Planes6hits.npassed/all_trigs.npassed}
+hmsDC1Planes6 Counts: {hmsDC1Planes6hits.npassed} /hms_trigs : {hmsDC1Planes6hits.npassed/hms_trigs.npassed}
+hmsDC2Planes6 Counts: {hmsDC2Planes6hits.npassed} /hms_trigs : {hmsDC2Planes6hits.npassed/hms_trigs.npassed}
hmsDC1x1Planes5 Counts: {hmsDC1_5hits_x1.npassed} eff : {hmsDC1_6hits_x1.npassed/hmsDC1_5hits_x1.npassed}
hmsDC1u1Planes5 Counts: {hmsDC1_5hits_u1.npassed} eff : {hmsDC1_6hits_u1.npassed/hmsDC1_5hits_u1.npassed}
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index 7ed00c6b..371b4c44 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -6,44 +6,44 @@ BCM1 : {(P.BCM1.scalerRate-250000)/(4673):%3.3f} uA Total charge = {(P.BCM
BCM2 : {(P.BCM2.scalerRate-250000)/(3954):%3.3f} uA Total charge = {(P.BCM2.scalerRate-250000) / (3954)*P.1Mhz.scaler/1000000.:%7.3f} uC
Unser : {(P.Unser.scalerRate-393000)/(4000):%3.3f} uA Total charge = {(P.Unser.scalerRate-393000) / (4000)*P.1Mhz.scaler/1000000.:%7.3f} uC
-All triggers : {all_trigs.npassed}
+SHMS triggers : {shms_trigs.npassed}
Rate : {P.Trig.scalerRate/1000.:%7.3f} kHz
-Live Time : {(all_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
-Dead Time : {100.0 - (all_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
+Live Time : {(shms_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
+Dead Time : {100.0 - (shms_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
-good_S1_time Counts: {good_S1_time.npassed} / all_trigs : {good_S1_time.npassed / all_trigs.npassed}
-good_S2X_time Counts: {good_S2X_time.npassed} / all_trigs : {good_S2X_time.npassed / all_trigs.npassed}
-good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / all_trigs : {good_S1_S2X_time.npassed / all_trigs.npassed}
+good_S1_time Counts: {good_S1_time.npassed} / shms_trigs : {good_S1_time.npassed / shms_trigs.npassed}
+good_S2X_time Counts: {good_S2X_time.npassed} / shms_trigs : {good_S2X_time.npassed / shms_trigs.npassed}
+good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / shms_trigs : {good_S1_S2X_time.npassed / shms_trigs.npassed}
-Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} / all_trigs : {shms_ch1_gt0.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} / all_trigs : { shms_ch2_gt0.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1.npassed} / all_trigs : { shms_ch2_gt0_noch1.npassed / all_trigs.npassed}
-Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2.npassed} / all_trigs : {shms_ch1_gt0_noch2.npassed / all_trigs.npassed}
-Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2.npassed} / all_trigs : {shms_noch1_noch2.npassed / all_trigs.npassed}
-Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0.npassed} / all_trigs : { shms_ch_gt0.npassed / all_trigs.npassed}
-Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track.npassed} / all_trigs : { shms_ch_gt0_track.npassed / all_trigs.npassed}
-Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4.npassed} / all_trigs : { shms_ch_gt4.npassed / all_trigs.npassed}
-Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track.npassed} / all_trigs : { shms_ch_gt4_track.npassed / all_trigs.npassed}
+Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} / shms_trigs : {shms_ch1_gt0.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} / shms_trigs : { shms_ch2_gt0.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1.npassed} / shms_trigs : { shms_ch2_gt0_noch1.npassed / shms_trigs.npassed}
+Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2.npassed} / shms_trigs : {shms_ch1_gt0_noch2.npassed / shms_trigs.npassed}
+Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2.npassed} / shms_trigs : {shms_noch1_noch2.npassed / shms_trigs.npassed}
+Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0.npassed} / shms_trigs : { shms_ch_gt0.npassed / shms_trigs.npassed}
+Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track.npassed} / shms_trigs : { shms_ch_gt0_track.npassed / shms_trigs.npassed}
+Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4.npassed} / shms_trigs : { shms_ch_gt4.npassed / shms_trigs.npassed}
+Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track.npassed} / shms_trigs : { shms_ch_gt4_track.npassed / shms_trigs.npassed}
Add cut on good_S1_S2X_time
-Chamber 1 hits > 0 Counts: {shms_ch1_gt0_gtime.npassed} / all_trigs : {shms_ch1_gt0_gtime.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 Counts: {shms_ch2_gt0_gtime.npassed} / all_trigs : { shms_ch2_gt0_gtime.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1_gtime.npassed} / all_trigs : { shms_ch2_gt0_noch1_gtime.npassed / all_trigs.npassed}
-Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2_gtime.npassed} / all_trigs : {shms_ch1_gt0_noch2_gtime.npassed / all_trigs.npassed}
-Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2_gtime.npassed} / all_trigs : {shms_noch1_noch2_gtime.npassed / all_trigs.npassed}
-Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0_gtime.npassed} / all_trigs : { shms_ch_gt0_gtime.npassed / all_trigs.npassed}
-Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track_gtime.npassed} / all_trigs : { shms_ch_gt0_track_gtime.npassed / all_trigs.npassed}
-Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4_gtime.npassed} / all_trigs : { shms_ch_gt4_gtime.npassed / all_trigs.npassed}
-Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track_gtime.npassed} / all_trigs : { shms_ch_gt4_track_gtime.npassed / all_trigs.npassed}
+Chamber 1 hits > 0 Counts: {shms_ch1_gt0_gtime.npassed} / shms_trigs : {shms_ch1_gt0_gtime.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 Counts: {shms_ch2_gt0_gtime.npassed} / shms_trigs : { shms_ch2_gt0_gtime.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1_gtime.npassed} / shms_trigs : { shms_ch2_gt0_noch1_gtime.npassed / shms_trigs.npassed}
+Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2_gtime.npassed} / shms_trigs : {shms_ch1_gt0_noch2_gtime.npassed / shms_trigs.npassed}
+Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2_gtime.npassed} / shms_trigs : {shms_noch1_noch2_gtime.npassed / shms_trigs.npassed}
+Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0_gtime.npassed} / shms_trigs : { shms_ch_gt0_gtime.npassed / shms_trigs.npassed}
+Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track_gtime.npassed} / shms_trigs : { shms_ch_gt0_track_gtime.npassed / shms_trigs.npassed}
+Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4_gtime.npassed} / shms_trigs : { shms_ch_gt4_gtime.npassed / shms_trigs.npassed}
+Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track_gtime.npassed} / shms_trigs : { shms_ch_gt4_track_gtime.npassed / shms_trigs.npassed}
-shmsDC1Planes_large Counts: {shmsDC1Planes_large.npassed} / all_trigs : {shmsDC1Planes_large.npassed / all_trigs.npassed}
-shmsDC2Planes_large Counts: {shmsDC2Planes_large.npassed} / all_trigs : {shmsDC2Planes_large.npassed / all_trigs.npassed}
+shmsDC1Planes_large Counts: {shmsDC1Planes_large.npassed} / shms_trigs : {shmsDC1Planes_large.npassed / shms_trigs.npassed}
+shmsDC2Planes_large Counts: {shmsDC2Planes_large.npassed} / shms_trigs : {shmsDC2Planes_large.npassed / shms_trigs.npassed}
-shmsDC1Planes6 Counts: {shmsDC1Planes6hits.npassed} / all_trigs : {shmsDC1Planes6hits.npassed / all_trigs.npassed}
-shmsDC2Planes6 Counts: {shmsDC2Planes6hits.npassed} / all_trigs : {shmsDC2Planes6hits.npassed / all_trigs.npassed}
+shmsDC1Planes6 Counts: {shmsDC1Planes6hits.npassed} / shms_trigs : {shmsDC1Planes6hits.npassed / shms_trigs.npassed}
+shmsDC2Planes6 Counts: {shmsDC2Planes6hits.npassed} / shms_trigs : {shmsDC2Planes6hits.npassed / shms_trigs.npassed}
shmsDC1x1Planes5 Counts: {shmsDC1_5hits_x1.npassed} eff : {shmsDC1_6hits_x1.npassed / shmsDC1_5hits_x1.npassed}
shmsDC1u1Planes5 Counts: {shmsDC1_5hits_u1.npassed} eff : {shmsDC1_6hits_u1.npassed / shmsDC1_5hits_u1.npassed}
diff --git a/TEMPLATES/SHMS/STACK/pstackana.template b/TEMPLATES/SHMS/STACK/pstackana.template
index e9e762a2..087c28e9 100644
--- a/TEMPLATES/SHMS/STACK/pstackana.template
+++ b/TEMPLATES/SHMS/STACK/pstackana.template
@@ -1,38 +1,38 @@
Run #{gen_run_number}
-All triggers : {all_trigs.npassed}
+SHMS triggers : {shms_trigs.npassed}
-good_S1_time Counts: {good_S1_time.npassed} / all_trigs : {good_S1_time.npassed / all_trigs.npassed}
-good_S2X_time Counts: {good_S2X_time.npassed} / all_trigs : {good_S2X_time.npassed / all_trigs.npassed}
-good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / all_trigs : {good_S1_S2X_time.npassed / all_trigs.npassed}
+good_S1_time Counts: {good_S1_time.npassed} / shms_trigs : {good_S1_time.npassed / shms_trigs.npassed}
+good_S2X_time Counts: {good_S2X_time.npassed} / shms_trigs : {good_S2X_time.npassed / shms_trigs.npassed}
+good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / shms_trigs : {good_S1_S2X_time.npassed / shms_trigs.npassed}
-Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} / all_trigs : {shms_ch1_gt0.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} / all_trigs : { shms_ch2_gt0.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1.npassed} / all_trigs : { shms_ch2_gt0_noch1.npassed / all_trigs.npassed}
-Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2.npassed} / all_trigs : {shms_ch1_gt0_noch2.npassed / all_trigs.npassed}
-Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2.npassed} / all_trigs : {shms_noch1_noch2.npassed / all_trigs.npassed}
-Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0.npassed} / all_trigs : { shms_ch_gt0.npassed / all_trigs.npassed}
-Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track.npassed} / all_trigs : { shms_ch_gt0_track.npassed / all_trigs.npassed}
-Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4.npassed} / all_trigs : { shms_ch_gt4.npassed / all_trigs.npassed}
-Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track.npassed} / all_trigs : { shms_ch_gt4_track.npassed / all_trigs.npassed}
+Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} / shms_trigs : {shms_ch1_gt0.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} / shms_trigs : { shms_ch2_gt0.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1.npassed} / shms_trigs : { shms_ch2_gt0_noch1.npassed / shms_trigs.npassed}
+Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2.npassed} / shms_trigs : {shms_ch1_gt0_noch2.npassed / shms_trigs.npassed}
+Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2.npassed} / shms_trigs : {shms_noch1_noch2.npassed / shms_trigs.npassed}
+Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0.npassed} / shms_trigs : { shms_ch_gt0.npassed / shms_trigs.npassed}
+Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track.npassed} / shms_trigs : { shms_ch_gt0_track.npassed / shms_trigs.npassed}
+Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4.npassed} / shms_trigs : { shms_ch_gt4.npassed / shms_trigs.npassed}
+Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track.npassed} / shms_trigs : { shms_ch_gt4_track.npassed / shms_trigs.npassed}
Add cut on good_S1_S2X_time
-Chamber 1 hits > 0 Counts: {shms_ch1_gt0_gtime.npassed} / all_trigs : {shms_ch1_gt0_gtime.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 Counts: {shms_ch2_gt0_gtime.npassed} / all_trigs : { shms_ch2_gt0_gtime.npassed / all_trigs.npassed}
-Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1_gtime.npassed} / all_trigs : { shms_ch2_gt0_noch1_gtime.npassed / all_trigs.npassed}
-Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2_gtime.npassed} / all_trigs : {shms_ch1_gt0_noch2_gtime.npassed / all_trigs.npassed}
-Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2_gtime.npassed} / all_trigs : {shms_noch1_noch2_gtime.npassed / all_trigs.npassed}
-Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0_gtime.npassed} / all_trigs : { shms_ch_gt0_gtime.npassed / all_trigs.npassed}
-Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track_gtime.npassed} / all_trigs : { shms_ch_gt0_track_gtime.npassed / all_trigs.npassed}
-Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4_gtime.npassed} / all_trigs : { shms_ch_gt4_gtime.npassed / all_trigs.npassed}
-Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track_gtime.npassed} / all_trigs : { shms_ch_gt4_track_gtime.npassed / all_trigs.npassed}
+Chamber 1 hits > 0 Counts: {shms_ch1_gt0_gtime.npassed} / shms_trigs : {shms_ch1_gt0_gtime.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 Counts: {shms_ch2_gt0_gtime.npassed} / shms_trigs : { shms_ch2_gt0_gtime.npassed / shms_trigs.npassed}
+Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1_gtime.npassed} / shms_trigs : { shms_ch2_gt0_noch1_gtime.npassed / shms_trigs.npassed}
+Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2_gtime.npassed} / shms_trigs : {shms_ch1_gt0_noch2_gtime.npassed / shms_trigs.npassed}
+Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2_gtime.npassed} / shms_trigs : {shms_noch1_noch2_gtime.npassed / shms_trigs.npassed}
+Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0_gtime.npassed} / shms_trigs : { shms_ch_gt0_gtime.npassed / shms_trigs.npassed}
+Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track_gtime.npassed} / shms_trigs : { shms_ch_gt0_track_gtime.npassed / shms_trigs.npassed}
+Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4_gtime.npassed} / shms_trigs : { shms_ch_gt4_gtime.npassed / shms_trigs.npassed}
+Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track_gtime.npassed} / shms_trigs : { shms_ch_gt4_track_gtime.npassed / shms_trigs.npassed}
-shmsDC1Planes_large Counts: {shmsDC1Planes_large.npassed} / all_trigs : {shmsDC1Planes_large.npassed / all_trigs.npassed}
-shmsDC2Planes_large Counts: {shmsDC2Planes_large.npassed} / all_trigs : {shmsDC2Planes_large.npassed / all_trigs.npassed}
+shmsDC1Planes_large Counts: {shmsDC1Planes_large.npassed} / shms_trigs : {shmsDC1Planes_large.npassed / shms_trigs.npassed}
+shmsDC2Planes_large Counts: {shmsDC2Planes_large.npassed} / shms_trigs : {shmsDC2Planes_large.npassed / shms_trigs.npassed}
-shmsDC1Planes6 Counts: {shmsDC1Planes6hits.npassed} / all_trigs : {shmsDC1Planes6hits.npassed / all_trigs.npassed}
-shmsDC2Planes6 Counts: {shmsDC2Planes6hits.npassed} / all_trigs : {shmsDC2Planes6hits.npassed / all_trigs.npassed}
+shmsDC1Planes6 Counts: {shmsDC1Planes6hits.npassed} / shms_trigs : {shmsDC1Planes6hits.npassed / shms_trigs.npassed}
+shmsDC2Planes6 Counts: {shmsDC2Planes6hits.npassed} / shms_trigs : {shmsDC2Planes6hits.npassed / shms_trigs.npassed}
shmsDC1x1Planes5 Counts: {shmsDC1_5hits_x1.npassed} eff : {shmsDC1_6hits_x1.npassed / shmsDC1_5hits_x1.npassed}
shmsDC1u1Planes5 Counts: {shmsDC1_5hits_u1.npassed} eff : {shmsDC1_6hits_u1.npassed / shmsDC1_5hits_u1.npassed}
--
GitLab