diff --git a/DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def b/DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def
index b05b19072052e3412172f6adfd6891d9e6d9cec4..0475a6e0f1aea0fa69bef57bcea48c9454bd43ad 100644
--- a/DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def
+++ b/DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def
@@ -1,9 +1,9 @@
####################
# TARGET VARIABLES
####################
-TH2F hgtr_xtar_vs_ytar 'HMS Golden Track X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' H.gtr.y H.gtr.x 40 -20 20 40 -20 20 hCleanTrack
-TH2F hgtr_xptar_vs_yptar 'HMS Golden Track X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' H.gtr.ph H.gtr.th 100 -.1 .1 100 -.1 .1 hCleanTrack
-TH2F hgtr_xtar_vs_yptar 'HMS Golden Track X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm' H.gtr.ph H.gtr.x 100 -.1 .1 40 -20 20 hCleanTrack
-TH2F hgtr_xtar_vs_xptar 'HMS Golden Track X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' H.gtr.th H.gtr.x 100 -.1 .1 40 -20 20 hCleanTrack
-TH2F hgtr_ytar_vs_yptar 'HMS Golden Track Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm' H.gtr.ph H.gtr.y 100 -.1 .1 40 -20 20 hCleanTrack
-TH2F hgtr_ytar_vs_xptar 'HMS Golden Track Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' H.gtr.th H.gtr.y 100 -.1 .1 40 -20 20 hCleanTrack
+TH2F hgtr_xtar_vs_ytar 'HMS Golden Track X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' H.gtr.y H.gtr.x 40 -20 20 40 -20 20 hcut_CleanTrack
+TH2F hgtr_xptar_vs_yptar 'HMS Golden Track X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' H.gtr.ph H.gtr.th 100 -.1 .1 100 -.1 .1 hcut_CleanTrack
+TH2F hgtr_xtar_vs_yptar 'HMS Golden Track X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm' H.gtr.ph H.gtr.x 100 -.1 .1 40 -20 20 hcut_CleanTrack
+TH2F hgtr_xtar_vs_xptar 'HMS Golden Track X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' H.gtr.th H.gtr.x 100 -.1 .1 40 -20 20 hcut_CleanTrack
+TH2F hgtr_ytar_vs_yptar 'HMS Golden Track Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm' H.gtr.ph H.gtr.y 100 -.1 .1 40 -20 20 hcut_CleanTrack
+TH2F hgtr_ytar_vs_xptar 'HMS Golden Track Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' H.gtr.th H.gtr.y 100 -.1 .1 40 -20 20 hcut_CleanTrack
diff --git a/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def b/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
index 54ff0e17b77effdd5bf89766eff244d8ec800a19..5b2cf01417ede6e9faed1793af407aedfdcc6694 100644
--- a/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
+++ b/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
@@ -18,15 +18,15 @@ TH2F hcal_npe_etracknorm 'HMS Cer Npe vs. Cal E/p; Normalized Track Energy Depos
#-------------------------------
TH2F hcer_vs_hpreShwr 'HMS Cer NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; Cer NPE Sum / 0.5' H.cal.1pr.eplane H.cer.npeSum 400 0 4 80 0 40 H.cal.1pr.eplane>0.0&&H.cer.npeSum>0.0
-TH2F hcer_vs_hpreShwr_elec 'HMS Electron Cer NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; Cer NPE Sum / 0.5' H.cal.1pr.eplane H.cer.npeSum 400 0 4 80 0 40 hCleanTrack&&cer_elec
-TH2F hcer_vs_hpreShwr_pi 'HMS Pion Cer NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; Cer NPE Sum / 0.5' H.cal.1pr.eplane H.cer.npeSum 400 0 4 80 0 40 hCleanTrack&&cer_pi
+TH2F hcer_vs_hpreShwr_elec 'HMS Electron Cer NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; Cer NPE Sum / 0.5' H.cal.1pr.eplane H.cer.npeSum 400 0 4 80 0 40 hcut_CleanTrack&&hcut_cer_elec
+TH2F hcer_vs_hpreShwr_pi 'HMS Pion Cer NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; Cer NPE Sum / 0.5' H.cal.1pr.eplane H.cer.npeSum 400 0 4 80 0 40 hcut_CleanTrack&&hcut_cer_pi
TH2F hcal_hshwr_vs_hpreShwr 'HMS Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' H.cal.1pr.eplane (H.cal.2ta.eplane+H.cal.3ta.eplane+H.cal.4ta.eplane) 400 0 4 1200 0 12 H.cal.1pr.eplane>0.0&&(H.cal.2ta.eplane+H.cal.3ta.eplane+H.cal.4ta.eplane)>0.0
-TH2F hcal_hshwr_vs_hpreShwr_elec 'HMS Electron Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' H.cal.1pr.eplane (H.cal.2ta.eplane+H.cal.3ta.eplane+H.cal.4ta.eplane) 400 0 4 1200 0 12 hCleanTrack&&cer_elec
-TH2F hcal_hshwr_vs_hpreShwr_pi 'HMS Pion Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' H.cal.1pr.eplane (H.cal.2ta.eplane+H.cal.3ta.eplane+H.cal.4ta.eplane) 400 0 4 1200 0 12 hCleanTrack&&cer_pi
+TH2F hcal_hshwr_vs_hpreShwr_elec 'HMS Electron Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' H.cal.1pr.eplane (H.cal.2ta.eplane+H.cal.3ta.eplane+H.cal.4ta.eplane) 400 0 4 1200 0 12 hcut_CleanTrack&&hcut_cer_elec
+TH2F hcal_hshwr_vs_hpreShwr_pi 'HMS Pion Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' H.cal.1pr.eplane (H.cal.2ta.eplane+H.cal.3ta.eplane+H.cal.4ta.eplane) 400 0 4 1200 0 12 hcut_CleanTrack&&hcut_cer_pi
-TH2F hcal_delta_etracknorm 'HMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' H.cal.etracknorm H.gtr.dp 60 0. 1.5 240 -25. 35. hCleanTrack
-TH2F hcal_delta_etracknorm_elec 'HMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' H.cal.etracknorm H.gtr.dp 60 0. 1.5 240 -25. 35. hCleanTrack&&cer_elec
-TH2F hcal_delta_etracknorm_pi 'HMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' H.cal.etracknorm H.gtr.dp 60 0. 1.5 240 -25. 35. hCleanTrack&&cer_pi
+TH2F hcal_delta_etracknorm 'HMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' H.cal.etracknorm H.gtr.dp 60 0. 1.5 240 -25. 35. hcut_CleanTrack
+TH2F hcal_delta_etracknorm_elec 'HMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' H.cal.etracknorm H.gtr.dp 60 0. 1.5 240 -25. 35. hcut_CleanTrack&&hcut_cer_elec
+TH2F hcal_delta_etracknorm_pi 'HMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' H.cal.etracknorm H.gtr.dp 60 0. 1.5 240 -25. 35. hcut_CleanTrack&&hcut_cer_pi
#---------------------------
# CLUSTERING PLOTS
@@ -46,24 +46,24 @@ TH1F hcal_ytrack1 'HMS Cal Track y pos with no matching clust; Track y (cm);
TH1F hcal_ytrack2 'HMS Cal Track y pos with no matching clust number of cluster=1; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.cal.nclust==0&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
TH2F hcal_xytrack 'HMS Cal Track X vs Track Y; Track Y / 1 cm; Track X / 1 cm' H.cal.ytrack H.cal.xtrack 200 -100 100 200 -100 100 H.dc.ntrack>0
TH2F hcal_xyclusttrack 'HMS Cal Cluster X vs Cluster Y; Cluster Y / 1 cm; Cluster X / 1 cm' H.cal.yclusttrack H.cal.xclusttrack 200 -100 100 200 -100 100 H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH2F hcal_xtrack_vs_etrack 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hCleanTrack
-TH2F hcal_ytrack_vs_etrack 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hCleanTrack
+TH2F hcal_xtrack_vs_etrack 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack
+TH2F hcal_ytrack_vs_etrack 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack
-TH2F hcal_xtrack_vs_etrack_elec 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hCleanTrack&&cer_elec
-TH2F hcal_ytrack_vs_etrack_elec 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hCleanTrack&&cer_elec
-TH2F hcal_xtrack_vs_etrack_pi 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hCleanTrack&&cer_pi
-TH2F hcal_ytrack_vs_etrack_pi 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hCleanTrack&&cer_pi
+TH2F hcal_xtrack_vs_etrack_elec 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_elec
+TH2F hcal_ytrack_vs_etrack_elec 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_elec
+TH2F hcal_xtrack_vs_etrack_pi 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_pi
+TH2F hcal_ytrack_vs_etrack_pi 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_pi
#**********************
# HMS Drift Chambers *
#**********************
-TH1F hdc_trk_beta_elec 'HMS DC ElectronTrack Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hCleanTrack&&cer_elec
-TH1F hdc_trk_beta_pi 'HMS DC Pion Track Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hCleanTrack&&cer_pi
+TH1F hdc_trk_beta_elec 'HMS DC ElectronTrack Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hcut_CleanTrack&&hcut_cer_elec
+TH1F hdc_trk_beta_pi 'HMS DC Pion Track Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hcut_CleanTrack&&hcut_cer_pi
-TH1F hdc_trk_mom_elec 'HMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hCleanTrack&&cer_elec
-TH1F hdc_trk_mom_pi 'HMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hCleanTrack&&cer_pi
+TH1F hdc_trk_mom_elec 'HMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hcut_CleanTrack&&hcut_cer_elec
+TH1F hdc_trk_mom_pi 'HMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hcut_CleanTrack&&hcut_cer_pi
#----------------------------------------------------------------
# HMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
index e719ac184e86dc26374e4e98e6796512a7ce70bd..2bcdb3ca96470dc6771af857b8fed57b7b90e46e 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
@@ -12,14 +12,14 @@ 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
-TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
-TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
-TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
-HMS_Pretrig TRIG1 || TRIG2 || TRIG3
+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
-edtm_accepted T.hms.hEDTM_tdcTime != 0.0
-physics_accepted T.hms.hEDTM_tdcTime == 0.0
+hcut_edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+hcut_physics_accepted T.hms.hEDTM_tdcTime == 0.0
RawDecode_master 1
@@ -30,19 +30,19 @@ Decode_master ALL_events
Block: CoarseTracking
CoarseTracking_master ALL_events
-#add cuts to stricter times and apply them to drift distances (HMS 6 GeV Drift Chambers)
-time_cut1 H.dc.1x1.time > 0 && H.dc.1x1.time < 250
-time_cut2 H.dc.1v2.time > 0 && H.dc.1v2.time < 250
-time_cut3 H.dc.1u1.time > 0 && H.dc.1u1.time < 250
-time_cut4 H.dc.1v1.time > 0 && H.dc.1v1.time < 250
-time_cut5 H.dc.1u2.time > 0 && H.dc.1u2.time < 250
-time_cut6 H.dc.1x2.time > 0 && H.dc.1x2.time < 250
-time_cut7 H.dc.2x1.time > 0 && H.dc.2x1.time < 250
-time_cut8 H.dc.2v2.time > 0 && H.dc.1v2.time < 250
-time_cut9 H.dc.2u1.time > 0 && H.dc.2u1.time < 250
-time_cut10 H.dc.2v1.time > 0 && H.dc.2v1.time < 250
-time_cut11 H.dc.2u2.time > 0 && H.dc.2u2.time < 250
-time_cut12 H.dc.2x2.time > 0 && H.dc.2x2.time < 250
+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
@@ -103,9 +103,6 @@ hmsDC2_6hits_x2 h2hit6&&hmsDC2_1hit_x1&&hmsDC2_1hit_v2&&hmsDC2_1hit_u1&&hmsD
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
@@ -130,10 +127,10 @@ Tracking_master ALL_events
Block: Reconstruct
Reconstruct_master ALL_events
-cer_pmt1_elec H.cer.npe[0]>.5
-cer_pmt2_elec H.cer.npe[0]>.5
-cer_elec H.cer.npeSum>.5
-cer_pi H.cer.npeSum<.5
+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
@@ -145,62 +142,61 @@ HMSScinDid HMSScinShould && H.dc.ntrack > 0
HMSScinDide HMSScinShoulde && H.dc.ntrack > 0
HMSScinDidh HMSScinShouldh && H.dc.ntrack > 0
-
-
-goodHDC1x1 H.dc.1x1.nhit > 0 && H.dc.1x1.nhit < 3
-goodHDC1v2 H.dc.1v2.nhit > 0 && H.dc.1v2.nhit < 3
-goodHDC1u1 H.dc.1u1.nhit > 0 && H.dc.1u1.nhit < 3
-goodHDC1v1 H.dc.1v1.nhit > 0 && H.dc.1v1.nhit < 3
-goodHDC1u2 H.dc.1u2.nhit > 0 && H.dc.1u2.nhit < 3
-goodHDC1x2 H.dc.1x2.nhit > 0 && H.dc.1x2.nhit < 3
-
-goodHDC2x1 H.dc.2x1.nhit > 0 && H.dc.2x1.nhit < 3
-goodHDC2v2 H.dc.2v2.nhit > 0 && H.dc.2v2.nhit < 3
-goodHDC2u1 H.dc.2u1.nhit > 0 && H.dc.2u1.nhit < 3
-goodHDC2v1 H.dc.2v1.nhit > 0 && H.dc.2v1.nhit < 3
-goodHDC2u2 H.dc.2u2.nhit > 0 && H.dc.2u2.nhit < 3
-goodHDC2x2 H.dc.2x2.nhit > 0 && H.dc.2x2.nhit < 3
-
-goodHDC1 goodHDC1x1 && goodHDC1v2 && goodHDC1u1 && goodHDC1v1 && goodHDC1u2 && goodHDC1x2
-goodHDC2 goodHDC2x1 && goodHDC2v2 && goodHDC2u1 && goodHDC2v1 && goodHDC2u2 && goodHDC2x2
-bothGood goodHDC1 && goodHDC2
-
-realhdc1x1 goodHDC1x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1v2 goodHDC1v2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1u1 goodHDC1u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1v1 goodHDC1v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1u2 goodHDC1u2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1x2 goodHDC1x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2x1 goodHDC2x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2v2 goodHDC2v2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2u1 goodHDC2u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2v1 goodHDC2v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2u2 goodHDC2u2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2x2 goodHDC2x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-
-hFound1Track H.dc.ntrack == 1
-hFound2Track H.dc.ntrack == 2
-hFound3Track H.dc.ntrack == 3
-hFound4Track H.dc.ntrack == 4
-
-hCleanTrack H.gtr.index > -1
-1hCleanTrack H.gtr.index == 0
-2hCleanTrack H.gtr.index == 1
-3hCleanTrack H.gtr.index == 2
-4hCleanTrack H.gtr.index == 3
-
-anyhs1x H.hod.1x.nhits > 0
-anyhs1y H.hod.1y.nhits > 0
-anyhs2x H.hod.2x.nhits > 0
-anyhs2y H.hod.2y.nhits > 0
-
-goodhs1x H.hod.1x.nhits > 0 && H.hod.1x.nhits < 3
-goodhs1y H.hod.1y.nhits > 0 && H.hod.1y.nhits < 3
-goodhs1 goodhs1x && goodhs1y
-goodhs2x H.hod.2x.nhits > 0 && H.hod.2x.nhits < 3
-goodhs2y H.hod.2y.nhits > 0 && H.hod.2y.nhits < 3
-goodhs2 goodhs2x && goodhs2y
-goodhs1s2 goodhs1 && goodhs2
+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
@@ -209,5 +205,6 @@ 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_events
diff --git a/DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def b/DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def
index d6244eab66df1f1789c6e8abc2f267c8b823bbdd..dd8ea1ddbdab325e3559224283ec840d928f37e8 100644
--- a/DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def
@@ -1,9 +1,9 @@
####################
# TARGET VARIABLES
####################
-TH2F pgtr_xtar_vs_ytar 'SHMS Golden Track X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' P.gtr.y P.gtr.x 40 -20 20 40 -20 20 pCleanTrack
-TH2F pgtr_xptar_vs_yptar 'SHMS Golden Track X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' P.gtr.ph P.gtr.th 100 -.1 .1 100 -.1 .1 pCleanTrack
-TH2F pgtr_xtar_vs_yptar 'SHMS Golden Track X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm' P.gtr.ph P.gtr.x 100 -.1 .1 40 -20 20 pCleanTrack
-TH2F pgtr_xtar_vs_xptar 'SHMS Golden Track X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' P.gtr.th P.gtr.x 100 -.1 .1 40 -20 20 pCleanTrack
-TH2F pgtr_ytar_vs_yptar 'SHMS Golden Track Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm' P.gtr.ph P.gtr.y 100 -.1 .1 40 -20 20 pCleanTrack
-TH2F pgtr_ytar_vs_xptar 'SHMS Golden Track Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' P.gtr.th P.gtr.y 100 -.1 .1 40 -20 20 pCleanTrack
+TH2F pgtr_xtar_vs_ytar 'SHMS Golden Track X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' P.gtr.y P.gtr.x 40 -20 20 40 -20 20 pcut_CleanTrack
+TH2F pgtr_xptar_vs_yptar 'SHMS Golden Track X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' P.gtr.ph P.gtr.th 100 -.1 .1 100 -.1 .1 pcut_CleanTrack
+TH2F pgtr_xtar_vs_yptar 'SHMS Golden Track X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm' P.gtr.ph P.gtr.x 100 -.1 .1 40 -20 20 pcut_CleanTrack
+TH2F pgtr_xtar_vs_xptar 'SHMS Golden Track X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' P.gtr.th P.gtr.x 100 -.1 .1 40 -20 20 pcut_CleanTrack
+TH2F pgtr_ytar_vs_yptar 'SHMS Golden Track Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm' P.gtr.ph P.gtr.y 100 -.1 .1 40 -20 20 pcut_CleanTrack
+TH2F pgtr_ytar_vs_xptar 'SHMS Golden Track Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' P.gtr.th P.gtr.y 100 -.1 .1 40 -20 20 pcut_CleanTrack
diff --git a/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def b/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
index f8c1e923db299793d00ca0c702c1591dcbc0f5fe..b065bc6a439e95e8c682eb14d4bd8626db492a18 100644
--- a/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
@@ -35,32 +35,32 @@ TH1F pcal_ytrack2 'SHMS Cal Track y pos with no matching clust number of clu
TH2F pcal_xytrack 'SHMS Cal Track X vs Track Y; Track Y / 1 cm; Track X / 1 cm' P.cal.ytrack P.cal.xtrack 200 -100 100 200 -100 100 P.dc.ntrack>0
TH2F pcal_xyclusttrack 'SHMS Cal Cluster X vs Cluster Y; Cluster Y / 1 cm; Cluster X / 1 cm' P.cal.yclusttrack P.cal.xclusttrack 200 -100 100 200 -100 100 P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH2F pcal_xtrack_vs_etrack 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pCleanTrack
-TH2F pcal_ytrack_vs_etrack 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pCleanTrack
-TH2F pcal_xtrack_vs_etrack_elec 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pCleanTrack&&cer_hg_elec&&cal_elec
-TH2F pcal_ytrack_vs_etrack_elec 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pCleanTrack&&cer_hg_elec&&cal_elec
-TH2F pcal_xtrack_vs_etrack_pi 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pCleanTrack&&cer_hg_pi&&cal_pi
-TH2F pcal_ytrack_vs_etrack_pi 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pCleanTrack&&cer_hg_pi&&cal_pi
+TH2F pcal_xtrack_vs_etrack 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack
+TH2F pcal_ytrack_vs_etrack 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack
+TH2F pcal_xtrack_vs_etrack_elec 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH2F pcal_ytrack_vs_etrack_elec 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH2F pcal_xtrack_vs_etrack_pi 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+TH2F pcal_ytrack_vs_etrack_pi 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
#-------------------------------
# SHMS PID AND ACCEPTANCE PLOTS
#-------------------------------
TH2F hgc_vs_prshw 'SHMS HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 P.cal.pr.eplane>0.0&&P.hgcer.npeSum>0.0
-TH2F hgc_vs_prshw_elec 'SHMS Electron HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pCleanTrack&&cer_hg_elec&&cal_elec
-TH2F hgc_vs_prshw_pi 'SHMS Pion HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pCleanTrack&&cer_hg_pi&&cal_pi
+TH2F hgc_vs_prshw_elec 'SHMS Electron HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH2F hgc_vs_prshw_pi 'SHMS Pion HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
TH2F ngc_vs_prshw 'SHMS NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 P.cal.pr.eplane>0.0&&P.ngcer.npeSum>0.0
-TH2F ngc_vs_prshw_elec 'SHMS Electron NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pCleanTrack&&cer_hg_elec&&cal_elec
-TH2F ngc_vs_prshw_pi 'SHMS Pion NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pCleanTrack&&cer_hg_pi&&cal_pi
+TH2F ngc_vs_prshw_elec 'SHMS Electron NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH2F ngc_vs_prshw_pi 'SHMS Pion NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
TH2F pcal_shw_vs_prshw 'SHMS Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 P.cal.pr.eplane>0.0&&P.cal.fly.earray>0.0
-TH2F pcal_shw_vs_prshw_elec 'SHMS Electron Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pCleanTrack&&cer_hg_elec&&cal_elec
-TH2F pcal_shw_vs_prshw_pi 'SHMS Pion Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pCleanTrack&&cer_hg_pi&&cal_pi
+TH2F pcal_shw_vs_prshw_elec 'SHMS Electron Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH2F pcal_shw_vs_prshw_pi 'SHMS Pion Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
-TH2F pcal_delta_etracknorm 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 240 -25. 35. pCleanTrack
-TH2F pcal_delta_etracknorm_elec 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 240 -25. 35. pCleanTrack&&cer_hg_elec&&cal_elec
-TH2F pcal_delta_etracknorm_pi 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 240 -25. 35. pCleanTrack&&cer_hg_pi&&cal_pi
+TH2F pcal_delta_etracknorm 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 240 -25. 35. pcut_CleanTrack
+TH2F pcal_delta_etracknorm_elec 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 240 -25. 35. pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH2F pcal_delta_etracknorm_pi 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 240 -25. 35. pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
TH2F pcal_prshwr_good_dtime_vs_pmt_pos 'SHMS PreShower+ Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodPosAdcPulseTime 14 0.5 14.5 4000 -200 200
TH2F pcal_prshwr_good_dtime_vs_pmt_neg 'SHMS PreShower- Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodNegAdcTdcDiffTime 14 0.5 14.5 4000 -200 200
@@ -70,8 +70,8 @@ TH2F pcal_shwr_good_dtime_vs_pmt 'SHMS Shower Good Hodo Start - Pulse Time vs. P
# SHMS Drift Chambers PID Cuts
#-----------------------------
-TH1F pdc_trk_beta_elec 'SHMS DC ElectronTrack Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pCleanTrack&&cer_hg_elec&&cal_elec
-TH1F pdc_trk_beta_pi 'SHMS DC Pion Track Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pCleanTrack&&cer_hg_pi&&cal_pi
+TH1F pdc_trk_beta_elec 'SHMS DC ElectronTrack Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH1F pdc_trk_beta_pi 'SHMS DC Pion Track Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
-TH1F pdc_trk_mom_elec 'SHMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pCleanTrack&&cer_hg_elec&&cal_elec
-TH1F pdc_trk_mom_pi 'SHMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pCleanTrack&&cer_hg_pi&&cal_pi
\ No newline at end of file
+TH1F pdc_trk_mom_elec 'SHMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+TH1F pdc_trk_mom_pi 'SHMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
index 1706181659999e69b29228e3a2c784302816d662..f5502d32591ff1b8d61dc0e468f26576f65eb4f1 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
@@ -12,22 +12,22 @@ 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
-TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
-TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
-TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
-SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+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
-edtm_accepted T.shms.pEDTM_tdcTime != 0.0
-physics_accepted T.shms.pEDTM_tdcTime == 0.0
+pcut_edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+pcut_physics_accepted T.shms.pEDTM_tdcTime == 0.0
RawDecode_master 1
Block: Decode
-good_S1_time T.shms.p1T_tdcTime > 241 && T.shms.p1T_tdcTime < 243
-good_S2X_time T.shms.p2X_tdcTime > 180 && T.shms.p2X_tdcTime < 220
-good_S1_S2X_time good_S1_time && good_S2X_time
+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
Decode_master ALL_events
@@ -35,18 +35,18 @@ Block: CoarseTracking
CoarseTracking_master ALL_events
# Add cuts to stricter times and apply them to drift distances
-time_cut1 P.dc.1u1.time > 0 && P.dc.1u1.time < 250
-time_cut2 P.dc.1u2.time > 0 && P.dc.1u2.time < 250
-time_cut3 P.dc.1x1.time > 0 && P.dc.1x1.time < 250
-time_cut4 P.dc.1x2.time > 0 && P.dc.1x2.time < 250
-time_cut5 P.dc.1v1.time > 0 && P.dc.1v1.time < 250
-time_cut6 P.dc.1v2.time > 0 && P.dc.1v2.time < 250
-time_cut7 P.dc.2v2.time > 0 && P.dc.2v2.time < 250
-time_cut8 P.dc.2v1.time > 0 && P.dc.2v1.time < 250
-time_cut9 P.dc.2x2.time > 0 && P.dc.2x2.time < 250
-time_cut10 P.dc.2x1.time > 0 && P.dc.2x1.time < 250
-time_cut11 P.dc.2u2.time > 0 && P.dc.2u2.time < 250
-time_cut12 P.dc.2u1.time > 0 && P.dc.2u1.time < 250
+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
@@ -61,15 +61,15 @@ 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 && good_S1_S2X_time
-shms_ch2_gt0_gtime P.dc.Ch2.nhit > 0 && good_S1_S2X_time
-shms_ch_gt0_gtime P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit > 0 && good_S1_S2X_time
-shms_ch_gt4_gtime P.dc.Ch2.nhit > 3 && P.dc.Ch1.nhit > 3 && good_S1_S2X_time
-shms_ch2_gt0_noch1_gtime P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit == 0 && good_S1_S2X_time
-shms_ch1_gt0_noch2_gtime P.dc.Ch1.nhit > 0 && P.dc.Ch2.nhit == 0 && good_S1_S2X_time
-shms_noch1_noch2_gtime P.dc.Ch1.nhit == 0 && P.dc.Ch2.nhit == 0 && good_S1_S2X_time
-shms_ch_gt0_track_gtime shms_ch_gt0 && P.dc.ntrack > 0 && good_S1_S2X_time
-shms_ch_gt4_track_gtime shms_ch_gt4 && P.dc.ntrack > 0 && good_S1_S2X_time
+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
@@ -139,7 +139,7 @@ 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
-pFoundTrack P.dc.ntrack > 0
+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
@@ -156,16 +156,16 @@ Tracking_master ALL_events
Block: Reconstruct
Reconstruct_master ALL_events
-cer_ng_elec P.ngcer.npeSum > 0.5
-cer_ng_pi P.ngcer.npeSum <= 0.5
-cer_hg_elec P.hgcer.npeSum > 0.5
-cer_hg_pi P.hgcer.npeSum <= 0.5
-cer_pi_both cer_ng_pi && cer_hg_pi
-cer_elec_both cer_ng_elec && cer_hg_elec
-cal_elec P.cal.etracknorm > 0.6 && P.cal.etracknorm < 1.6
-cal_pi P.cal.etracknorm <= 0.6 && P.cal.etracknorm > 0.
-elec_all cer_ng_elec && cer_hg_elec && cal_elec
-pi_all cer_ng_pi && cer_hg_pi && cal_pi
+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
shmsScinShould shmsScinGood
@@ -175,66 +175,66 @@ shmsScinDid shmsScinShould && P.dc.ntrack > 0
shmsScinDide shmsScinShoulde && P.dc.ntrack > 0
shmsScinDidh shmsScinShouldh && P.dc.ntrack > 0
-goodHDC1x1 P.dc.1x1.nhit > 0 && P.dc.1x1.nhit < 3
-goodHDC1u2 P.dc.1u2.nhit > 0 && P.dc.1u2.nhit < 3
-goodHDC1u1 P.dc.1u1.nhit > 0 && P.dc.1u1.nhit < 3
-goodHDC1v1 P.dc.1v1.nhit > 0 && P.dc.1v1.nhit < 3
-goodHDC1v2 P.dc.1v2.nhit > 0 && P.dc.1v2.nhit < 3
-goodHDC1x2 P.dc.1x2.nhit > 0 && P.dc.1x2.nhit < 3
-
-goodHDC2x1 P.dc.2x1.nhit > 0 && P.dc.2x1.nhit < 3
-goodHDC2u2 P.dc.2u2.nhit > 0 && P.dc.2u2.nhit < 3
-goodHDC2u1 P.dc.2u1.nhit > 0 && P.dc.2u1.nhit < 3
-goodHDC2v1 P.dc.2v1.nhit > 0 && P.dc.2v1.nhit < 3
-goodHDC2v2 P.dc.2v2.nhit > 0 && P.dc.2v2.nhit < 3
-goodHDC2x2 P.dc.2x2.nhit > 0 && P.dc.2x2.nhit < 3
-
-goodHDC1 goodHDC1x1 && goodHDC1u2 && goodHDC1u1 && goodHDC1v1 && goodHDC1v2 && goodHDC1x2
-goodHDC2 goodHDC2x1 && goodHDC2u2 && goodHDC2u1 && goodHDC2v1 && goodHDC2v2 && goodHDC2x2
-bothGood goodHDC1 && goodHDC2
-
-realhdc1x1 goodHDC1x1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1u2 goodHDC1u2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1u1 goodHDC1u1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1v1 goodHDC1v1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1v2 goodHDC1v2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1x2 goodHDC1x2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-
-realhdc2x1 goodHDC2x1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2u2 goodHDC2u2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2u1 goodHDC2u1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2v1 goodHDC2v1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2v2 goodHDC2v2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2x2 goodHDC2x2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-
-pFound1Track P.dc.ntrack == 1
-pFound2Track P.dc.ntrack == 2
-pFound3Track P.dc.ntrack == 3
-pFound4Track P.dc.ntrack == 4
-
-pCleanTrack P.gtr.index > -1
-1pCleanTrack P.gtr.index == 0
-2pCleanTrack P.gtr.index == 1
-3pCleanTrack P.gtr.index == 2
-4pCleanTrack P.gtr.index == 3
-
-pCleanTrack_cer_elec (P.gtr.index > -1) && cer_elec_both
-p1hit1_cer_elec p1hit1 && cer_elec_both
-pCleanTrack_cal_elec (P.gtr.index > -1) && cal_elec
-p1hit1_cal_elec p1hit1 && cal_elec
-
-anyhs1x P.hod.1x.nhits > 0
-anyhs1y P.hod.1y.nhits > 0
-anyhs2x P.hod.2x.nhits > 0
-anyhs2y P.hod.2y.nhits > 0
-
-goodps1x P.hod.1x.nhits > 0 && P.hod.1x.nhits < 3
-goodps1y P.hod.1y.nhits > 0 && P.hod.1y.nhits < 3
-goodps1 goodps1x && goodps1y
-goodps2x P.hod.2x.nhits > 0 && P.hod.2x.nhits < 3
-goodps2y P.hod.2y.nhits > 0 && P.hod.2y.nhits < 3
-goodps2 goodps2x && goodps2y
-goodps1s2 goodps1 && goodps2
+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
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
index a975bdc3b6bad8b6dccbe89b87d30d2d491c9ba8..b1d989b16a6db2ac02733fad92d82aaaa88cdcb2 100644
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
+++ b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
@@ -47,11 +47,11 @@ Ps6_factor = {ghconfig_ti_ps_factors[5]}
HMS 3/4 Triggers : {H.hTRIG1.scaler} [ {H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]} ]
Estimated HMS 3/4 Triggers : {H.hTRIG1.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
HMS 3/4 Trigger Rate : {H.hTRIG1.scalerRate/1000.:%.3f} kHz
-Accepted HMS Triggers : {TRIG1.npassed}
+Accepted HMS Triggers : {hcut_TRIG1.npassed}
HMS Event Types : {HMS_Pretrig.npassed}
-HMS Computer Live Time : {(TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-HMS Computer Dead Time : {100.0 - (TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+HMS Computer Live Time : {(hcut_TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {(hcut_TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+HMS Computer Dead Time : {100.0 - (hcut_TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (hcut_TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
=:=:=:=:=:=:=:=:=:=:=:=:
= Physics 3/4 Triggers
@@ -60,7 +60,7 @@ HMS Computer Dead Time : {100.0 - (TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f}
Physics Triggers : {H.hTRIG1.scaler - H.EDTM.scaler}
Estimated Physics Triggers : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
Physics Trigger Rate : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
-Accepted Physics Triggers : {physics_accepted.npassed}
+Accepted Physics Triggers : {hcut_physics_accepted.npassed}
=:=:=:=:=:=:=:=:
= HMS Triggers
@@ -105,10 +105,10 @@ pTRIG6 : {H.pTRIG6.scaler} [ {(H.pTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f}
EDTM Triggers : {H.EDTM.scaler}
Estimated EDTM Triggers : {H.EDTM.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
EDTM Trigger Rate : {H.EDTM.scalerRate/1000.:%.3f} kHz
-Accepted EDTM Triggers : {edtm_accepted.npassed}
+Accepted EDTM Triggers : {hcut_edtm_accepted.npassed}
-Total Live Time (EDTM) : {(edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
-Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
+Total Live Time (EDTM) : {(hcut_edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
+Total Dead Time (EDTM) : {100.0 - (hcut_edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
=:=:=:=:=:=:=:
= Hodoscopes
@@ -175,71 +175,71 @@ hmsDC2_1hit_u2: {hmsDC2_1hit_u2.npassed}
hmsDC2_1hit_x2: {hmsDC2_1hit_x2.npassed}
"Good" means one or two hits per dc plane.
-goodHDC1x1: {goodHDC1x1.npassed} eff : {goodHDC1x1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1u2: {goodHDC1u2.npassed} eff : {goodHDC1u2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1v2: {goodHDC1v2.npassed} eff : {goodHDC1v2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2u2: {goodHDC2u2.npassed} eff : {goodHDC2u2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2v2: {goodHDC2v2.npassed} eff : {goodHDC2v2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-bothgood: {bothGood.npassed} eff : {bothGood.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-realhdc1x1: {realhdc1x1.npassed}
-realhdc1u2: {realhdc1u2.npassed}
-realhdc1u1: {realhdc1u1.npassed}
-realhdc1v1: {realhdc1v1.npassed}
-realhdc1v2: {realhdc1v2.npassed}
-realhdc1x2: {realhdc1x2.npassed}
-
-realhdc2x1: {realhdc2x1.npassed}
-realhdc2u2: {realhdc2u2.npassed}
-realhdc2u1: {realhdc2u1.npassed}
-realhdc2v1: {realhdc2v1.npassed}
-realhdc2v2: {realhdc2v2.npassed}
-realhdc2x2: {realhdc2x2.npassed}
+hcut_goodHDC1x1: {hcut_goodHDC1x1.npassed} eff : {hcut_goodHDC1x1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC1u2: {hcut_goodHDC1u2.npassed} eff : {hcut_goodHDC1u2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC1u1: {hcut_goodHDC1u1.npassed} eff : {hcut_goodHDC1u1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC1v1: {hcut_goodHDC1v1.npassed} eff : {hcut_goodHDC1v1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC1v2: {hcut_goodHDC1v2.npassed} eff : {hcut_goodHDC1v2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC1x2: {hcut_goodHDC1x2.npassed} eff : {hcut_goodHDC1x2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+
+hcut_goodHDC2x1: {hcut_goodHDC2x1.npassed} eff : {hcut_goodHDC2x1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC2u2: {hcut_goodHDC2u2.npassed} eff : {hcut_goodHDC2u2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC2u1: {hcut_goodHDC2u1.npassed} eff : {hcut_goodHDC2u1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC2v1: {hcut_goodHDC2v1.npassed} eff : {hcut_goodHDC2v1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC2v2: {hcut_goodHDC2v2.npassed} eff : {hcut_goodHDC2v2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC2x2: {hcut_goodHDC2x2.npassed} eff : {hcut_goodHDC2x2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+
+hcut_goodHDC1: {hcut_goodHDC1.npassed} eff : {hcut_goodHDC1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goodHDC2: {hcut_goodHDC2.npassed} eff : {hcut_goodHDC2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_bothgood: {hcut_bothGood.npassed} eff : {hcut_bothGood.npassed/(hms_trigs.npassed+.0001):%5.3f}
+
+hcut_realhdc1x1: {hcut_realhdc1x1.npassed}
+hcut_realhdc1u2: {hcut_realhdc1u2.npassed}
+hcut_realhdc1u1: {hcut_realhdc1u1.npassed}
+hcut_realhdc1v1: {hcut_realhdc1v1.npassed}
+hcut_realhdc1v2: {hcut_realhdc1v2.npassed}
+hcut_realhdc1x2: {hcut_realhdc1x2.npassed}
+
+hcut_realhdc2x1: {hcut_realhdc2x1.npassed}
+hcut_realhdc2u2: {hcut_realhdc2u2.npassed}
+hcut_realhdc2u1: {hcut_realhdc2u1.npassed}
+hcut_realhdc2v1: {hcut_realhdc2v1.npassed}
+hcut_realhdc2v2: {hcut_realhdc2v2.npassed}
+hcut_realhdc2x2: {hcut_realhdc2x2.npassed}
**HODOSCOPE**
"Any" means one or more hits per scint plane.
-anyhs1x: {anyhs1x.npassed} eff: {anyhs1x.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-anyhs1y: {anyhs1y.npassed} eff: {anyhs1y.npassed/(hms_trigs.npassed+.0001):%5.3f}
-anyhs2x: {anyhs2x.npassed} eff: {anyhs2x.npassed/(hms_trigs.npassed+.0001):%5.3f}
-anyhs2y: {anyhs2y.npassed} eff: {anyhs2y.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_anys1x: {hcut_anys1x.npassed} eff: {hcut_anys1x.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
+hcut_anys1y: {hcut_anys1y.npassed} eff: {hcut_anys1y.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_anys2x: {hcut_anys2x.npassed} eff: {hcut_anys2x.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_anys2y: {hcut_anys2y.npassed} eff: {hcut_anys2y.npassed/(hms_trigs.npassed+.0001):%5.3f}
"Good" means one or two hits per scint plane.
-goodhs1x : {goodhs1x.npassed} eff: {goodhs1x.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-goodhs1y: {goodhs1y.npassed} eff: {goodhs1y.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs1: {goodhs1.npassed} eff: {goodhs1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs2x: {goodhs2x.npassed} eff: {goodhs2x.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs2y: {goodhs2y.npassed} eff: {goodhs2y.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs2: {goodhs2.npassed} eff: {goodhs2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs1s2: {goodhs1s2.npassed} eff: {goodhs1s2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-hFoundTrack: {hFoundTrack.npassed} eff: {hFoundTrack.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-hFound1Track: {hFound1Track.npassed} eff: {hFound1Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-hFound2Track: {hFound2Track.npassed} eff: {hFound2Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-hFound3Track: {hFound3Track.npassed} eff: {hFound3Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-hFound4Track: {hFound4Track.npassed} eff: {hFound4Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-hCleanTrack: {hCleanTrack.npassed} eff: {hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-1hCleanTrack: {1hCleanTrack.npassed} eff: {1hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
-2hCleanTrack: {2hCleanTrack.npassed} eff: {2hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
-3hCleanTrack: {3hCleanTrack.npassed} eff: {3hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
-4hCleanTrack: {4hCleanTrack.npassed} eff: {4hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goods1x: {hcut_goods1x.npassed} eff: {hcut_goods1x.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
+hcut_goods1y: {hcut_goods1y.npassed} eff: {hcut_goods1y.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goods1: {hcut_goods1.npassed} eff: {hcut_goods1.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goods2x: {hcut_goods2x.npassed} eff: {hcut_goods2x.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goods2y: {hcut_goods2y.npassed} eff: {hcut_goods2y.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goods2: {hcut_goods2.npassed} eff: {hcut_goods2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_goods1s2: {hcut_goods1s2.npassed} eff: {hcut_goods1s2.npassed/(hms_trigs.npassed+.0001):%5.3f}
+
+hcut_FoundTrack: {hcut_FoundTrack.npassed} eff: {hcut_FoundTrack.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
+hcut_Found1Track: {hcut_Found1Track.npassed} eff: {hcut_Found1Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_Found2Track: {hcut_Found2Track.npassed} eff: {hcut_Found2Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_Found3Track: {hcut_Found3Track.npassed} eff: {hcut_Found3Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_Found4Track: {hcut_Found4Track.npassed} eff: {hcut_Found4Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
+
+hcut_Clean1Track: {hcut_Clean1Track.npassed} eff: {hcut_Clean1Track.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
+hcut_Clean2Track: {hcut_Clean2Track.npassed} eff: {hcut_Clean2Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_Clean3Track: {hcut_Clean3Track.npassed} eff: {hcut_Clean3Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_Clean4Track: {hcut_Clean4Track.npassed} eff: {hcut_Clean4Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
+hcut_CleanTrack: {hcut_CleanTrack.npassed} eff: {hcut_CleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
**CHERENKOVS AND CAL**
-cer_pmt1_elec: {cer_pmt1_elec.npassed}
-cer_pmt2_elect: {cer_pmt2_elec.npassed}
-cer_elec: {cer_elec.npassed}
-cer_pi: {cer_pi.npassed}
+hcut_cer_pmt1_elec: {hcut_cer_pmt1_elec.npassed}
+hcut_cer_pmt2_elect: {hcut_cer_pmt2_elec.npassed}
+hcut_cer_elec: {hcut_cer_elec.npassed}
+hcut_cer_pi: {hcut_cer_pi.npassed}
*****************************
*HMS TRACKING EFFICIENCIES *
@@ -250,8 +250,8 @@ hhitslt = passed hits/cham : {hmsHitsLt.npassed}
hhitsplanes = +planes >= 5/6 : {hmsHitsPlanes.npassed}
hhitsplanessps = + sps : {hSpacePoints.npassed}
hhitsplanesspsstubs +stub : {hSpacePointsStub.npassed}
-hsfoundtrack : {hFoundTrack.npassed}
-hscleantrack : {hCleanTrack.npassed}
+hsfoundtrack : {hcut_FoundTrack.npassed}
+hscleantrack : {hcut_CleanTrack.npassed}
hstublt = passed stub tests : {hStubLT.npassed}
h1hitslt : {hms1HitsLt.npassed}
h2hitslt : {hms2HitsLt.npassed}
@@ -296,7 +296,7 @@ with chisquared/dof < {hstat_cal_maxchisq:%5.1f} came within {hstat_cal_slop:%4.
and scal_npe_sum > 3.0 (hardwired). (is this still true?)
Events examined = strig = {hms_trigs.npassed}
-Tracks found = scleantrack = {hCleanTrack.npassed}
+Tracks found = scleantrack = {hcut_CleanTrack.npassed}
//Tracks passing chisquared cut = (hstat_cal_numevents:%7d) (in previous template, do we need this here?)
hmsPreShower Counts: {H.cal.stat_trksum1} eff : {H.cal.stat_hitsum1 / H.cal.stat_trksum1}
@@ -315,7 +315,7 @@ Efficiencies for hodoscopes is the fraction of times scin. was hit when track
with chisquared/dof < {hstat_maxchisq:%5.1f} came within {hstat_slop:%4.1f} cm of the center.
Events examined = strig = {hms_trigs.npassed}
-Tracks found = scleantrack = {hCleanTrack.npassed}
+Tracks found = scleantrack = {hcut_CleanTrack.npassed}
//Tracks passing chisquared cut = (stat_numevents) (in previous template, do we still need this?)
Plane 1: {hhodo_plane_AND_eff[0]}
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index f3169e735ba21e4db0ad0ca22a99b226320103b4..72b0a86c14b68df95ca87dae7365654673e64d2a 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -47,11 +47,11 @@ Ps6_factor = {gpconfig_ti_ps_factors[5]}
SHMS 3/4 Triggers : {P.pTRIG1.scaler} [ {P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]} ]
Estimated SHMS 3/4 Triggers : {P.pTRIG1.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
SHMS 3/4 Trigger Rate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
-Accepted SHMS Triggers : {TRIG1.npassed}
+Accepted SHMS Triggers : {pcut_TRIG1.npassed}
SHMS Event Types : {SHMS_Pretrig.npassed}
-SHMS Computer Live Time : {(TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-SHMS Computer Dead Time : {100.0 - (TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+SHMS Computer Live Time : {(pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {(pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+SHMS Computer Dead Time : {100.0 - (pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
=:=:=:=:=:=:=:=:=:=:=:=:
= Physics 3/4 Triggers
@@ -60,7 +60,7 @@ SHMS Computer Dead Time : {100.0 - (TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f
Physics 3/4 Triggers : {P.pTRIG1.scaler - P.EDTM.scaler}
Estimated Physics 3/4 Triggers : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
Physics 3/4 Trigger Rate : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
-Accepted Physics Triggers : {physics_accepted.npassed}
+Accepted Physics Triggers : {pcut_physics_accepted.npassed}
=:=:=:=:=:=:=:=:
= HMS Triggers
@@ -98,6 +98,7 @@ pTRIG4 : {P.pTRIG4.scaler} [ {(P.pTRIG4.scaler/P.1Mhz.scalerTime)/1000.:%.3f}
pTRIG5 : {P.pTRIG5.scaler} [ {(P.pTRIG5.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
pTRIG6 : {P.pTRIG6.scaler} [ {(P.pTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
=:=:=:=:
= EDTM
=:=:=:=:
@@ -105,10 +106,10 @@ pTRIG6 : {P.pTRIG6.scaler} [ {(P.pTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f}
EDTM Triggers : {P.EDTM.scaler}
Estimated EDTM Triggers : {P.EDTM.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
EDTM Trigger Rate : {P.EDTM.scalerRate/1000.:%.3f} kHz
-Accepted EDTM Triggers : {edtm_accepted.npassed}
+Accepted EDTM Triggers : {pcut_edtm_accepted.npassed}
-Total Live Time (EDTM) : {(edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
-Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
+Total Live Time (EDTM) : {(pcut_edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
+Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
=:=:=:=:=:=:=:
= Hodoscopes
@@ -136,9 +137,9 @@ PRHI : {P.PRHI.scaler} [ {(P.PRHI.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
* Chambers
***********
-good_S1_time Counts: {good_S1_time.npassed} / shms_trigs.scaler : {good_S1_time.npassed / shms_trigs.npassed}
-good_S2X_time Counts: {good_S2X_time.npassed} / shms_trigs.scaler : {good_S2X_time.npassed / shms_trigs.npassed}
-good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / shms_trigs.scaler : {good_S1_S2X_time.npassed / shms_trigs.npassed}
+pcut_good_S1_time Counts: {pcut_good_S1_time.npassed} / shms_trigs.scaler : {pcut_good_S1_time.npassed / shms_trigs.npassed}
+pcut_good_S2X_time Counts: {pcut_good_S2X_time.npassed} / shms_trigs.scaler : {pcut_good_S2X_time.npassed / shms_trigs.npassed}
+pcut_good_S1_S2X_time Counts: {pcut_good_S1_S2X_time.npassed} / shms_trigs.scaler : {pcut_good_S1_S2X_time.npassed / shms_trigs.npassed}
Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} / shms_trigs : {shms_ch1_gt0.npassed / shms_trigs.npassed}
Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} / shms_trigs : { shms_ch2_gt0.npassed / shms_trigs.npassed}
@@ -198,83 +199,83 @@ shmsDC2_1hit_v2: {shmsDC2_1hit_v2.npassed}
shmsDC2_1hit_x2: {shmsDC2_1hit_x2.npassed}
"Good" means one or two hits per dc plane.
-goodHDC1x1: {goodHDC1x1.npassed} eff : {goodHDC1x1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC1u2: {goodHDC1u2.npassed} eff : {goodHDC1u2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC1v2: {goodHDC1v2.npassed} eff : {goodHDC1v2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-
-goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC2u2: {goodHDC2u2.npassed} eff : {goodHDC2u2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC2v2: {goodHDC2v2.npassed} eff : {goodHDC2v2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-
-goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-bothgood: {bothGood.npassed} eff : {bothGood.npassed/(shms_trigs.npassed+.0001):%5.3f}
-
-realhdc1x1: {realhdc1x1.npassed}
-realhdc1u2: {realhdc1u2.npassed}
-realhdc1u1: {realhdc1u1.npassed}
-realhdc1v1: {realhdc1v1.npassed}
-realhdc1v2: {realhdc1v2.npassed}
-realhdc1x2: {realhdc1x2.npassed}
-
-realhdc2x1: {realhdc2x1.npassed}
-realhdc2u2: {realhdc2u2.npassed}
-realhdc2u1: {realhdc2u1.npassed}
-realhdc2v1: {realhdc2v1.npassed}
-realhdc2v2: {realhdc2v2.npassed}
-realhdc2x2: {realhdc2x2.npassed}
+pcut_goodHDC1x1: {pcut_goodHDC1x1.npassed} eff : {pcut_goodHDC1x1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC1u2: {pcut_goodHDC1u2.npassed} eff : {pcut_goodHDC1u2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC1u1: {pcut_goodHDC1u1.npassed} eff : {pcut_goodHDC1u1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC1v1: {pcut_goodHDC1v1.npassed} eff : {pcut_goodHDC1v1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC1v2: {pcut_goodHDC1v2.npassed} eff : {pcut_goodHDC1v2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC1x2: {pcut_goodHDC1x2.npassed} eff : {pcut_goodHDC1x2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+
+pcut_goodHDC2x1: {pcut_goodHDC2x1.npassed} eff : {pcut_goodHDC2x1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC2u2: {pcut_goodHDC2u2.npassed} eff : {pcut_goodHDC2u2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC2u1: {pcut_goodHDC2u1.npassed} eff : {pcut_goodHDC2u1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC2v1: {pcut_goodHDC2v1.npassed} eff : {pcut_goodHDC2v1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC2v2: {pcut_goodHDC2v2.npassed} eff : {pcut_goodHDC2v2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC2x2: {pcut_goodHDC2x2.npassed} eff : {pcut_goodHDC2x2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+
+pcut_goodHDC1: {pcut_goodHDC1.npassed} eff : {pcut_goodHDC1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goodHDC2: {pcut_goodHDC2.npassed} eff : {pcut_goodHDC2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_bothgood: {pcut_bothGood.npassed} eff : {pcut_bothGood.npassed/(shms_trigs.npassed+.0001):%5.3f}
+
+pcut_realhdc1x1: {pcut_realhdc1x1.npassed}
+pcut_realhdc1u2: {pcut_realhdc1u2.npassed}
+pcut_realhdc1u1: {pcut_realhdc1u1.npassed}
+pcut_realhdc1v1: {pcut_realhdc1v1.npassed}
+pcut_realhdc1v2: {pcut_realhdc1v2.npassed}
+pcut_realhdc1x2: {pcut_realhdc1x2.npassed}
+
+pcut_realhdc2x1: {pcut_realhdc2x1.npassed}
+pcut_realhdc2u2: {pcut_realhdc2u2.npassed}
+pcut_realhdc2u1: {pcut_realhdc2u1.npassed}
+pcut_realhdc2v1: {pcut_realhdc2v1.npassed}
+pcut_realhdc2v2: {pcut_realhdc2v2.npassed}
+pcut_realhdc2x2: {pcut_realhdc2x2.npassed}
**HODOSCOPE**
"Any" means one or more hits per scint plane.
-anyhs1x : {anyhs1x.npassed} eff: {anyhs1x.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
-anyhs1y : {anyhs1y.npassed} eff: {anyhs1y.npassed/(shms_trigs.npassed+.0001):%5.3f}
-anyhs2x : {anyhs2x.npassed} eff: {anyhs2x.npassed/(shms_trigs.npassed+.0001):%5.3f}
-anyhs2y : {anyhs2y.npassed} eff: {anyhs2y.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_anys1x : {pcut_anys1x.npassed} eff: {pcut_anys1x.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+pcut_anys1y : {pcut_anys1y.npassed} eff: {pcut_anys1y.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_anys2x : {pcut_anys2x.npassed} eff: {pcut_anys2x.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_anys2y : {pcut_anys2y.npassed} eff: {pcut_anys2y.npassed/(shms_trigs.npassed+.0001):%5.3f}
"Good" means one or two hits per scint plane.
-goodps1x : {goodps1x.npassed} eff: {goodps1x.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
-goodps1y : {goodps1y.npassed} eff: {goodps1y.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodps1 : {goodps1.npassed} eff: {goodps1.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodps2x : {goodps2x.npassed} eff: {goodps2x.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodps2y : {goodps2y.npassed} eff: {goodps2y.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodps2 : {goodps2.npassed} eff: {goodps2.npassed/(shms_trigs.npassed+.0001):%5.3f}
-goodps1s2: {goodps1s2.npassed} eff: {goodps1s2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goods1x : {pcut_goods1x.npassed} eff: {pcut_goods1x.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+pcut_goods1y : {pcut_goods1y.npassed} eff: {pcut_goods1y.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goods1 : {pcut_goods1.npassed} eff: {pcut_goods1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goods2x : {pcut_goods2x.npassed} eff: {pcut_goods2x.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goods2y : {pcut_goods2y.npassed} eff: {pcut_goods2y.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goods2 : {pcut_goods2.npassed} eff: {pcut_goods2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_goods1s2: {pcut_goods1s2.npassed} eff: {pcut_goods1s2.npassed/(shms_trigs.npassed+.0001):%5.3f}
**TRACKING**
-pFoundTrack :{pFoundTrack.npassed} eff: {pFoundTrack.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
-pFound1Track :{pFound1Track.npassed} eff: {pFound1Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
-pFound2Track :{pFound2Track.npassed} eff: {pFound2Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
-pFound3Track :{pFound3Track.npassed} eff: {pFound3Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
-pFound4Track :{pFound4Track.npassed} eff: {pFound4Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
-
-pCleanTrack :{pCleanTrack.npassed} eff: {pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
-1pCleanTrack:{1pCleanTrack.npassed} eff: {1pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
-2pCleanTrack:{2pCleanTrack.npassed} eff: {2pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
-3pCleanTrack:{3pCleanTrack.npassed} eff: {3pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
-4pCleanTrack:{4pCleanTrack.npassed} eff: {4pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_FoundTrack :{pcut_FoundTrack.npassed} eff: {pcut_FoundTrack.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+pcut_Found1Track :{pcut_Found1Track.npassed} eff: {pcut_Found1Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_Found2Track :{pcut_Found2Track.npassed} eff: {pcut_Found2Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_Found3Track :{pcut_Found3Track.npassed} eff: {pcut_Found3Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_Found4Track :{pcut_Found4Track.npassed} eff: {pcut_Found4Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+
+pcut_CleanTrack :{pcut_CleanTrack.npassed} eff: {pcut_CleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+pcut_Clean1Track:{pcut_Clean1Track.npassed} eff: {pcut_Clean1Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_Clean2Track:{pcut_Clean2Track.npassed} eff: {pcut_Clean2Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_Clean3Track:{pcut_Clean3Track.npassed} eff: {pcut_Clean3Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pcut_Clean4Track:{pcut_Clean4Track.npassed} eff: {pcut_Clean4Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
**CHERENKOVS AND CAL**
-cer_ng_elec : {cer_ng_elec.npassed}
-cer_ng_pi : {cer_ng_pi.npassed}
-cer_hg_elec : {cer_hg_elec.npassed}
-cer_hg_pi : {cer_hg_pi.npassed}
-cer_pi_both : {cer_pi_both.npassed}
-cer_elec_both : {cer_elec_both.npassed}
-cal_elec : {cal_elec.npassed}
-cal_pi : {cal_pi.npassed}
-elec_all : {elec_all.npassed}
-pi_all : {pi_all.npassed}
-
-pCleanTrack_cer_elec : {pCleanTrack_cer_elec.npassed}
-p1hit1_cer_elec : {p1hit1_cer_elec.npassed}
-pCleanTrack_cal_elec : {pCleanTrack_cal_elec.npassed}
-p1hit1_cal_elec : {p1hit1_cal_elec.npassed}
+pcut_cer_ng_elec : {pcut_cer_ng_elec.npassed}
+pcut_cer_ng_pi : {pcut_cer_ng_pi.npassed}
+pcut_cer_hg_elec : {pcut_cer_hg_elec.npassed}
+pcut_cer_hg_pi : {pcut_cer_hg_pi.npassed}
+pcut_cer_pi_both : {pcut_cer_pi_both.npassed}
+pcut_cer_elec_both : {pcut_cer_elec_both.npassed}
+pcut_cal_elec : {pcut_cal_elec.npassed}
+pcut_cal_pi : {pcut_cal_pi.npassed}
+pcut_elec_all : {pcut_elec_all.npassed}
+pcut_pi_all : {pcut_pi_all.npassed}
+
+pcut_CleanTrack_cer_elec : {pcut_CleanTrack_cer_elec.npassed}
+pcut_p1hit1_cer_elec : {pcut_p1hit1_cer_elec.npassed}
+pcut_CleanTrack_cal_elec : {pcut_CleanTrack_cal_elec.npassed}
+pcut_p1hit1_cal_elec : {pcut_p1hit1_cal_elec.npassed}
******************************
* SHMS TRACKING EFFICIENCIES *
@@ -285,8 +286,8 @@ phitslt = passed hits/cham : {shmsHitsLt.npassed}
phitsplanes = +planes >= 5/6 : {shmsHitsPlanes.npassed}
phitsplanessps = + sps : {pSpacePoints.npassed}
phitsplanesspsstubs +stub : {pSpacePointsStub.npassed}
-psfoundtrack : {pFoundTrack.npassed}
-pscleantrack : {pCleanTrack.npassed}
+psfoundtrack : {pcut_FoundTrack.npassed}
+pscleantrack : {pcut_CleanTrack.npassed}
pstublt = passed stub tests : {pStubLT.npassed}
p1hitslt : {shms1HitsLt.npassed}
p2hitslt : {shms2HitsLt.npassed}
@@ -371,7 +372,7 @@ with chisquared/dof < {pstat_cal_maxchisq:%5.1f} came within {pstat_cal_slop:%4.
and scal_npe_sum > 3.0 (hardwired). (is this still true?)
Events examined = strig = {shms_trigs.scaler.npassed}
-Tracks found = scleantrack = {pCleanTrack.npassed}
+Tracks found = scleantrack = {pcut_CleanTrack.npassed}
//Tracks passing chisquared cut = (pstat_cal_numevents:%7d) (in previous template, do we need this here?)
shmsPreShower Counts: {P.cal.stat_trksum1} eff : {P.cal.stat_hitsum1 / P.cal.stat_trksum1}
@@ -385,7 +386,7 @@ Efficiencies for hodoscopes is the fraction of times scin. was hit when track
with chisquared/dof < {pstat_maxchisq:%5.1f} came within {pstat_slop:%4.1f} cm of the center.
Events examined = strig = {shms_trigs.npassed}
-Tracks found = scleantrack = {pCleanTrack.npassed}
+Tracks found = scleantrack = {pcut_CleanTrack.npassed}
//Tracks passing chisquared cut = (pstat_numevents) (in previous template, do we still need this?)
Plane 1: {phodo_plane_AND_eff[0]}