From bbbfadf2451d358ad47e3e56a47a0c7cd48be472 Mon Sep 17 00:00:00 2001
From: Hall C Online Analyzer User <brad.hallc-online@swatter.net>
Date: Wed, 25 Apr 2018 16:56:33 -0400
Subject: [PATCH] Spring 2018 ver29 (#456)
* Point 1190 buffer monitroing to reference times used by hcana
* Update online GUI to new 1190 reference time monitroing histo
* Update test stand cut files to decode properly
* Add coin replay path to cal calib scripts
* Update replay scripts to include bcm module, they are commented out for now
* Update hcer fadc time cuts
* Comment out bcm block variables
* Update coin kinematics file
* Add shms coin replay script
---
CALIBRATION/hms_cal_calib/THcShowerCalib.h | 2 +-
CALIBRATION/shms_cal_calib/THcPShowerCalib.h | 4 +-
DBASE/COIN/standard.kinematics | 1089 ++++++++++++++++-
.../coin_production_hElec_pProt.def | 1 +
.../HMS/PRODUCTION/BLOCK/hblock_vars.def | 3 +-
.../HMS/PRODUCTION/TRIG/htrig_histos.def | 3 +-
.../HMS/PRODUCTION/hstackana_production.def | 5 +-
.../HMS/TEST_STANDS/AERO/haeroana_cuts.def | 35 +-
.../HMS/TEST_STANDS/CAL/hcalana_cuts.def | 40 +-
.../HMS/TEST_STANDS/CER/hcerana_cuts.def | 40 +-
DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def | 40 +-
.../HMS/TEST_STANDS/HODO/hhodoana_cuts.def | 40 +-
.../HMS/TEST_STANDS/TRIG/htrigana_cuts.def | 40 +-
.../SHMS/PRODUCTION/BLOCK/pblock_vars.def | 3 +-
.../CUTS/pstackana_reconstruct_cuts.def | 3 +-
.../SHMS/TEST_STANDS/AERO/paeroana_cuts.def | 30 +-
.../SHMS/TEST_STANDS/CAL/pcalana_cuts.def | 30 +-
DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def | 30 +-
.../SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def | 30 +-
.../SHMS/TEST_STANDS/HODO/phodoana_cuts.def | 30 +-
.../SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def | 30 +-
.../SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def | 35 +-
PARAM/HMS/CER/hcer_cuts.param | 6 +-
.../replay_production_coin_hElec_pProt.C | 7 +
.../HMS/PRODUCTION/replay_production_hms.C | 6 +
.../SHMS/PRODUCTION/replay_production_shms.C | 6 +
.../replay_production_shms_coin_all.C | 169 +++
.../HMS/PRODUCTION/hms_coin_production.cfg | 2 +-
28 files changed, 1574 insertions(+), 185 deletions(-)
create mode 100644 SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin_all.C
diff --git a/CALIBRATION/hms_cal_calib/THcShowerCalib.h b/CALIBRATION/hms_cal_calib/THcShowerCalib.h
index 1315e6bf..f0782d6b 100644
--- a/CALIBRATION/hms_cal_calib/THcShowerCalib.h
+++ b/CALIBRATION/hms_cal_calib/THcShowerCalib.h
@@ -193,8 +193,8 @@ void THcShowerCalib::Init() {
//Reset ROOT and connect tree file.
gROOT->Reset();
-
char* fname = Form("ROOTfiles/hms_replay_%s.root",fRunNumber.c_str());
+ // char* fname = Form("ROOTfiles/coin_replay_production_%s.root",fRunNumber.c_str());
cout << "THcShowerCalib::Init: Root file name = " << fname << endl;
TFile *f = new TFile(fname);
diff --git a/CALIBRATION/shms_cal_calib/THcPShowerCalib.h b/CALIBRATION/shms_cal_calib/THcPShowerCalib.h
index e112aa02..51db6521 100644
--- a/CALIBRATION/shms_cal_calib/THcPShowerCalib.h
+++ b/CALIBRATION/shms_cal_calib/THcPShowerCalib.h
@@ -199,8 +199,8 @@ void THcPShowerCalib::Init() {
//Reset ROOT and connect tree file.
gROOT->Reset();
-
- char* fname = Form("ROOTfiles/shms_replay_%s.root",fRunNumber.c_str());
+ char* fname = Form("ROOTfiles/hms_replay_%s.root",fRunNumber.c_str());
+ // char* fname = Form("ROOTfiles/coin_replay_%s.root",fRunNumber.c_str());
cout << "THcPShowerCalib::Init: Root file name = " << fname << endl;
TFile *f = new TFile(fname);
diff --git a/DBASE/COIN/standard.kinematics b/DBASE/COIN/standard.kinematics
index 65c76e06..d77060d6 100644
--- a/DBASE/COIN/standard.kinematics
+++ b/DBASE/COIN/standard.kinematics
@@ -1706,7 +1706,7 @@ ppcentral = 2.53*0.985
ppartmass = 0.1395706
hpartmass = 0.0005109
-#group2, set-14 (LH2)
+#group2, set-14 (DUMMY)
3658 - 3658
gpbeam = 10.600
gtargmass_amu = 26.92
@@ -1741,6 +1741,7 @@ ppcentral = 2.53*0.985
ppartmass = 0.1395706
hpartmass = 0.0005109
+#group2, set-6 (dummy)
3667
gpbeam = 10.600
gtargmass_amu = 26.92
@@ -1751,6 +1752,7 @@ ppcentral = 2.53*0.985
ppartmass = 0.1395706
hpartmass = 0.0005109
+#group2, set-6 (LH2)
3668-3672
gpbeam = 10.600
gtargmass_amu = 1.00794
@@ -1761,9 +1763,8 @@ ppcentral = 2.53*0.985
ppartmass = 0.1395706
hpartmass = 0.0005109
-#group2, set-5
-
-3673-9999
+#group2, set-5 (LH2)
+3673-3675
gpbeam = 10.600
gtargmass_amu = 1.00794
htheta_lab = -13.505
@@ -1771,4 +1772,1084 @@ ptheta_lab = 8.0
hpcentral = 5.27
ppcentral = 2.53*0.985
ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group2, set-5 (Dummy)
+3676
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 8.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group2, set-5 (LD2)
+3677-3679
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 8.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group1, set-5 (LD2)
+3681-3684
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 8.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group1, set-5 (10cm dummy)
+3685
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 8.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group1, set-5 (LH2)
+3686-3688
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 8.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group1, set-6 (LH2)
+3689-3691
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 10.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group1, set-6 (10cm dummy)
+3692
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 10.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group1, set-6 (LD2)
+3693-3695
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 10.0
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-7 (LD2)
+3696-3699
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 11.995
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-7 (10cm dummy)
+3700
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 11.995
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-7 (LH2)
+
+3701-3703
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 11.995
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-13 (10cm dummy)
+3704
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 24.04
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-13 (LD2)
+3705-3707
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 24.04
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-14 (LD2)
+3708-3711
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 26.005
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-14 (10cm dummy)
+3712
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 26.005
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 1, set-14 (LH2)
+3713-3715
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 26.005
+hpcentral = 5.27
+ppcentral = 2.53*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 3, set-12 (LH2)
+3716-3719
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 30.01
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3720
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 30.01
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3721-3723
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 30.01
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3724
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 30.01
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+#group 3, set-11
+
+3725-3727
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 28.05
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3728-3733
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 28.05
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3734-3736
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 28.05
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 3, set-10
+
+3737-3739
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 25.98
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3740-3741
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 25.98
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3742-3745
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 25.98
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-12 (LH2)
+
+3746-3748
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 30.055
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-12 (10cm dummy)
+
+3749-3750
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 30.055
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-12 (LD2)
+
+3751-3753
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 30.055
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-11 (LD2)
+
+3754-3756
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 28.05
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-11 (10cm dummy)
+
+3757-3758
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 28.05
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-11 (LH2)
+
+3759-3761
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 28.05
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-10 (LH2)
+
+3762-3764
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 26.025
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-10 (10 cm Al Dummy)
+
+3765-3766
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 26.025
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-10 (LD2)
+
+3767-3769
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 26.025
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-9 (LD2)
+
+3770-3772
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 24.04
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-9 (10 cm Al Dummy)
+
+3773-3774
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 24.04
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-9 (LH2)
+
+3775-3777
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 24.04
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-8 (LH2)
+
+3778-3780
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 22.04
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-8 (10 cm Al Dummy)
+
+3782-3783
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 22.04
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-8 (Loop 3)
+
+3784-3786
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 22.04
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-7 (Loop 3)
+
+3787-3789
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 19.96
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-7 (Dummy)
+
+3790-3791
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 19.96
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 4, set-7 (LH2)
+
+3792-3794
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 19.96
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+#group 3, set-7 (LH2)
+
+3795-3797
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 19.96
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+3798-3799
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 19.96
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+3800-3804
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 19.96
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#3 - 8
+
+3805-3807
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 22.03
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+3808-3809
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 22.03
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+
+3810-3812
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 22.03
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+#3 - 9
+
+3813-3815
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 24.03
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+3816-3817
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 24.03
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3818-3820
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 24.03
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+#3 - 6
+
+3821-3822
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 18.022
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3823-3824
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 18.022
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3825-3827
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 18.022
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 3 - 5
+
+3828-3830
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 16.015
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3831
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 16.015
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3832-3834
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 16.015
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 3 - 4
+
+3835-3837
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 14.01
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+
+3838-3839
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 14.01
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+
+3840-3842
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 14.01
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 3 - 3
+
+3843-3845
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 12.005
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+3846-3847
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 12.005
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3848-3883
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 12.005
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 4 - 3
+
+3884-3887
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 12.005
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3888-3889
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 12.005
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3890-3892
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 12.005
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 4 - 4
+
+3893-3895
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 14.010
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3896-3897
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 14.010
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3898-3900
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 14.010
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 4 - 5
+
+3901-3902
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 15.995
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3903-3904
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 15.995
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3905-3906
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 15.995
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 4 - 6
+
+3907-3908
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 18.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3909-3910
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 18.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3911-3913
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 18.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3914-3914
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 18.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3915-3916
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 18.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 4 - 5
+
+3917-3917
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -13.505
+ptheta_lab = 16.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3918-3918
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -13.505
+ptheta_lab = 16.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3919-9999
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -13.505
+ptheta_lab = 16.02
+hpcentral = 5.27
+ppcentral = 1.96*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 5 - 1
+
+# FADC firmware upgraded to 0xC0F
+
+3923-3925
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -19.682
+ptheta_lab = 8.495
+hpcentral = 3.32
+ppcentral = 6.80*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3926-3927
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -19.682
+ptheta_lab = 8.495
+hpcentral = 3.32
+ppcentral = 6.80*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3928-3933
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -19.682
+ptheta_lab = 8.495
+hpcentral = 3.32
+ppcentral = 6.80*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+# group 5 - 2
+
+3934-3936
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -19.682
+ptheta_lab = 8.01
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3937-3938
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -19.682
+ptheta_lab = 8.01
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3939-3941
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -19.682
+ptheta_lab = 8.01
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+# group 5 - 3
+
+3942-3944
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -19.682
+ptheta_lab = 10.00
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3945-3946
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -19.682
+ptheta_lab = 10.00
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3947-3949
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -19.682
+ptheta_lab = 10.00
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 6-3
+
+3950-3953
+gpbeam = 10.600
+gtargmass_amu = 1.00794
+htheta_lab = -19.682
+ptheta_lab = 10.00
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3954-3956
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -19.682
+ptheta_lab = 10.00
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3957-3959
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -19.682
+ptheta_lab = 10.00
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 6-2
+
+3960-3960
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -19.682
+ptheta_lab = 7.995
+hpcentral = 3.32
+ppcentral = 4.54*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+#group 6-1
+
+3961-3963
+gpbeam = 10.600
+gtargmass_amu = 2.014101
+htheta_lab = -19.682
+ptheta_lab = 8.495
+hpcentral = 3.32
+ppcentral = 6.80*0.985
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+3964-9999
+gpbeam = 10.600
+gtargmass_amu = 26.92
+htheta_lab = -19.682
+ptheta_lab = 8.495
+hpcentral = 3.32
+ppcentral = 6.80*0.985
+ppartmass = 0.1395706
hpartmass = 0.0005109
\ No newline at end of file
diff --git a/DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt.def b/DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt.def
index 9f84861e..61759261 100644
--- a/DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt.def
+++ b/DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt.def
@@ -9,6 +9,7 @@ block H.gtr.*
block H.kin.*
block H.rb.*
block H.react.*
+#block H.bcm.*
block P.ngcer.*
block P.dc.*
diff --git a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
index 3a4fac27..182da617 100644
--- a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
+++ b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
@@ -11,4 +11,5 @@ block H.cal.*
block H.gtr.*
block H.kin.*
block H.rb.*
-block H.react.*
\ No newline at end of file
+block H.react.*
+#block H.bcm.*
diff --git a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
index b25ce2f2..4e6606ef 100644
--- a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
@@ -52,8 +52,7 @@ TH2D htrig6rate_vs_time 'HMS Trig6 Rate vs. Time; 1 MHz Clock Time (s); hTRIG6 R
# HMS DC Ref time vs Hodo Ref time
#--------------------------------------
-
-TH2D dcref_vs_hodoref 'HMS HODO REF vs. DC REF; HODO REF time; DC REF time' T.hms.hT1_tdcTimeRaw T.hms.hDCREF2_tdcTimeRaw 100 1400 2600 100 14800 16000
+TH2D hms_dcref_vs_hodoref 'HMS HODO REF (hT2) vs. HMS DC REF 1; hT2 TDC Time Raw; DCREF1 TDC Time Raw' T.hms.hT2_tdcTimeRaw T.hms.hDCREF1_tdcTimeRaw 160 1400 3000 140 14800 16200
#--------------------------------
#HMS Trigger ADC Pulse pedestals
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def b/DEF-files/HMS/PRODUCTION/hstackana_production.def
index 87ef377e..7a6e3d0d 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def
@@ -14,4 +14,7 @@
#include "DEF-files/HMS/PRODUCTION/GTR/hgtr_vars.def"
#include "DEF-files/HMS/PRODUCTION/PID/hpid_vars.def"
#include "DEF-files/HMS/PRODUCTION/EPICS/hepics_vars.def"
-#include "DEF-files/HMS/PRODUCTION/KIN/hkin_vars.def"
\ No newline at end of file
+#include "DEF-files/HMS/PRODUCTION/KIN/hkin_vars.def"
+
+#include "DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def"
+
diff --git a/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def b/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def
index 0499dee1..fd39542d 100644
--- a/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/AERO/haeroana_cuts.def
@@ -1,22 +1,35 @@
Block: RawDecode
-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
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || HMS_COIN_event|| SHMS_COIN_event|| BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_HMS_events HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || HMS_COIN_event|| SHMS_COIN_event || COIN_ALL_event
RawDecode_master 1
Block: Decode
-Decode_master HMS_event
+hcut_TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+hcut_TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+hcut_TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
+
+hms_trigs ALL_HMS_events
+hcut_edtm_accepted T.hms.hEDTM_tdcTimeRaw != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTimeRaw == 0.0
+
+ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
+
+Decode_master ALL_HMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master HMS_event
+CoarseTracking_master ALL_HMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct HMS_event
+CourseReconstruct ALL_HMS_NO_EDTM
diff --git a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
index 2bc1c172..fd39542d 100644
--- a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-HMS_event g.evtyp == 2
-SHMS_event g.evtyp == 1
-COIN_event g.evtyp == 4
-
-TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
-TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
-TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
-HMS_Pretrig TRIG1 || TRIG2 || TRIG3
-
-hms_trigs HMS_event
-edtm_accepted T.hms.hEDTM_tdcTime != 0.0
-physics_accepted T.hms.hEDTM_tdcTime == 0.0
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || HMS_COIN_event|| SHMS_COIN_event|| BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_HMS_events HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || HMS_COIN_event|| SHMS_COIN_event || COIN_ALL_event
RawDecode_master 1
Block: Decode
-Decode_master HMS_event
+hcut_TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+hcut_TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+hcut_TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
+
+hms_trigs ALL_HMS_events
+hcut_edtm_accepted T.hms.hEDTM_tdcTimeRaw != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTimeRaw == 0.0
+
+ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
+
+Decode_master ALL_HMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master HMS_event
+CoarseTracking_master ALL_HMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct HMS_event
+CourseReconstruct ALL_HMS_NO_EDTM
diff --git a/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def b/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
index 2bc1c172..fd39542d 100644
--- a/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-HMS_event g.evtyp == 2
-SHMS_event g.evtyp == 1
-COIN_event g.evtyp == 4
-
-TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
-TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
-TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
-HMS_Pretrig TRIG1 || TRIG2 || TRIG3
-
-hms_trigs HMS_event
-edtm_accepted T.hms.hEDTM_tdcTime != 0.0
-physics_accepted T.hms.hEDTM_tdcTime == 0.0
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || HMS_COIN_event|| SHMS_COIN_event|| BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_HMS_events HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || HMS_COIN_event|| SHMS_COIN_event || COIN_ALL_event
RawDecode_master 1
Block: Decode
-Decode_master HMS_event
+hcut_TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+hcut_TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+hcut_TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
+
+hms_trigs ALL_HMS_events
+hcut_edtm_accepted T.hms.hEDTM_tdcTimeRaw != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTimeRaw == 0.0
+
+ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
+
+Decode_master ALL_HMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master HMS_event
+CoarseTracking_master ALL_HMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct HMS_event
+CourseReconstruct ALL_HMS_NO_EDTM
diff --git a/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def b/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
index 2bc1c172..fd39542d 100644
--- a/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-HMS_event g.evtyp == 2
-SHMS_event g.evtyp == 1
-COIN_event g.evtyp == 4
-
-TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
-TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
-TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
-HMS_Pretrig TRIG1 || TRIG2 || TRIG3
-
-hms_trigs HMS_event
-edtm_accepted T.hms.hEDTM_tdcTime != 0.0
-physics_accepted T.hms.hEDTM_tdcTime == 0.0
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || HMS_COIN_event|| SHMS_COIN_event|| BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_HMS_events HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || HMS_COIN_event|| SHMS_COIN_event || COIN_ALL_event
RawDecode_master 1
Block: Decode
-Decode_master HMS_event
+hcut_TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+hcut_TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+hcut_TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
+
+hms_trigs ALL_HMS_events
+hcut_edtm_accepted T.hms.hEDTM_tdcTimeRaw != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTimeRaw == 0.0
+
+ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
+
+Decode_master ALL_HMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master HMS_event
+CoarseTracking_master ALL_HMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct HMS_event
+CourseReconstruct ALL_HMS_NO_EDTM
diff --git a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
index 2bc1c172..fd39542d 100644
--- a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-HMS_event g.evtyp == 2
-SHMS_event g.evtyp == 1
-COIN_event g.evtyp == 4
-
-TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
-TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
-TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
-HMS_Pretrig TRIG1 || TRIG2 || TRIG3
-
-hms_trigs HMS_event
-edtm_accepted T.hms.hEDTM_tdcTime != 0.0
-physics_accepted T.hms.hEDTM_tdcTime == 0.0
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || HMS_COIN_event|| SHMS_COIN_event|| BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_HMS_events HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || HMS_COIN_event|| SHMS_COIN_event || COIN_ALL_event
RawDecode_master 1
Block: Decode
-Decode_master HMS_event
+hcut_TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+hcut_TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+hcut_TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
+
+hms_trigs ALL_HMS_events
+hcut_edtm_accepted T.hms.hEDTM_tdcTimeRaw != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTimeRaw == 0.0
+
+ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
+
+Decode_master ALL_HMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master HMS_event
+CoarseTracking_master ALL_HMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct HMS_event
+CourseReconstruct ALL_HMS_NO_EDTM
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
index 2bc1c172..fd39542d 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-HMS_event g.evtyp == 2
-SHMS_event g.evtyp == 1
-COIN_event g.evtyp == 4
-
-TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
-TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
-TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
-HMS_Pretrig TRIG1 || TRIG2 || TRIG3
-
-hms_trigs HMS_event
-edtm_accepted T.hms.hEDTM_tdcTime != 0.0
-physics_accepted T.hms.hEDTM_tdcTime == 0.0
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || HMS_COIN_event|| SHMS_COIN_event|| BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_HMS_events HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || HMS_COIN_event|| SHMS_COIN_event || COIN_ALL_event
RawDecode_master 1
Block: Decode
-Decode_master HMS_event
+hcut_TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+hcut_TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+hcut_TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
+
+hms_trigs ALL_HMS_events
+hcut_edtm_accepted T.hms.hEDTM_tdcTimeRaw != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTimeRaw == 0.0
+
+ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
+
+Decode_master ALL_HMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master HMS_event
+CoarseTracking_master ALL_HMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct HMS_event
+CourseReconstruct ALL_HMS_NO_EDTM
diff --git a/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
index 10d1b4b7..27f1c2c9 100644
--- a/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
+++ b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
@@ -13,4 +13,5 @@ block P.tr.*
block P.gtr.*
block P.kin.*
block P.rb.*
-block P.react.*
\ No newline at end of file
+block P.react.*
+#block P.bcm.*
diff --git a/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def
index 9bffe08e..cf09c9d0 100644
--- a/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def
+++ b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def
@@ -16,7 +16,8 @@ shmsGoodBetanotrk P.hod.betanotrack > 0.5 && P.hod.betanotrack < 1.4
shmsScinShould shmsScinGood && shmsGoodBetanotrk && !shmsDCany_large
shmsScinShoulde shmsScinShould && P.cal.etotnorm > 0.6 && P.cal.etotnorm < 1.6 && P.hgcer.npeSum > 0.5
-shmsScinShouldh shmsScinShould && P.cal.etotnorm <= 0.6 && P.cal.etotnorm > 0. && P.hgcer.npeSum < 0.2
+#shmsScinShouldh shmsScinShould && P.cal.etotnorm <= 0.6 && P.cal.etotnorm > 0. && P.hgcer.npeSum < 0.2
+shmsScinShouldh shmsScinShould && P.cal.etotnorm <= 0.6 && P.cal.etotnorm > 0.
shmsScinDid shmsScinShould && P.dc.ntrack > 0
shmsScinDide shmsScinShoulde && P.dc.ntrack > 0
shmsScinDidh shmsScinShouldh && P.dc.ntrack > 0
diff --git a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
index ee9a1fdb..9176af52 100644
--- a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 1
-HMS_event g.evtyp == 2
-COIN_event g.evtyp == 4
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event || HMS_COIN_event
+
+RawDecode_master 1
+
+Block: Decode
TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
-shms_trigs SHMS_event
+shms_trigs ALL_SHMS_events
edtm_accepted T.shms.pEDTM_tdcTime != 0.0
physics_accepted T.shms.pEDTM_tdcTime == 0.0
-RawDecode_master 1
-
-Block: Decode
+ALL_SHMS_NO_EDTM ALL_SHMS_events && pcut_physics_accepted
-Decode_master SHMS_event
+Decode_master ALL_SHMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master SHMS_event
+CoarseTracking_master ALL_SHMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct SHMS_event
+CourseReconstruct ALL_SHMS_NO_EDTM
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
index ee9a1fdb..9176af52 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 1
-HMS_event g.evtyp == 2
-COIN_event g.evtyp == 4
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event || HMS_COIN_event
+
+RawDecode_master 1
+
+Block: Decode
TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
-shms_trigs SHMS_event
+shms_trigs ALL_SHMS_events
edtm_accepted T.shms.pEDTM_tdcTime != 0.0
physics_accepted T.shms.pEDTM_tdcTime == 0.0
-RawDecode_master 1
-
-Block: Decode
+ALL_SHMS_NO_EDTM ALL_SHMS_events && pcut_physics_accepted
-Decode_master SHMS_event
+Decode_master ALL_SHMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master SHMS_event
+CoarseTracking_master ALL_SHMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct SHMS_event
+CourseReconstruct ALL_SHMS_NO_EDTM
diff --git a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
index ee9a1fdb..9176af52 100644
--- a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 1
-HMS_event g.evtyp == 2
-COIN_event g.evtyp == 4
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event || HMS_COIN_event
+
+RawDecode_master 1
+
+Block: Decode
TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
-shms_trigs SHMS_event
+shms_trigs ALL_SHMS_events
edtm_accepted T.shms.pEDTM_tdcTime != 0.0
physics_accepted T.shms.pEDTM_tdcTime == 0.0
-RawDecode_master 1
-
-Block: Decode
+ALL_SHMS_NO_EDTM ALL_SHMS_events && pcut_physics_accepted
-Decode_master SHMS_event
+Decode_master ALL_SHMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master SHMS_event
+CoarseTracking_master ALL_SHMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct SHMS_event
+CourseReconstruct ALL_SHMS_NO_EDTM
diff --git a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
index ee9a1fdb..9176af52 100644
--- a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 1
-HMS_event g.evtyp == 2
-COIN_event g.evtyp == 4
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event || HMS_COIN_event
+
+RawDecode_master 1
+
+Block: Decode
TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
-shms_trigs SHMS_event
+shms_trigs ALL_SHMS_events
edtm_accepted T.shms.pEDTM_tdcTime != 0.0
physics_accepted T.shms.pEDTM_tdcTime == 0.0
-RawDecode_master 1
-
-Block: Decode
+ALL_SHMS_NO_EDTM ALL_SHMS_events && pcut_physics_accepted
-Decode_master SHMS_event
+Decode_master ALL_SHMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master SHMS_event
+CoarseTracking_master ALL_SHMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct SHMS_event
+CourseReconstruct ALL_SHMS_NO_EDTM
diff --git a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
index ee9a1fdb..9176af52 100644
--- a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 1
-HMS_event g.evtyp == 2
-COIN_event g.evtyp == 4
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event || HMS_COIN_event
+
+RawDecode_master 1
+
+Block: Decode
TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
-shms_trigs SHMS_event
+shms_trigs ALL_SHMS_events
edtm_accepted T.shms.pEDTM_tdcTime != 0.0
physics_accepted T.shms.pEDTM_tdcTime == 0.0
-RawDecode_master 1
-
-Block: Decode
+ALL_SHMS_NO_EDTM ALL_SHMS_events && pcut_physics_accepted
-Decode_master SHMS_event
+Decode_master ALL_SHMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master SHMS_event
+CoarseTracking_master ALL_SHMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct SHMS_event
+CourseReconstruct ALL_SHMS_NO_EDTM
diff --git a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
index ee9a1fdb..9176af52 100644
--- a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
@@ -1,27 +1,35 @@
Block: RawDecode
-Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 1
-HMS_event g.evtyp == 2
-COIN_event g.evtyp == 4
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event || HMS_COIN_event
+
+RawDecode_master 1
+
+Block: Decode
TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
-shms_trigs SHMS_event
+shms_trigs ALL_SHMS_events
edtm_accepted T.shms.pEDTM_tdcTime != 0.0
physics_accepted T.shms.pEDTM_tdcTime == 0.0
-RawDecode_master 1
-
-Block: Decode
+ALL_SHMS_NO_EDTM ALL_SHMS_events && pcut_physics_accepted
-Decode_master SHMS_event
+Decode_master ALL_SHMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master SHMS_event
+CoarseTracking_master ALL_SHMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct SHMS_event
+CourseReconstruct ALL_SHMS_NO_EDTM
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
index eecf0f00..9176af52 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
@@ -1,22 +1,35 @@
Block: RawDecode
-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
+Pedestal_event g.evtyp == 99
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+BOTH_SINGLES_event g.evtyp == 3
+COIN_ONLY_event g.evtyp == 4
+SHMS_COIN_event g.evtyp == 5
+HMS_COIN_event g.evtyp == 6
+COIN_ALL_event g.evtyp == 7
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event || HMS_COIN_event
RawDecode_master 1
Block: Decode
-Decode_master SHMS_event
+TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+shms_trigs ALL_SHMS_events
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
+
+ALL_SHMS_NO_EDTM ALL_SHMS_events && pcut_physics_accepted
+
+Decode_master ALL_SHMS_NO_EDTM
Block: CoarseTracking
-CoarseTracking_master SHMS_event
+CoarseTracking_master ALL_SHMS_NO_EDTM
Block: CoarseReconstruct
-CourseReconstruct SHMS_event
+CourseReconstruct ALL_SHMS_NO_EDTM
diff --git a/PARAM/HMS/CER/hcer_cuts.param b/PARAM/HMS/CER/hcer_cuts.param
index c78b03b0..a22c6a28 100644
--- a/PARAM/HMS/CER/hcer_cuts.param
+++ b/PARAM/HMS/CER/hcer_cuts.param
@@ -16,10 +16,10 @@ hcer_enorm_max = 1.5
hcer_dp_min = -20.0
hcer_dp_max = 25.0
-hcer_adc_tdc_window= 200.
+hcer_adc_tdc_offset= 0.
; ADC time window cut values used to select "good" ADC events
-hcer_adcTimeWindowMin = -1000.,-1000.
-hcer_adcTimeWindowMax = 1000.,1000.
+hcer_adcTimeWindowMin = 93.,96.
+hcer_adcTimeWindowMax = 101.,103.
; NPE Threshold for good hit (for measureing effic.)
hcer_npe_thresh = 0.5
diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
index 6c6c840c..26ddf275 100644
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
+++ b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
@@ -37,6 +37,10 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Load fadc debug parameters
gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+
+ // const char* CurrentFileNamePattern = "low_curr_bcm/bcmcurrent_%d.param";
+ // gHcParms->Load(Form(CurrentFileNamePattern, RunNumber));
+
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/COIN/DETEC/coin.map");
@@ -72,6 +76,9 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
THcShower* pcal = new THcShower("cal", "Calorimeter");
SHMS->AddDetector(pcal);
+ // THcBCMCurrent* hbc = new THcBCMCurrent("H.bcm", "BCM current check");
+ // gHaPhysics->Add(hbc);
+
// Add rastered beam apparatus
THaApparatus* pbeam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(pbeam);
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
index 5319b487..5f30376a 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
@@ -37,6 +37,9 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Load fadc debug parameters
gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
+ // const char* CurrentFileNamePattern = "low_curr_bcm/bcmcurrent_%d.param";
+ // gHcParms->Load(Form(CurrentFileNamePattern, RunNumber));
+
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack.map");
@@ -67,6 +70,9 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcShower* cal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(cal);
+ // THcBCMCurrent* hbc = new THcBCMCurrent("H.bcm", "BCM current check");
+ // gHaPhysics->Add(hbc);
+
// Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
gHaApps->Add(beam);
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
index ef752a25..baab5e2b 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
@@ -36,6 +36,9 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Load fadc debug parameters
gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+ // const char* CurrentFileNamePattern = "low_curr_bcm/bcmcurrent_%d.param";
+ // gHcParms->Load(Form(CurrentFileNamePattern, RunNumber));
+
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
@@ -69,6 +72,9 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
THcShower* cal = new THcShower("cal", "Calorimeter");
SHMS->AddDetector(cal);
+ // THcBCMCurrent* pbc = new THcBCMCurrent("P.bcm", "BCM current check");
+ // gHaPhysics->Add(pbc);
+
// Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(beam);
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin_all.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin_all.C
new file mode 100644
index 00000000..358275c0
--- /dev/null
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin_all.C
@@ -0,0 +1,169 @@
+void replay_production_shms_coin_all (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
+
+ // Get RunNumber and MaxEvent if not provided.
+ if(RunNumber == 0) {
+ cout << "Enter a Run Number (-1 to exit): ";
+ cin >> RunNumber;
+ if( RunNumber<=0 ) return;
+ }
+ if(MaxEvent == 0) {
+ cout << "\nNumber of Events to analyze: ";
+ cin >> MaxEvent;
+ if(MaxEvent == 0) {
+ cerr << "...Invalid entry\n";
+ exit;
+ }
+ }
+
+ // Create file name patterns.
+ const char* RunFileNamePattern = "coin_all_%05d.dat";
+ vector<TString> pathList;
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
+
+ const char* ROOTFileNamePattern = "ROOTfiles/shms_coin_replay_production_all_%d_%d.root";
+
+ // Load global parameters
+ gHcParms->Define("gen_run_number", "Run Number", RunNumber);
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/standard.database");
+ gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
+ gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ // Load parameters for SHMS trigger configuration
+ gHcParms->Load("PARAM/TRIG/tshms.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+
+ // Load the Hall C detector map
+ gHcDetectorMap = new THcDetectorMap();
+ gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
+
+ // Set up the equipment to be analyzed.
+ THcHallCSpectrometer* SHMS = new THcHallCSpectrometer("P", "SHMS");
+ SHMS->SetEvtType(1);
+ SHMS->AddEvtType(4);
+ SHMS->AddEvtType(5);
+ SHMS->AddEvtType(6);
+ SHMS->AddEvtType(7);
+ gHaApps->Add(SHMS);
+ // Add Noble Gas Cherenkov to SHMS apparatus
+ THcCherenkov* ngcer = new THcCherenkov("ngcer", "Noble Gas Cherenkov");
+ SHMS->AddDetector(ngcer);
+ // Add drift chambers to SHMS apparatus
+ THcDC* dc = new THcDC("dc", "Drift Chambers");
+ SHMS->AddDetector(dc);
+ // Add hodoscope to SHMS apparatus
+ THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
+ SHMS->AddDetector(hod);
+ // Add Heavy Gas Cherenkov to SHMS apparatus
+ THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
+ SHMS->AddDetector(hgcer);
+ // Add Aerogel Cherenkov to SHMS apparatus
+ THcAerogel* aero = new THcAerogel("aero", "Aerogel");
+ SHMS->AddDetector(aero);
+ // Add calorimeter to SHMS apparatus
+ THcShower* cal = new THcShower("cal", "Calorimeter");
+ SHMS->AddDetector(cal);
+
+ // Add trigger apparatus
+ THaApparatus* TRG = new THcTrigApp("T", "TRG");
+ gHaApps->Add(TRG);
+ // Add trigger detector to trigger apparatus
+ THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
+ shms->SetSpectName("P");
+ TRG->AddDetector(shms);
+
+ // Add rastered beam apparatus
+ THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
+ gHaApps->Add(beam);
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* prp = new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
+ gHaPhysics->Add(prp);
+ // Calculate extended target corrections
+ THcExtTarCor* pext = new THcExtTarCor("P.extcor", "HMS extended target corrections", "P", "P.react");
+ gHaPhysics->Add(pext);
+ // Calculate golden track quantites
+ THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
+ gHaPhysics->Add(gtr);
+ // Calculate primary (scattered beam - usually electrons) kinematics
+ THcPrimaryKine* kin = new THcPrimaryKine("P.kin", "SHMS Single Arm Kinematics", "P", "P.rb");
+ gHaPhysics->Add(kin);
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* peff = new THcHodoEff("phodeff", "SHMS hodo efficiency", "P.hod");
+ gHaPhysics->Add(peff);
+
+ // Add event handler for prestart event 125.
+ THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
+ gHaEvtHandlers->Add(ev125);
+ // Add event handler for EPICS events
+ THaEpicsEvtHandler* hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
+ gHaEvtHandlers->Add(hcepics);
+ // Add event handler for scaler events
+ THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event type 1");
+ pscaler->AddEvtType(1);
+ pscaler->AddEvtType(4);
+ pscaler->AddEvtType(5);
+ pscaler->AddEvtType(6);
+ pscaler->AddEvtType(7);
+ pscaler->AddEvtType(129);
+ pscaler->SetDelayedType(129);
+ pscaler->SetUseFirstEvent(kTRUE);
+ gHaEvtHandlers->Add(pscaler);
+ // Add event handler for DAQ configuration event
+ THcConfigEvtHandler *pconfig = new THcConfigEvtHandler("pconfig", "Hall C configuration event handler");
+ gHaEvtHandlers->Add(pconfig);
+
+ // Set up the analyzer - we use the standard one,
+ // but this could be an experiment-specific one as well.
+ // The Analyzer controls the reading of the data, executes
+ // tests/cuts, loops over Acpparatus's and PhysicsModules,
+ // and executes the output routines.
+ THcAnalyzer* analyzer = new THcAnalyzer;
+
+ // A simple event class to be output to the resulting tree.
+ // Creating your own descendant of THaEvent is one way of
+ // defining and controlling the output.
+ THaEvent* event = new THaEvent;
+
+ // Define the run(s) that we want to analyze.
+ // We just set up one, but this could be many.
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
+
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
+ run->SetNscan(1);
+ run->SetDataRequired(0x7);
+ run->Print();
+
+ // Define the analysis parameters
+ TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+
+ analyzer->SetEvent(event);
+ // Set EPICS event type
+ analyzer->SetEpicsEvtType(180);
+ // Define crate map
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ // Define output ROOT file
+ analyzer->SetOutFile(ROOTFileName.Data());
+ // Define DEF-file
+ analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production_all.def");
+ // Define cuts file
+ analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/CUTS/pstackana_production_cuts.def"); // optional
+ // File to record accounting information for cuts
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_coin_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ // Start the actual analysis.
+ analyzer->Process(run);
+ // Create report file from template
+ analyzer->PrintReport("TEMPLATES/SHMS/PRODUCTION/pstackana_production.template",
+ Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_coin_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+
+}
diff --git a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg
index bad76054..3208584f 100644
--- a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg
+++ b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg
@@ -193,4 +193,4 @@ htrig6rate_vs_time -nostat
newpage 1 1 linxy
title HMS DC_REF vs HODO_REF
-dcref_vs_hodoref -nostat -type box
\ No newline at end of file
+hms_dcref_vs_hodoref -nostat -type box
\ No newline at end of file
--
GitLab