diff --git a/DEF-files/COIN/PRODUCTION/coin_production_pElec_hProt_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def
similarity index 60%
rename from DEF-files/COIN/PRODUCTION/coin_production_pElec_hProt_cuts.def
rename to DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def
index edc4cc3d35e646805a06225fd3d422002ae5d72b..2498367a03966a8bfe1c72c17a372559e29f6df9 100644
--- a/DEF-files/COIN/PRODUCTION/coin_production_pElec_hProt_cuts.def
+++ b/DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def
@@ -1,17 +1,3 @@
-Block: RawDecode
-
-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
-
-RawDecode_master ALL_events
-
Block: Decode
pTRIG1_ROC2 T.coin.pTRIG1_ROC2_tdcTimeRaw > 0
@@ -57,36 +43,4 @@ pcut_good_S1_time T.coin.p1T_tdcTime > 241 && T.coin.p1T_tdcTime < 243
pcut_good_S2X_time T.coin.p2X_tdcTime > 180 && T.coin.p2X_tdcTime < 220
pcut_good_S1_S2X_time pcut_good_S1_time && pcut_good_S2X_time
-ALL_COIN_NO_EDTM T.coin.hEDTM_tdcTime==0.0&&T.coin.pEDTM_tdcTime==0.0&&ALL_events
-
-
-Decode_master ALL_COIN_NO_EDTM
-
-Block: CoarseTracking
-CoarseTracking_master ALL_COIN_NO_EDTM
-
-Block: CoarseReconstruct
-CoarseReconstruct_master ALL_COIN_NO_EDTM
-
-Block: Tracking
-Tracking_master ALL_COIN_NO_EDTM
-
-Block: Reconstruct
-Reconstruct_master ALL_COIN_NO_EDTM
-
-hcleantrack H.gtr.index > -1
-pcleantrack P.gtr.index > -1
-ccleantrack hcleantrack && pcleantrack
-
-coincut ccleantrack && goodctime
-tight_coin ccleantrack && tightctime
-ran_coincut ccleantrack && ranctime
-
-e_cut_cal P.cal.etottracknorm > 0.6 && P.cal.etottracknorm < 1.6
-e_cut_cer P.hgcer.npeSum > 0.5
-select_e_cut e_cut_cal && e_cut_cer
-betacut_proton H.gtr.beta > 0.6 && H.gtr.beta < 0.8
-coincut_ep ccleantrack && select_e_cut && betacut_proton
-
-#include "DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def"
-#include "DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def"
+ALL_COIN_NO_EDTM T.coin.hEDTM_tdcTime==0.0&&T.coin.pEDTM_tdcTime==0.0&&ALL_events
\ No newline at end of file
diff --git a/DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..76b484510e36c5ac29f87f6dc35a8f309cdaedea
--- /dev/null
+++ b/DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def
@@ -0,0 +1,24 @@
+Block: RawDecode
+#include "DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def"
+RawDecode_master ALL_events
+
+Block: Decode
+#include "DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def"
+Decode_master ALL_COIN_NO_EDTM
+
+Block: CoarseTracking
+#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_coarsetracking_cuts.def"
+#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def"
+CoarseTracking_master ALL_COIN_NO_EDTM
+
+Block: CoarseReconstruct
+CoarseReconstruct_master ALL_COIN_NO_EDTM
+
+Block: Tracking
+Tracking_master ALL_COIN_NO_EDTM
+
+Block: Reconstruct
+#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def"
+#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_reconstruct_cuts.def"
+#include "DEF-files/COIN/PRODUCTION/CUTS/coin_reconstruct_cuts.def"
+Reconstruct_master ALL_COIN_NO_EDTM
\ No newline at end of file
diff --git a/DEF-files/COIN/PRODUCTION/coin_production_ep_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_production_ep_cuts.def
similarity index 100%
rename from DEF-files/COIN/PRODUCTION/coin_production_ep_cuts.def
rename to DEF-files/COIN/PRODUCTION/CUTS/coin_production_ep_cuts.def
diff --git a/DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..331db0e6889b7bd44dff6b92fffe3026126cea76
--- /dev/null
+++ b/DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def
@@ -0,0 +1,14 @@
+Block: RawDecode
+
+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_HMS_events HMS_event || COIN_ONLY_event || HMS_COIN_event || COIN_ALL_event
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event
+ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
\ No newline at end of file
diff --git a/DEF-files/COIN/PRODUCTION/CUTS/coin_reconstruct_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_reconstruct_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..fea06f99d3cb02dde39e5d55878fd53d85b4aecf
--- /dev/null
+++ b/DEF-files/COIN/PRODUCTION/CUTS/coin_reconstruct_cuts.def
@@ -0,0 +1,21 @@
+Block: Reconstruct
+
+hcleantrack H.gtr.index > -1
+pcleantrack P.gtr.index > -1
+ccleantrack hcleantrack && pcleantrack
+
+coincut ccleantrack && goodctime
+tight_coin ccleantrack && tightctime
+ran_coincut ccleantrack && ranctime
+
+he_cut_cal H.cal.etottracknorm > 0.6 && H.cal.etottracknorm < 1.6
+he_cut_cer H.cer.npeSum > 0.5
+hselect_e_cut he_cut_cal && he_cut_cer
+hbetacut_proton P.gtr.beta > 0.6 && P.gtr.beta < 0.8
+hcoincut_ep ccleantrack && hselect_e_cut && hbetacut_proton
+
+pe_cut_cal P.cal.etottracknorm > 0.6 && P.cal.etottracknorm < 1.6
+pe_cut_cer P.hgcer.npeSum > 0.5
+pselect_e_cut pe_cut_cal && pe_cut_cer
+pbetacut_proton H.gtr.beta > 0.6 && H.gtr.beta < 0.8
+pcoincut_ep ccleantrack && pselect_e_cut && pbetacut_proton
\ No newline at end of file
diff --git a/DEF-files/COIN/PRODUCTION/KIN/coin_hElec_pProt_kin_histos.def b/DEF-files/COIN/PRODUCTION/KIN/coin_hElec_pProt_kin_histos.def
index 402fd86880271ac47575002015949cd639e1b1e2..544d3619d12e5448e3c037db654412a815f99702 100644
--- a/DEF-files/COIN/PRODUCTION/KIN/coin_hElec_pProt_kin_histos.def
+++ b/DEF-files/COIN/PRODUCTION/KIN/coin_hElec_pProt_kin_histos.def
@@ -6,9 +6,9 @@
formula mmiss P.kin.secondary.emiss_nuc*P.kin.secondary.emiss_nuc-P.kin.secondary.pmiss*P.kin.secondary.pmiss
TH1F pkin_mmiss 'SHMS M^{2}_{miss} (ccleantrack); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 ccleantrack
TH1F pkin_mmiss_coincut 'SHMS M^{2}_{miss} (coincut); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 coincut
-TH1F pkin_mmiss_coincut_ep 'SHMS M^{2}_{miss} (coincut_ep); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 coincut_ep
-TH1F pkin_mmiss_tightcut 'SHMS M^{2}_{miss} (tight_coin); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 tight_coin&&select_e_cut&&betacut_proton
-TH1F pkin_mmiss_ran_coincut 'SHMS M^{2}_{miss} (ran_coincut); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 ran_coincut&&select_e_cut&&betacut_proton
+TH1F pkin_mmiss_coincut_ep 'SHMS M^{2}_{miss} (coincut_ep); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 hcoincut_ep
+TH1F pkin_mmiss_tightcut 'SHMS M^{2}_{miss} (tight_coin); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 tight_coin&&hselect_e_cut&&hbetacut_proton
+TH1F pkin_mmiss_ran_coincut 'SHMS M^{2}_{miss} (ran_coincut); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 ran_coincut&&hselect_e_cut&&hbetacut_proton
############################
@@ -16,17 +16,17 @@ TH1F pkin_mmiss_ran_coincut 'SHMS M^{2}_{miss} (ran_coincut); M^{2}_{miss} (GeV
############################
TH1F pkin_pmiss 'SHMS p_{miss} Magnitude (ccleantrack); p_{miss} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss 200 -2 2 ccleantrack
TH1F pkin_pmiss_coincut 'SHMS p_{miss} Magnitude (coincut); p_{miss} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss 200 -2 2 coincut
-TH1F pkin_pmiss_pid 'SHMS p_{miss} Magnitude (coincut_ep); p_{miss} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss 200 -2 2 coincut_ep
-TH1F pkin_pmiss_x 'SHMS p_{miss,x} (coincut_ep); p_{miss,x} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss_x 200 -2 2 coincut_ep
-TH1F pkin_pmiss_y 'SHMS p_{miss,y} (coincut_ep); p_{miss,y} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss_y 200 -2 2 coincut_ep
-TH1F pkin_pmiss_z 'SHMS p_{miss,z} (coincut_ep); p_{miss,z} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss_z 200 -2 2 coincut_ep
+TH1F pkin_pmiss_pid 'SHMS p_{miss} Magnitude (coincut_ep); p_{miss} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss 200 -2 2 hcoincut_ep
+TH1F pkin_pmiss_x 'SHMS p_{miss,x} (coincut_ep); p_{miss,x} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss_x 200 -2 2 hcoincut_ep
+TH1F pkin_pmiss_y 'SHMS p_{miss,y} (coincut_ep); p_{miss,y} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss_y 200 -2 2 hcoincut_ep
+TH1F pkin_pmiss_z 'SHMS p_{miss,z} (coincut_ep); p_{miss,z} (GeV); Count / 0.02 GeV;' P.kin.secondary.pmiss_z 200 -2 2 hcoincut_ep
############################
# MISSING ENERGY
############################
TH1F pkin_Emiss 'SHMS E_{miss} (ccleantrack); E_{miss} (GeV); Count / 0.01 GeV;' P.kin.secondary.emiss_nuc 400 -1 3 ccleantrack
TH1F pkin_Emiss_coincut 'SHMS E_{miss} (coincut); E_{miss} (GeV); Count / 0.01 GeV;' P.kin.secondary.emiss_nuc 400 -1 3 coincut
-TH1F pkin_Emiss_pid 'SHMS E_{miss} (coincut_ep); E_{miss} (GeV); Count / 0.01 GeV;' P.kin.secondary.emiss_nuc 400 -1 3 coincut_ep
+TH1F pkin_Emiss_pid 'SHMS E_{miss} (coincut_ep); E_{miss} (GeV); Count / 0.01 GeV;' P.kin.secondary.emiss_nuc 400 -1 3 hcoincut_ep
############################
diff --git a/DEF-files/COIN/PRODUCTION/KIN/coin_pElec_hProt_kin_histos.def b/DEF-files/COIN/PRODUCTION/KIN/coin_pElec_hProt_kin_histos.def
index e48e0b57c26c13c76bd7069eb3480b0a01cea272..5d2538021285cfe8a6d0daf2d4417bb526a32724 100644
--- a/DEF-files/COIN/PRODUCTION/KIN/coin_pElec_hProt_kin_histos.def
+++ b/DEF-files/COIN/PRODUCTION/KIN/coin_pElec_hProt_kin_histos.def
@@ -6,9 +6,9 @@
formula mmiss H.kin.secondary.emiss_nuc*H.kin.secondary.emiss_nuc-H.kin.secondary.pmiss*H.kin.secondary.pmiss
TH1F hkin_mmiss 'HMS M^{2}_{miss} (ccleantrack); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 ccleantrack
TH1F hkin_mmiss_coincut 'HMS M^{2}_{miss} (coincut); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 coincut
-TH1F hkin_mmiss_coincut_ep 'HMS M^{2}_{miss} (coincut_ep); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 coincut_ep
-TH1F hkin_mmiss_tightcut 'HMS M^{2}_{miss} (tight_coin); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 tight_coin&&select_e_cut&&betacut_proton
-TH1F hkin_mmiss_ran_coincut 'HMS M^{2}_{miss} (ran_coincut); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 ran_coincut&&select_e_cut&&betacut_proton
+TH1F hkin_mmiss_coincut_ep 'HMS M^{2}_{miss} (coincut_ep); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 pcoincut_ep
+TH1F hkin_mmiss_tightcut 'HMS M^{2}_{miss} (tight_coin); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 tight_coin&&pselect_e_cut&&pbetacut_proton
+TH1F hkin_mmiss_ran_coincut 'HMS M^{2}_{miss} (ran_coincut); M^{2}_{miss} (GeV); Count / 0.01 GeV' mmiss 400 -2 2 ran_coincut&&pselect_e_cut&&pbetacut_proton
############################
@@ -16,17 +16,17 @@ TH1F hkin_mmiss_ran_coincut 'HMS M^{2}_{miss} (ran_coincut); M^{2}_{miss} (GeV)
############################
TH1F hkin_pmiss 'HMS p_{miss} Magnitude (ccleantrack); p_{miss} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss 200 -2 2 ccleantrack
TH1F hkin_pmiss_coincut 'HMS p_{miss} Magnitude (coincut); p_{miss} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss 200 -2 2 coincut
-TH1F hkin_pmiss_pid 'HMS p_{miss} Magnitude (coincut_ep); p_{miss} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss 200 -2 2 coincut_ep
-TH1F hkin_pmiss_x 'HMS p_{miss,x} (coincut_ep); p_{miss,x} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss_x 200 -2 2 coincut_ep
-TH1F hkin_pmiss_y 'HMS p_{miss,y} (coincut_ep); p_{miss,y} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss_y 200 -2 2 coincut_ep
-TH1F hkin_pmiss_z 'HMS p_{miss,z} (coincut_ep); p_{miss,z} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss_z 200 -2 2 coincut_ep
+TH1F hkin_pmiss_pid 'HMS p_{miss} Magnitude (coincut_ep); p_{miss} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss 200 -2 2 pcoincut_ep
+TH1F hkin_pmiss_x 'HMS p_{miss,x} (coincut_ep); p_{miss,x} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss_x 200 -2 2 pcoincut_ep
+TH1F hkin_pmiss_y 'HMS p_{miss,y} (coincut_ep); p_{miss,y} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss_y 200 -2 2 pcoincut_ep
+TH1F hkin_pmiss_z 'HMS p_{miss,z} (coincut_ep); p_{miss,z} (GeV); Count / 0.02 GeV;' H.kin.secondary.pmiss_z 200 -2 2 pcoincut_ep
############################
# MISSING ENERGY
############################
TH1F hkin_Emiss 'HMS E_{miss} (ccleantrack); E_{miss} (GeV); Count / 0.01 GeV;' H.kin.secondary.emiss_nuc 400 -1 3 ccleantrack
TH1F hkin_Emiss_coincut 'HMS E_{miss} (coincut); E_{miss} (GeV); Count / 0.01 GeV;' H.kin.secondary.emiss_nuc 400 -1 3 coincut
-TH1F hkin_Emiss_pid 'HMS E_{miss} (coincut_ep); E_{miss} (GeV); Count / 0.01 GeV;' H.kin.secondary.emiss_nuc 400 -1 3 coincut_ep
+TH1F hkin_Emiss_pid 'HMS E_{miss} (coincut_ep); E_{miss} (GeV); Count / 0.01 GeV;' H.kin.secondary.emiss_nuc 400 -1 3 pcoincut_ep
############################
diff --git a/DEF-files/COIN/PRODUCTION/TRIG/coin_trig_histos.def b/DEF-files/COIN/PRODUCTION/TRIG/coin_trig_histos.def
index aa2ad4e93e0f27730220dfffb1201a2064df9885..ab9330b304be57317fd14a3c9d327a6553b32152 100644
--- a/DEF-files/COIN/PRODUCTION/TRIG/coin_trig_histos.def
+++ b/DEF-files/COIN/PRODUCTION/TRIG/coin_trig_histos.def
@@ -12,10 +12,10 @@ TH2F pgtr_beta_vs_htrig_cointime 'SHMS Beta vs pTRIG1_ROC1-pTRIG4_ROC1; cointime
############################
TH1F ptrig_cointime_ccleantrack 'SHMS cointime (ccleantrack); SHMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC2_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC2_tdcTimeRaw*0.1 1600 -800 800 ccleantrack
TH1F ptrig_cointime_coincut 'SHMS cointime (coincut); SHMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC2_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC2_tdcTimeRaw*0.1 1600 -800 800 coincut
-TH1F ptrig_cointime_coincut_ep 'SHMS cointime (coincut_ep); SHMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC2_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC2_tdcTimeRaw*0.1 1600 -800 800 coincut_ep
+TH1F ptrig_cointime_coincut_ep 'SHMS cointime (coincut_ep); SHMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC2_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC2_tdcTimeRaw*0.1 1600 -800 800 pcoincut_ep
TH1F htrig_cointime_ccleantrack 'HMS cointime (ccleantrack); HMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC1_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC1_tdcTimeRaw*0.1 1600 -800 800 ccleantrack
TH1F htrig_cointime_coincut 'HMS cointime (coincut); HMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC1_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC1_tdcTimeRaw*0.1 1600 -800 800 coincut
-TH1F htrig_cointime_coincut_ep 'HMS cointime (coincut_ep); HMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC1_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC1_tdcTimeRaw*0.1 1600 -800 800 coincut_ep
+TH1F htrig_cointime_coincut_ep 'HMS cointime (coincut_ep); HMS cointime (ns); Count / 1 ns;' T.coin.pTRIG1_ROC1_tdcTimeRaw*0.1-T.coin.pTRIG4_ROC1_tdcTimeRaw*0.1 1600 -800 800 hcoincut_ep
############################
diff --git a/DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt_cuts.def b/DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt_cuts.def
deleted file mode 100644
index b26528589b51437e38c4f4f40edabd02788b7364..0000000000000000000000000000000000000000
--- a/DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt_cuts.def
+++ /dev/null
@@ -1,97 +0,0 @@
-Block: RawDecode
-
-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
-
-RawDecode_master ALL_events
-
-Block: Decode
-
-pTRIG1_ROC2 T.coin.pTRIG1_ROC2_tdcTimeRaw > 0
-pTRIG2_ROC2 T.coin.pTRIG2_ROC2_tdcTimeRaw > 0
-pTRIG3_ROC2 T.coin.pTRIG3_ROC2_tdcTimeRaw > 0
-pTRIG4_ROC2 T.coin.pTRIG4_ROC2_tdcTimeRaw > 0
-pTRIG5_ROC2 T.coin.pTRIG5_ROC2_tdcTimeRaw > 0
-pTRIG6_ROC2 T.coin.pTRIG6_ROC2_tdcTimeRaw > 0
-
-pTRIG1_ROC1 T.coin.pTRIG1_ROC1_tdcTimeRaw > 0
-pTRIG2_ROC1 T.coin.pTRIG2_ROC1_tdcTimeRaw > 0
-pTRIG3_ROC1 T.coin.pTRIG3_ROC1_tdcTimeRaw > 0
-pTRIG4_ROC1 T.coin.pTRIG4_ROC1_tdcTimeRaw > 0
-pTRIG5_ROC1 T.coin.pTRIG5_ROC1_tdcTimeRaw > 0
-pTRIG6_ROC1 T.coin.pTRIG6_ROC1_tdcTimeRaw > 0
-
-hTRIG1_ROC2 T.coin.hTRIG1_ROC2_tdcTimeRaw > 0
-hTRIG2_ROC2 T.coin.hTRIG2_ROC2_tdcTimeRaw > 0
-hTRIG3_ROC2 T.coin.hTRIG3_ROC2_tdcTimeRaw > 0
-hTRIG4_ROC2 T.coin.hTRIG4_ROC2_tdcTimeRaw > 0
-hTRIG5_ROC2 T.coin.hTRIG5_ROC2_tdcTimeRaw > 0
-hTRIG6_ROC2 T.coin.hTRIG6_ROC2_tdcTimeRaw > 0
-
-hTRIG1_ROC1 T.coin.hTRIG1_ROC1_tdcTimeRaw > 0
-hTRIG2_ROC1 T.coin.hTRIG2_ROC1_tdcTimeRaw > 0
-hTRIG3_ROC1 T.coin.hTRIG3_ROC1_tdcTimeRaw > 0
-hTRIG4_ROC1 T.coin.hTRIG4_ROC1_tdcTimeRaw > 0
-hTRIG5_ROC1 T.coin.hTRIG5_ROC1_tdcTimeRaw > 0
-hTRIG6_ROC1 T.coin.hTRIG6_ROC1_tdcTimeRaw > 0
-
-shms_trigs SHMS_event
-hms_trigs HMS_event
-SHMS_edtm_accepted T.coin.pEDTM_tdcTime != 0.0
-SHMS_physics_accepted T.coin.pEDTM_tdcTime == 0.0
-HMS_edtm_accepted T.coin.hEDTM_tdcTime != 0.0
-HMS_physics_accepted T.coin.hEDTM_tdcTime == 0.0
-
-goodctime ALL_events #LOOSE CUT AROUND COINTIME PEAK (3 beam buckets)
-tightctime ALL_events #TIGHT CUT AROUND COINTIME PEAK (1 beam buckets)
-ranctime ALL_events #CUT AWAY FROM COINTIME PEAK (4 beam buckets)
-
-pcut_good_S1_time T.coin.p1T_tdcTime > 241 && T.coin.p1T_tdcTime < 243
-pcut_good_S2X_time T.coin.p2X_tdcTime > 180 && T.coin.p2X_tdcTime < 220
-pcut_good_S1_S2X_time pcut_good_S1_time && pcut_good_S2X_time
-
-ALL_COIN_NO_EDTM T.coin.hEDTM_tdcTime==0.0&&T.coin.pEDTM_tdcTime==0.0&&ALL_events
-
-Decode_master ALL_COIN_NO_EDTM
-
-Block: CoarseTracking
-
-#include "DEF-files/SHMS/PRODUCTION/pstackana_coarsetracking_cuts.def"
-#include "DEF-files/HMS/PRODUCTION/hstackana_coarsetracking_cuts.def"
-
-CoarseTracking_master ALL_COIN_NO_EDTM
-
-Block: CoarseReconstruct
-CoarseReconstruct_master ALL_COIN_NO_EDTM
-
-Block: Tracking
-Tracking_master ALL_COIN_NO_EDTM
-
-Block: Reconstruct
-
-#include "DEF-files/SHMS/PRODUCTION/pstackana_reconstruction_cuts.def"
-#include "DEF-files/HMS/PRODUCTION/hstackana_reconstruction_cuts.def"
-
-Reconstruct_master ALL_COIN_NO_EDTM
-
-hcleantrack H.gtr.index > -1
-pcleantrack P.gtr.index > -1
-ccleantrack hcleantrack && pcleantrack
-
-coincut ccleantrack && goodctime
-tight_coin ccleantrack && tightctime
-ran_coincut ccleantrack && ranctime
-
-e_cut_cal H.cal.etottracknorm > 0.6 && H.cal.etottracknorm < 1.6
-e_cut_cer H.cer.npeSum > 0.5
-select_e_cut e_cut_cal && e_cut_cer
-betacut_proton P.gtr.beta > 0.6 && P.gtr.beta < 0.8
-coincut_ep ccleantrack && select_e_cut && betacut_proton
-
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_coarsetracking_cuts.def b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def
similarity index 100%
rename from DEF-files/HMS/PRODUCTION/hstackana_coarsetracking_cuts.def
rename to DEF-files/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def
diff --git a/DEF-files/HMS/PRODUCTION/CUTS/hstackana_decode_cuts.def b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_decode_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..2825de54f3990e8a3eb711a38d4d8aea8e978b3f
--- /dev/null
+++ b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_decode_cuts.def
@@ -0,0 +1,11 @@
+Block: Decode
+
+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 HMS_event
+hcut_edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTime == 0.0
+ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..d7177b142a1720c858bb77b20f001479ef5489c8
--- /dev/null
+++ b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def
@@ -0,0 +1,26 @@
+# Report file for HMS stack
+
+Block: RawDecode
+#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_rawdecode_cuts.def"
+RawDecode_master 1
+
+Block: Decode
+#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_decode_cuts.def"
+Decode_master ALL_HMS_NO_EDTM
+
+Block: CoarseTracking
+#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def"
+CoarseTracking_master ALL_HMS_events
+
+Block: CoarseReconstruct
+CoarseReconstruct_master ALL_HMS_NO_EDTM
+
+Block: Tracking
+Tracking_master ALL_HMS_NO_EDTM
+
+Block: Reconstruct
+#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_reconstruct_cuts.def"
+Reconstruct_master ALL_HMS_NO_EDTM
+
+Block: Physics
+Physics_master ALL_HMS_NO_EDTM
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts_kpp.def b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts_kpp.def
similarity index 100%
rename from DEF-files/HMS/PRODUCTION/hstackana_production_cuts_kpp.def
rename to DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts_kpp.def
diff --git a/DEF-files/HMS/PRODUCTION/CUTS/hstackana_rawdecode_cuts.def b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_rawdecode_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..3f273b89c8de97ebee250ba94c4f283d88105d76
--- /dev/null
+++ b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_rawdecode_cuts.def
@@ -0,0 +1,12 @@
+Block: RawDecode
+
+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_HMS_events HMS_event || COIN_ONLY_event || HMS_COIN_event || COIN_ALL_event
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_reconstruction_cuts.def b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_reconstruct_cuts.def
similarity index 100%
rename from DEF-files/HMS/PRODUCTION/hstackana_reconstruction_cuts.def
rename to DEF-files/HMS/PRODUCTION/CUTS/hstackana_reconstruct_cuts.def
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
deleted file mode 100644
index 12118cc2249a7c8cd8a49e216dd7f672517c4aac..0000000000000000000000000000000000000000
--- a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
+++ /dev/null
@@ -1,215 +0,0 @@
-# Report file for HMS stack
-
-Block: RawDecode
-
-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_HMS_events HMS_event || COIN_ONLY_event || HMS_COIN_event || COIN_ALL_event
-
-RawDecode_master 1
-
-Block: Decode
-
-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 HMS_event
-hcut_edtm_accepted T.hms.hEDTM_tdcTime != 0.0
-hcut_physics_accepted T.hms.hEDTM_tdcTime == 0.0
-ALL_HMS_NO_EDTM ALL_HMS_events && hcut_physics_accepted
-
-Decode_master ALL_HMS_NO_EDTM
-
-Block: CoarseTracking
-CoarseTracking_master ALL_HMS_events
-
-add cuts to stricter times and apply them to drift distances (HMS 6 GeV Drift Chambers)
-hcut_time_cut1 H.dc.1x1.time > 0 && H.dc.1x1.time < 250
-hcut_time_cut2 H.dc.1v2.time > 0 && H.dc.1v2.time < 250
-hcut_time_cut3 H.dc.1u1.time > 0 && H.dc.1u1.time < 250
-hcut_time_cut4 H.dc.1v1.time > 0 && H.dc.1v1.time < 250
-hcut_time_cut5 H.dc.1u2.time > 0 && H.dc.1u2.time < 250
-hcut_time_cut6 H.dc.1x2.time > 0 && H.dc.1x2.time < 250
-hcut_time_cut7 H.dc.2x1.time > 0 && H.dc.2x1.time < 250
-hcut_time_cut8 H.dc.2v2.time > 0 && H.dc.1v2.time < 250
-hcut_time_cut9 H.dc.2u1.time > 0 && H.dc.2u1.time < 250
-hcut_time_cut10 H.dc.2v1.time > 0 && H.dc.2v1.time < 250
-hcut_time_cut11 H.dc.2u2.time > 0 && H.dc.2u2.time < 250
-hcut_time_cut12 H.dc.2x2.time > 0 && H.dc.2x2.time < 250
-
-hmsDC1Planes_large (H.dc.1x1.nhit+H.dc.1v2.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1u2.nhit) >20
-hmsDC2Planes_large (H.dc.2x1.nhit+H.dc.2v2.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2u2.nhit) >20
-hmsDCany_large hmsDC1Planes_large || hmsDC2Planes_large
-
-hmsDC1_1hit_x1 H.dc.1x1.nhit == 1
-hmsDC1_1hit_v2 H.dc.1v2.nhit == 1
-hmsDC1_1hit_u1 H.dc.1u1.nhit == 1
-hmsDC1_1hit_v1 H.dc.1v1.nhit == 1
-hmsDC1_1hit_u2 H.dc.1u2.nhit == 1
-hmsDC1_1hit_x2 H.dc.1x2.nhit == 1
-
-hmsDC2_1hit_x1 H.dc.2x1.nhit == 1
-hmsDC2_1hit_v2 H.dc.2v2.nhit == 1
-hmsDC2_1hit_u1 H.dc.2u1.nhit == 1
-hmsDC2_1hit_v1 H.dc.2v1.nhit == 1
-hmsDC2_1hit_u2 H.dc.2u2.nhit == 1
-hmsDC2_1hit_x2 H.dc.2x2.nhit == 1
-
-h1hit1 H.dc.1x1.nhit >= 1
-h1hit2 H.dc.1v2.nhit >= 1
-h1hit3 H.dc.1u1.nhit >= 1
-h1hit4 H.dc.1v1.nhit >= 1
-h1hit5 H.dc.1u2.nhit >= 1
-h1hit6 H.dc.1x2.nhit >= 1
-
-h2hit1 H.dc.2x1.nhit >= 1
-h2hit2 H.dc.2v2.nhit >= 1
-h2hit3 H.dc.2u1.nhit >= 1
-h2hit4 H.dc.2v1.nhit >= 1
-h2hit5 H.dc.2u2.nhit >= 1
-h2hit6 H.dc.2x2.nhit >= 1
-
-hmsDC1Planes6hits (H.dc.1x1.nhit+H.dc.1v2.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1u2.nhit) ==6
-hmsDC2Planes6hits (H.dc.2x1.nhit+H.dc.2v2.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2u2.nhit )==6
-hmsDC1_5hits_x1 hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_6hits_x1 h1hit1&&hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_5hits_v2 hmsDC1_1hit_x1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_6hits_v2 h1hit2&&hmsDC1_1hit_x1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_5hits_u1 hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_6hits_u1 h1hit3&&hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_5hits_v1 hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_6hits_v1 h1hit4&&hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_x2&&hmsDC1_1hit_u2
-hmsDC1_5hits_x2 hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_u2
-hmsDC1_6hits_x2 h1hit6&&hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_u2
-hmsDC1_5hits_u2 hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2
-hmsDC1_6hits_u2 h1hit5&&hmsDC1_1hit_x1&&hmsDC1_1hit_v2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2
-
-hmsDC2_5hits_x1 hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_6hits_x1 h2hit1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_5hits_v2 hmsDC2_1hit_x1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_6hits_v2 h2hit2&&hmsDC2_1hit_x1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_5hits_u1 hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_6hits_u1 h2hit3&&hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_5hits_v1 hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_6hits_v1 h2hit4&&hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_x2&&hmsDC2_1hit_u2
-hmsDC2_5hits_x2 hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_u2
-hmsDC2_6hits_x2 h2hit6&&hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_u2
-hmsDC2_5hits_u2 hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2
-hmsDC2_6hits_u2 h2hit5&&hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2
-
-hms1HitsLt H.dc.Ch1.nhit <= H.dc.Ch1.maxhits && g.evtyp==1
-hms2HitsLt H.dc.Ch2.nhit <= H.dc.Ch2.maxhits && g.evtyp==1
-hmsHitsLt H.dc.Ch1.nhit <= H.dc.Ch1.maxhits && H.dc.Ch2.nhit <= H.dc.Ch2.maxhits && g.evtyp==1
-hmsDC1PlanesGT (h1hit1 + h1hit2 + h1hit3 + h1hit4 + h1hit5 + h1hit6 )>=5
-hmsDC2PlanesGT (h2hit1 + h2hit2 + h2hit3 + h2hit4 + h2hit5 + h2hit6 )>=5
-hmsPlanesGT hmsDC1PlanesGT && hmsDC2PlanesGT
-hmsHitsPlanes (H.dc.Ch1.nhit <= H.dc.Ch1.maxhits) && (H.dc.Ch2.nhit <= H.dc.Ch2.maxhits) && hmsPlanesGT
-hSpacePoints H.dc.Ch1.spacepoints >= 1 && H.dc.Ch2.spacepoints >=1
-hSpacePointsStub H.dc.stubtest==1 && H.dc.Ch1.spacepoints >=1 && H.dc.Ch2.spacepoints >=1
-hFoundTrack H.dc.ntrack>0
-hStubLT H.dc.stubtest==1
-f1HSpacePoints hms1HitsLt && hmsDC1PlanesGT && H.dc.Ch1.spacepoints==0 && g.evtyp==1
-f2HSpacePoints hms2HitsLt && hmsDC2PlanesGT && H.dc.Ch2.spacepoints==0 && g.evtyp==1
-hTest1 hmsHitsPlanes && (!hSpacePoints)
-hTest2 hSpacePoints && (!hStubLT)
-
-Block: CoarseReconstruct
-CoarseReconstruct_master ALL_HMS_NO_EDTM
-
-Block: Tracking
-Tracking_master ALL_HMS_NO_EDTM
-
-Block: Reconstruct
-Reconstruct_master ALL_HMS_NO_EDTM
-hcut_cer_pmt1_elec H.cer.npe[0]>.5
-hcut_cer_pmt2_elec H.cer.npe[0]>.5
-hcut_cer_elec H.cer.npeSum>.5
-hcut_cer_pi H.cer.npeSum<.5
-
-HMSScinGood H.hod.goodscinhit == 1
-HMSGoodBetanotrk H.hod.betanotrack > 0.8 && H.hod.betanotrack < 1.3
-
-
-HMSScinShould HMSScinGood && HMSGoodBetanotrk && !hmsDCany_large
-HMSScinShoulde HMSScinShould && H.cal.etotnorm > 0.6&& H.cal.etotnorm < 2.0&& H.cer.npeSum > 0.5
-HMSScinShouldh HMSScinGood && H.cal.etotnorm <0.6&& H.cal.etotnorm>0.0&& H.cer.npeSum < 0.5
-
-HMSScinDid HMSScinShould && H.dc.ntrack > 0
-HMSScinDide HMSScinShoulde && H.dc.ntrack > 0
-HMSScinDidh HMSScinShouldh && H.dc.ntrack > 0
-
-hcut_goodHDC1x1 H.dc.1x1.nhit > 0 && H.dc.1x1.nhit < 3
-hcut_goodHDC1v2 H.dc.1v2.nhit > 0 && H.dc.1v2.nhit < 3
-hcut_goodHDC1u1 H.dc.1u1.nhit > 0 && H.dc.1u1.nhit < 3
-hcut_goodHDC1v1 H.dc.1v1.nhit > 0 && H.dc.1v1.nhit < 3
-hcut_goodHDC1u2 H.dc.1u2.nhit > 0 && H.dc.1u2.nhit < 3
-hcut_goodHDC1x2 H.dc.1x2.nhit > 0 && H.dc.1x2.nhit < 3
-
-hcut_goodHDC2x1 H.dc.2x1.nhit > 0 && H.dc.2x1.nhit < 3
-hcut_goodHDC2v2 H.dc.2v2.nhit > 0 && H.dc.2v2.nhit < 3
-hcut_goodHDC2u1 H.dc.2u1.nhit > 0 && H.dc.2u1.nhit < 3
-hcut_goodHDC2v1 H.dc.2v1.nhit > 0 && H.dc.2v1.nhit < 3
-hcut_goodHDC2u2 H.dc.2u2.nhit > 0 && H.dc.2u2.nhit < 3
-hcut_goodHDC2x2 H.dc.2x2.nhit > 0 && H.dc.2x2.nhit < 3
-
-hcut_goodHDC1 hcut_goodHDC1x1 && hcut_goodHDC1v2 && hcut_goodHDC1u1 && hcut_goodHDC1v1 && hcut_goodHDC1u2 && hcut_goodHDC1x2
-hcut_goodHDC2 hcut_goodHDC2x1 && hcut_goodHDC2v2 && hcut_goodHDC2u1 && hcut_goodHDC2v1 && hcut_goodHDC2u2 && hcut_goodHDC2x2
-hcut_bothGood hcut_goodHDC1 && hcut_goodHDC2
-
-hcut_realhdc1x1 hcut_goodHDC1x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc1v2 hcut_goodHDC1v2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc1u1 hcut_goodHDC1u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc1v1 hcut_goodHDC1v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc1u2 hcut_goodHDC1u2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc1x2 hcut_goodHDC1x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc2x1 hcut_goodHDC2x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc2v2 hcut_goodHDC2v2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc2u1 hcut_goodHDC2u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc2v1 hcut_goodHDC2v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc2u2 hcut_goodHDC2u2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-hcut_realhdc2x2 hcut_goodHDC2x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-
-hcut_FoundTrack H.dc.ntrack > 0
-hcut_Found1Track H.dc.ntrack == 1
-hcut_Found2Track H.dc.ntrack == 2
-hcut_Found3Track H.dc.ntrack == 3
-hcut_Found4Track H.dc.ntrack == 4
-
-hcut_CleanTrack H.gtr.index > -1
-hcut_Clean1Track H.gtr.index == 0
-hcut_Clean2Track H.gtr.index == 1
-hcut_Clean3Track H.gtr.index == 2
-hcut_Clean4Track H.gtr.index == 3
-
-hcut_anys1x H.hod.1x.nhits > 0
-hcut_anys1y H.hod.1y.nhits > 0
-hcut_anys2x H.hod.2x.nhits > 0
-hcut_anys2y H.hod.2y.nhits > 0
-
-hcut_goods1x H.hod.1x.nhits > 0 && H.hod.1x.nhits < 3
-hcut_goods1y H.hod.1y.nhits > 0 && H.hod.1y.nhits < 3
-hcut_goods1 hcut_goods1x && hcut_goods1y
-hcut_goods2x H.hod.2x.nhits > 0 && H.hod.2x.nhits < 3
-hcut_goods2y H.hod.2y.nhits > 0 && H.hod.2y.nhits < 3
-hcut_goods2 hcut_goods2x && hcut_goods2y
-hcut_goods1s2 hcut_goods1 && hcut_goods2
-
-HMS_hcer_track_matched_region_1 H.cer.numTracksMatched[0]>0
-HMS_hcer_track_fired_region_1 H.cer.numTracksFired[0]>0
-HMS_hcer_track_matched_region_2 H.cer.numTracksMatched[1]>0
-HMS_hcer_track_fired_region_2 H.cer.numTracksFired[1]>0
-HMS_hcer_track_matched_tot H.cer.totNumTracksMatched>0
-HMS_hcer_track_fired_tot H.cer.totNumTracksFired>0
-
-
-Block: Physics
-Physics_master ALL_HMS_NO_EDTM
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_coarsetracking_cuts.def b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_coarsetracking_cuts.def
similarity index 100%
rename from DEF-files/SHMS/PRODUCTION/pstackana_coarsetracking_cuts.def
rename to DEF-files/SHMS/PRODUCTION/CUTS/pstackana_coarsetracking_cuts.def
diff --git a/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..9544df8b3418f0201afe16d4f985a51b690fa3c5
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def
@@ -0,0 +1,16 @@
+Block: Decode
+
+pcut_TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+pcut_TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+pcut_TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig pcut_TRIG1 || pcut_TRIG2 || pcut_TRIG3
+
+shms_trigs SHMS_event
+pcut_edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+pcut_physics_accepted T.shms.pEDTM_tdcTime == 0.0
+
+pcut_good_S1_time T.shms.p1T_tdcTime > 241 && T.shms.p1T_tdcTime < 243
+pcut_good_S2X_time T.shms.p2X_tdcTime > 180 && T.shms.p2X_tdcTime < 220
+pcut_good_S1_S2X_time pcut_good_S1_time && pcut_good_S2X_time
+
+ALL_SHMS_NO_EDTM ALL_events && pcut_physics_accepted
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_production_cuts.def b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_production_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..7f4b7d3525333cfc3a39ff72a9f18ede92907f47
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_production_cuts.def
@@ -0,0 +1,26 @@
+# Report file for SHMS stack
+
+Block: RawDecode
+#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_rawdecode_cuts.def"
+RawDecode_master 1
+
+Block: Decode
+#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def"
+Decode_master ALL_SHMS_NO_EDTM
+
+Block: CoarseTracking
+#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_coarsetracking_cuts.def"
+CoarseTracking_master ALL_SHMS_NO_EDTM
+
+Block: CoarseReconstruct
+CoarseReconstruct_master ALL_SHMS_NO_EDTM
+
+Block: Tracking
+Tracking_master ALL_SHMS_NO_EDTM
+
+Block: Reconstruct
+#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def"
+Reconstruct_master ALL_SHMS_NO_EDTM
+
+Block: Physics
+Physics_master ALL_SHMS_NO_EDTM
diff --git a/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_rawdecode_cuts.def b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_rawdecode_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..ff3d964a509a1bffca15c991106702f779f75598
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_rawdecode_cuts.def
@@ -0,0 +1,12 @@
+Block: RawDecode
+
+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
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_reconstruction_cuts.def b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def
similarity index 100%
rename from DEF-files/SHMS/PRODUCTION/pstackana_reconstruction_cuts.def
rename to DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
deleted file mode 100644
index fd5a8528f7a931a21c4bd8a8bf659641069fbfc8..0000000000000000000000000000000000000000
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
+++ /dev/null
@@ -1,285 +0,0 @@
-# Report file for SHMS stack
-
-Block: RawDecode
-
-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
-
-RawDecode_master 1
-
-Block: Decode
-
-pcut_TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
-pcut_TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
-pcut_TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
-SHMS_Pretrig pcut_TRIG1 || pcut_TRIG2 || pcut_TRIG3
-
-shms_trigs SHMS_event
-pcut_edtm_accepted T.shms.pEDTM_tdcTime != 0.0
-pcut_physics_accepted T.shms.pEDTM_tdcTime == 0.0
-
-pcut_good_S1_time T.shms.p1T_tdcTime > 241 && T.shms.p1T_tdcTime < 243
-pcut_good_S2X_time T.shms.p2X_tdcTime > 180 && T.shms.p2X_tdcTime < 220
-pcut_good_S1_S2X_time pcut_good_S1_time && pcut_good_S2X_time
-
-ALL_SHMS_NO_EDTM ALL_events && pcut_physics_accepted
-
-
-Decode_master ALL_SHMS_NO_EDTM
-
-Block: CoarseTracking
-CoarseTracking_master ALL_SHMS_NO_EDTM
-
-# Add cuts to stricter times and apply them to drift distances
-pcut_time_cut1 P.dc.1u1.time > 0 && P.dc.1u1.time < 250
-pcut_time_cut2 P.dc.1u2.time > 0 && P.dc.1u2.time < 250
-pcut_time_cut3 P.dc.1x1.time > 0 && P.dc.1x1.time < 250
-pcut_time_cut4 P.dc.1x2.time > 0 && P.dc.1x2.time < 250
-pcut_time_cut5 P.dc.1v1.time > 0 && P.dc.1v1.time < 250
-pcut_time_cut6 P.dc.1v2.time > 0 && P.dc.1v2.time < 250
-pcut_time_cut7 P.dc.2v2.time > 0 && P.dc.2v2.time < 250
-pcut_time_cut8 P.dc.2v1.time > 0 && P.dc.2v1.time < 250
-pcut_time_cut9 P.dc.2x2.time > 0 && P.dc.2x2.time < 250
-pcut_time_cut10 P.dc.2x1.time > 0 && P.dc.2x1.time < 250
-pcut_time_cut11 P.dc.2u2.time > 0 && P.dc.2u2.time < 250
-pcut_time_cut12 P.dc.2u1.time > 0 && P.dc.2u1.time < 250
-
-shmsDC1Planes_large (P.dc.1x1.nhit + P.dc.1u2.nhit + P.dc.1u1.nhit + P.dc.1v1.nhit + P.dc.1x2.nhit + P.dc.1v2.nhit) > 20
-shmsDC2Planes_large (P.dc.2x1.nhit + P.dc.2u2.nhit + P.dc.2u1.nhit + P.dc.2v1.nhit + P.dc.2x2.nhit + P.dc.2v2.nhit) > 20
-shmsDCany_large shmsDC1Planes_large || shmsDC2Planes_large
-
-shms_ch1_gt0 P.dc.Ch1.nhit > 0
-shms_ch2_gt0 P.dc.Ch2.nhit > 0
-shms_ch_gt0 P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit > 0
-shms_ch_gt4 P.dc.Ch2.nhit > 3 && P.dc.Ch1.nhit > 3
-shms_ch2_gt0_noch1 P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit == 0
-shms_ch1_gt0_noch2 P.dc.Ch1.nhit > 0 && P.dc.Ch2.nhit == 0
-shms_noch1_noch2 P.dc.Ch1.nhit == 0 && P.dc.Ch2.nhit == 0
-shms_ch_gt0_track shms_ch_gt0 && P.dc.ntrack > 0
-shms_ch_gt4_track shms_ch_gt4 && P.dc.ntrack > 0
-
-shms_ch1_gt0_gtime P.dc.Ch1.nhit > 0 && pcut_good_S1_S2X_time
-shms_ch2_gt0_gtime P.dc.Ch2.nhit > 0 && pcut_good_S1_S2X_time
-shms_ch_gt0_gtime P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit > 0 && pcut_good_S1_S2X_time
-shms_ch_gt4_gtime P.dc.Ch2.nhit > 3 && P.dc.Ch1.nhit > 3 && pcut_good_S1_S2X_time
-shms_ch2_gt0_noch1_gtime P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit == 0 && pcut_good_S1_S2X_time
-shms_ch1_gt0_noch2_gtime P.dc.Ch1.nhit > 0 && P.dc.Ch2.nhit == 0 && pcut_good_S1_S2X_time
-shms_noch1_noch2_gtime P.dc.Ch1.nhit == 0 && P.dc.Ch2.nhit == 0 && pcut_good_S1_S2X_time
-shms_ch_gt0_track_gtime shms_ch_gt0 && P.dc.ntrack > 0 && pcut_good_S1_S2X_time
-shms_ch_gt4_track_gtime shms_ch_gt4 && P.dc.ntrack > 0 && pcut_good_S1_S2X_time
-
-shmsDC1_1hit_x1 P.dc.1x1.nhit == 1
-shmsDC1_1hit_u1 P.dc.1u1.nhit == 1
-shmsDC1_1hit_u2 P.dc.1u2.nhit == 1
-shmsDC1_1hit_v1 P.dc.1v1.nhit == 1
-shmsDC1_1hit_v2 P.dc.1v2.nhit == 1
-shmsDC1_1hit_x2 P.dc.1x2.nhit == 1
-
-shmsDC2_1hit_x1 P.dc.2x1.nhit == 1
-shmsDC2_1hit_u1 P.dc.2u1.nhit == 1
-shmsDC2_1hit_u2 P.dc.2u2.nhit == 1
-shmsDC2_1hit_v1 P.dc.2v1.nhit == 1
-shmsDC2_1hit_v2 P.dc.2v2.nhit == 1
-shmsDC2_1hit_x2 P.dc.2x2.nhit == 1
-
-p1hit1 P.dc.1x1.nhit >= 1
-p1hit2 P.dc.1u1.nhit >= 1
-p1hit3 P.dc.1u2.nhit >= 1
-p1hit4 P.dc.1v1.nhit >= 1
-p1hit5 P.dc.1v2.nhit >= 1
-p1hit6 P.dc.1x2.nhit >= 1
-
-p2hit1 P.dc.2x1.nhit >= 1
-p2hit2 P.dc.2u1.nhit >= 1
-p2hit3 P.dc.2u2.nhit >= 1
-p2hit4 P.dc.2v1.nhit >= 1
-p2hit5 P.dc.2v2.nhit >= 1
-p2hit6 P.dc.2x2.nhit >= 1
-
-shmsDC1Planes6hits shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC2Planes6hits shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-
-shmsDC1_5hits_x1 shmsDC1_1hit_u1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_6hits_x1 p1hit1 && shmsDC1_1hit_u1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_5hits_u1 shmsDC1_1hit_x1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_6hits_u1 p1hit2 && shmsDC1_1hit_x1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_5hits_u2 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_6hits_u2 p1hit3 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_5hits_v1 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-shmsDC1_6hits_v1 p1hit4 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-shmsDC1_5hits_v2 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v1
-shmsDC1_6hits_v2 p1hit5 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v1
-shmsDC1_5hits_x2 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_v1 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-shmsDC1_6hits_x2 p1hit6 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_v1 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-
-shmsDC2_5hits_x1 shmsDC2_1hit_u1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_6hits_x1 p2hit1 && shmsDC2_1hit_u1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_5hits_u1 shmsDC2_1hit_x1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_6hits_u1 p2hit2 && shmsDC2_1hit_x1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_5hits_u2 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_6hits_u2 p2hit3 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_5hits_v1 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-shmsDC2_6hits_v1 p2hit4 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-shmsDC2_5hits_v2 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v1
-shmsDC2_6hits_v2 p2hit5 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v1
-shmsDC2_5hits_x2 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_v1 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-shmsDC2_6hits_x2 p2hit6 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_v1 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-
-shms1HitsLt P.dc.Ch1.nhit <= P.dc.Ch1.maxhits && g.evtyp == 1
-shms2HitsLt P.dc.Ch2.nhit <= P.dc.Ch2.maxhits && g.evtyp == 1
-shmsHitsLt P.dc.Ch1.nhit <= P.dc.Ch1.maxhits && P.dc.Ch2.nhit <= P.dc.Ch2.maxhits && g.evtyp == 1
-
-shmsDC1PlanesGT (p1hit1 + p1hit2 + p1hit3 + p1hit4 + p1hit5 + p1hit6 ) >= 5
-shmsDC2PlanesGT (p2hit1 + p2hit2 + p2hit3 + p2hit4 + p2hit5 + p2hit6 ) >= 5
-shmsPlanesGT shmsDC1PlanesGT && shmsDC2PlanesGT
-shmsHitsPlanes (P.dc.Ch1.nhit <= 6) && (P.dc.Ch2.nhit <= 6) && shmsPlanesGT
-
-pSpacePoints P.dc.Ch1.spacepoints >= 1 && P.dc.Ch2.spacepoints >= 1
-pSpacePointsStub P.dc.stubtest == 1 && P.dc.Ch1.spacepoints >= 1 && P.dc.Ch2.spacepoints >= 1
-pcut_FoundTrack P.dc.ntrack > 0
-pStubLT P.dc.stubtest == 1
-f1PSpacePoints shms1HitsLt && shmsDC1PlanesGT && P.dc.Ch1.spacepoints == 0 && g.evtyp == 1
-f2PSpacePoints shms2HitsLt && shmsDC2PlanesGT && P.dc.Ch2.spacepoints == 0 && g.evtyp == 1
-
-pTest1 shmsHitsPlanes && (!pSpacePoints)
-pTest2 pSpacePoints && (!pStubLT)
-
-Block: CoarseReconstruct
-CoarseReconstruct_master ALL_SHMS_NO_EDTM
-
-Block: Tracking
-Tracking_master ALL_SHMS_NO_EDTM
-
-Block: Reconstruct
-Reconstruct_master ALL_SHMS_NO_EDTM
-
-pcut_cer_ng_elec P.ngcer.npeSum > 0.5
-pcut_cer_ng_pi P.ngcer.npeSum <= 0.5
-pcut_cer_hg_elec P.hgcer.npeSum > 0.5
-pcut_cer_hg_pi P.hgcer.npeSum <= 0.5
-pcut_cer_pi_both pcut_cer_ng_pi && pcut_cer_hg_pi
-pcut_cer_elec_both pcut_cer_ng_elec && pcut_cer_hg_elec
-pcut_cal_elec P.cal.etracknorm > 0.6 && P.cal.etracknorm < 1.6
-pcut_cal_pi P.cal.etracknorm <= 0.6 && P.cal.etracknorm > 0.
-pcut_elec_all pcut_cer_ng_elec && pcut_cer_hg_elec && pcut_cal_elec
-pcut_pi_all pcut_cer_ng_pi && pcut_cer_hg_pi && pcut_cal_pi
-
-shmsScinGood P.hod.goodscinhit == 1
-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. && P.hgcer.npeSum < 0.5
-shmsScinDid shmsScinShould && P.dc.ntrack > 0
-shmsScinDide shmsScinShoulde && P.dc.ntrack > 0
-shmsScinDidh shmsScinShouldh && P.dc.ntrack > 0
-
-pcut_goodHDC1x1 P.dc.1x1.nhit > 0 && P.dc.1x1.nhit < 3
-pcut_goodHDC1u2 P.dc.1u2.nhit > 0 && P.dc.1u2.nhit < 3
-pcut_goodHDC1u1 P.dc.1u1.nhit > 0 && P.dc.1u1.nhit < 3
-pcut_goodHDC1v1 P.dc.1v1.nhit > 0 && P.dc.1v1.nhit < 3
-pcut_goodHDC1v2 P.dc.1v2.nhit > 0 && P.dc.1v2.nhit < 3
-pcut_goodHDC1x2 P.dc.1x2.nhit > 0 && P.dc.1x2.nhit < 3
-
-pcut_goodHDC2x1 P.dc.2x1.nhit > 0 && P.dc.2x1.nhit < 3
-pcut_goodHDC2u2 P.dc.2u2.nhit > 0 && P.dc.2u2.nhit < 3
-pcut_goodHDC2u1 P.dc.2u1.nhit > 0 && P.dc.2u1.nhit < 3
-pcut_goodHDC2v1 P.dc.2v1.nhit > 0 && P.dc.2v1.nhit < 3
-pcut_goodHDC2v2 P.dc.2v2.nhit > 0 && P.dc.2v2.nhit < 3
-pcut_goodHDC2x2 P.dc.2x2.nhit > 0 && P.dc.2x2.nhit < 3
-
-pcut_goodHDC1 pcut_goodHDC1x1 && pcut_goodHDC1u2 && pcut_goodHDC1u1 && pcut_goodHDC1v1 && pcut_goodHDC1v2 && pcut_goodHDC1x2
-pcut_goodHDC2 pcut_goodHDC2x1 && pcut_goodHDC2u2 && pcut_goodHDC2u1 && pcut_goodHDC2v1 && pcut_goodHDC2v2 && pcut_goodHDC2x2
-pcut_bothGood pcut_goodHDC1 && pcut_goodHDC2
-
-pcut_realhdc1x1 pcut_goodHDC1x1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc1u2 pcut_goodHDC1u2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc1u1 pcut_goodHDC1u1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc1v1 pcut_goodHDC1v1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc1v2 pcut_goodHDC1v2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc1x2 pcut_goodHDC1x2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-
-pcut_realhdc2x1 pcut_goodHDC2x1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc2u2 pcut_goodHDC2u2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc2u1 pcut_goodHDC2u1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc2v1 pcut_goodHDC2v1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc2v2 pcut_goodHDC2v2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-pcut_realhdc2x2 pcut_goodHDC2x2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-
-pcut_Found1Track P.dc.ntrack == 1
-pcut_Found2Track P.dc.ntrack == 2
-pcut_Found3Track P.dc.ntrack == 3
-pcut_Found4Track P.dc.ntrack == 4
-
-pcut_CleanTrack P.gtr.index > -1
-pcut_Clean1Track P.gtr.index == 0
-pcut_Clean2Track P.gtr.index == 1
-pcut_Clean3Track P.gtr.index == 2
-pcut_Clean4Track P.gtr.index == 3
-
-pcut_CleanTrack_cer_elec (P.gtr.index > -1) && pcut_cer_elec_both
-pcut_p1hit1_cer_elec p1hit1 && pcut_cer_elec_both
-pcut_CleanTrack_cal_elec (P.gtr.index > -1) && pcut_cal_elec
-pcut_p1hit1_cal_elec p1hit1 && pcut_cal_elec
-
-pcut_anys1x P.hod.1x.nhits > 0
-pcut_anys1y P.hod.1y.nhits > 0
-pcut_anys2x P.hod.2x.nhits > 0
-pcut_anys2y P.hod.2y.nhits > 0
-
-pcut_goods1x P.hod.1x.nhits > 0 && P.hod.1x.nhits < 3
-pcut_goods1y P.hod.1y.nhits > 0 && P.hod.1y.nhits < 3
-pcut_goods1 pcut_goods1x && pcut_goods1y
-pcut_goods2x P.hod.2x.nhits > 0 && P.hod.2x.nhits < 3
-pcut_goods2y P.hod.2y.nhits > 0 && P.hod.2y.nhits < 3
-pcut_goods2 pcut_goods2x && pcut_goods2y
-pcut_goods1s2 pcut_goods1 && pcut_goods2
-
-SHMS_hgcer_track_matched_region_1 P.hgcer.numTracksMatched[0]>0
-SHMS_hgcer_track_fired_region_1 P.hgcer.numTracksFired[0]>0
-SHMS_hgcer_track_matched_region_2 P.hgcer.numTracksMatched[1]>0
-SHMS_hgcer_track_fired_region_2 P.hgcer.numTracksFired[1]>0
-SHMS_hgcer_track_matched_region_3 P.hgcer.numTracksMatched[2]>0
-SHMS_hgcer_track_fired_region_3 P.hgcer.numTracksFired[2]>0
-SHMS_hgcer_track_matched_region_4 P.hgcer.numTracksMatched[3]>0
-SHMS_hgcer_track_fired_region_4 P.hgcer.numTracksFired[3]>0
-SHMS_hgcer_track_matched_tot P.hgcer.totNumTracksMatched>0
-SHMS_hgcer_track_fired_tot P.hgcer.totNumTracksFired>0
-
-SHMS_ngcer_track_matched_region_1 P.ngcer.numTracksMatched[0]>0
-SHMS_ngcer_track_fired_region_1 P.ngcer.numTracksFired[0]>0
-SHMS_ngcer_track_matched_region_2 P.ngcer.numTracksMatched[1]>0
-SHMS_ngcer_track_fired_region_2 P.ngcer.numTracksFired[1]>0
-SHMS_ngcer_track_matched_region_3 P.ngcer.numTracksMatched[2]>0
-SHMS_ngcer_track_fired_region_3 P.ngcer.numTracksFired[2]>0
-SHMS_ngcer_track_matched_region_4 P.ngcer.numTracksMatched[3]>0
-SHMS_ngcer_track_fired_region_4 P.ngcer.numTracksFired[3]>0
-SHMS_ngcer_track_matched_tot P.ngcer.totNumTracksMatched>0
-SHMS_ngcer_track_fired_tot P.ngcer.totNumTracksFired>0
-
-SHMS_aero_track_matched_region_1 P.aero.numTracksMatched[0]>0
-SHMS_aero_track_fired_region_1 P.aero.numTracksFired[0]>0
-SHMS_aero_track_matched_region_2 P.aero.numTracksMatched[1]>0
-SHMS_aero_track_fired_region_2 P.aero.numTracksFired[1]>0
-SHMS_aero_track_matched_region_3 P.aero.numTracksMatched[2]>0
-SHMS_aero_track_fired_region_3 P.aero.numTracksFired[2]>0
-SHMS_aero_track_matched_region_4 P.aero.numTracksMatched[3]>0
-SHMS_aero_track_fired_region_4 P.aero.numTracksFired[3]>0
-SHMS_aero_track_matched_region_5 P.aero.numTracksMatched[4]>0
-SHMS_aero_track_fired_region_5 P.aero.numTracksFired[4]>0
-SHMS_aero_track_matched_region_6 P.aero.numTracksMatched[5]>0
-SHMS_aero_track_fired_region_6 P.aero.numTracksFired[5]>0
-SHMS_aero_track_matched_region_7 P.aero.numTracksMatched[6]>0
-SHMS_aero_track_fired_region_7 P.aero.numTracksFired[6]>0
-SHMS_aero_track_matched_tot P.aero.totNumTracksMatched>0
-SHMS_aero_track_fired_tot P.aero.totNumTracksFired>0
-
-Block: Physics
-Physics_master ALL_SHMS_NO_EDTM
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor.root b/SCRIPTS/COIN/MONITOR/coin_monitor.root
deleted file mode 100644
index 6c01665d532674021dffaf961188dec00bc6b74a..0000000000000000000000000000000000000000
Binary files a/SCRIPTS/COIN/MONITOR/coin_monitor.root and /dev/null differ
diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
index b39dc2af7e2f930abaccf9e543fb950f6bef5de4..b9df1f2ac9d4930efcf476864ade11040a04bc73 100644
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
+++ b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
@@ -240,7 +240,7 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Define DEF-file+
analyzer->SetOdefFile("DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt_cuts.def"); // optional
+ analyzer->SetCutFile("DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def"); // optional
// File to record accounting information for cuts
analyzer->SetSummaryFile(Form("REPORT_OUTPUT/COIN/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C
index 387d36e1ab5bd1fd53608897908c5c55e06008bc..df611549a838b0e75c924acc74c080ce5efa4a01 100644
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C
+++ b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C
@@ -240,7 +240,7 @@ void replay_production_coin_pElec_hProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Define DEF-file+
analyzer->SetOdefFile("DEF-files/COIN/PRODUCTION/coin_production_pElec_hProt.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/COIN/PRODUCTION/coin_production_pElec_hProt_cuts.def"); // optional
+ analyzer->SetCutFile("DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def"); // optional
// File to record accounting information for cuts
analyzer->SetSummaryFile(Form("REPORT_OUTPUT/COIN/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
index 5c3650432c23b4ff29a1803a3729e1cee5a8b25c..5b8d66477d91b04ccd873b23d79f1e507f2fd3b6 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
@@ -148,7 +148,7 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define output DEF-file
analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production_all.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def"); // optional
+ analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
// File to record cuts accounting information for cuts
analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
index 7f0184ca3e43d6ef046fa224c0af62a5fe1132ba..b8d28517b3317e8e5cfe7e79dc51a69ee7dc8f05 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
@@ -147,7 +147,7 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define output DEF-file
analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def"); // optional
+ analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
// File to record cuts accounting information for cuts
analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
index 0c9f8a11b45250b95b7b5998f87e9e8dd1e4c51f..a2c3664b004fc3d84b6f5211262fbc53650c31b2 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
@@ -157,7 +157,7 @@ void replay_production_hms_coin(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define output DEF-file
analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def"); // optional
+ analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
// File to record cuts accounting information for cuts
analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C
index cdca982292ffb8637673d32c21ab04aeecb217ee..e32b6a7270846461940e232d43823bcb8d0aac94 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C
@@ -139,7 +139,7 @@ void replay_production_hms_kpp(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define output DEF-file
analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production_kpp.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/hstackana_production_cuts_kpp.def"); // optional
+ analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts_kpp.def"); // optional
// File to record cuts accounting information for cuts
analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
index 58ac2b60d9e06fe2fc16ac122eb80592b4ff2517..b3c0e7b768d8e0616ccfc5c8638a7192f209fefc 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
@@ -149,7 +149,7 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define DEF-file
analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production_all.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def"); // optional
+ 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_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
index d6f32264a78ed2c435d4fda34fed7f7afa8f98fa..a0b3be0f1fee4496be159296d696181bc2bc481b 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
@@ -152,7 +152,7 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define DEF-file
analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def"); // optional
+ 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_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
index 18290aaf25e86ef8dca857085907b0d045ddd255..774bebca8d55f6843ae9ca977f7d51b3affd4bf3 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
@@ -161,7 +161,7 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define DEF-file
analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def"); // optional
+ 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_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C
index 5362996738de395846553ad18b9bca135bce6cd5..c453b937c0582b884720cf1a1cb8d04a471544c0 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C
@@ -148,7 +148,7 @@ void replay_production_shms_kpp (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define DEF-file
analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def"); // optional
+ 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_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.