diff --git a/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
index 37f496eec9c65e5701660f149a2aa732bb29bc6c..f06305d9d58bc60c9f3deaeb5d23aa58ba538223 100644
--- a/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
@@ -1,3 +1,13 @@
 #***************
 # SHMS AEROGEL *
 #***************
+
+#--------------------------
+# SHMS HGC TRACK PROJECTION
+#--------------------------
+TH1F paero_xtrack  'SHMS Aerogel Tracking X; X (cm); Number of Entries / 1 cm'  P.aero.xAtAero 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
+TH1F paero_ytrack  'SHMS Aerogel Tracking Y; Y (cm); Number of Entries / 1 cm'  P.aero.yAtAero 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
+TH2F paero_xytrack 'SHMS Aerogel Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' P.aero.yAtAero P.aero.xAtAero 120 -60 60 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
+
+TH2F paero_x_vs_npe 'SHMS Aerogel X vs NPE; NPE / 0.5 PE ; X (cm) / 1 cm' P.aero.npeSum P.aero.xAtAero 100 0 50 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
+TH2F paero_y_vs_npe 'SHMS Aerogel Y vs NPE; NPE / 0.5 PE ; Y (cm) / 1 cm' P.aero.npeSum P.aero.yAtAero 100 0 50 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
diff --git a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
index c34d7c8891d6d1fdfb3243e8df3cd550155301af..4b5291ab17d00ca432e7f90a9b275922a334d3ce 100644
--- a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
@@ -7,32 +7,57 @@
 # TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
 #-------------------------------------------------------------------------------------
 
-TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposited (GeV); Number of Entries / 0.1 GeV' P.cal.etrack 100 0 10 P.cal.etrack>0.0 
-TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0
-TH1F pcal_etracknorm_track 'SHMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0&&P.dc.ntrack>0
-TH1F pcal_enenorm_track_elec 'SHMS Cal energy/p (npeSum > .5&&abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH1F pcal_enenorm_track_pion 'SHMS Cal energy/p (npeSum <.5&&abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH2F pcal_ene_2dtrack 'SHMS Cal energy v energy track' P.cal.etrack P.cal.etot 1000 0. 5. 1000 0. 5. P.dc.ntrack>0
-TH2F pcal_delta_etrack 'SHMS Delta v Cal energy/p ' P.cal.etracknorm P.gtr.dp 60 0. 1.5 80 -15. 25. P.dc.ntrack>0
-TH2F pcal_ngnpe_etrack 'SHMS NG Cer Npe v Cal energy/p' P.cal.etracknorm P.ngcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
-TH2F pcal_hgnpe_etrack 'SHMS HG Cer Npe v Cal energy/p' P.cal.etracknorm P.hgcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
+TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.etrack 1000 0 10 P.cal.etrack>0.0 
+TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.001 ' P.cal.etracknorm 2000 0 2 P.cal.etracknorm>0.0
+TH1F pcal_etracknorm_track 'SHMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.001 ' P.cal.etracknorm 2000 0 2 P.cal.etracknorm>0.0&&P.dc.ntrack>0
+TH1F pcal_etracknorm_track_elec 'SHMS Cal E/p Elec (npeSum>.5 && abs(del)<8); E/p; Entries / 0.001' P.cal.etracknorm 2000 0. 2 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+TH1F pcal_etracknorm_track_pion 'SHMS Cal E/p Pion (npeSum<.5 && abs(del)<8); E/p; Entries / 0.001' P.cal.etracknorm 2000 0. 2 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+TH1F pcal_etrack_track_elec 'SHMS Cal Electron Energy (npeSum>.5 && abs(del)<8); etrack; Entries / 0.01 GeV' P.cal.etrack 1000 0. 10 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+TH1F pcal_etrack_track_pion 'SHMS Cal Pion Energy (npeSum<.5 && abs(del)<8); etrack; Entries / 0.01 GeV' P.cal.etrack 1000 0. 10 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+TH2F pcal_etot_etrack  'SHMS Cal energy vs. track energy; Track Energy Deposition (GeV) / 0.01 GeV; Total Energy (GeV) / 0.01 GeV' P.cal.etrack P.cal.etot 1000 0. 10. 1000 0. 10. P.dc.ntrack>0
+TH2F pcal_ngnpe_etracknorm 'SHMS NG Cer Npe vs. Cal E/p; Normalized Track Energy Deposition / 0.001; ngcer NPE / 0.025 NPE' P.cal.etracknorm P.ngcer.npeSum 2000 0. 2 60 0. 15. P.dc.ntrack>0
+TH2F pcal_hgnpe_etracknorm 'SHMS HG Cer Npe vs. Cal E/p; Normalized Track Energy Deposition / 0.001; hgcer NPE / 0.025 NPE' P.cal.etracknorm P.hgcer.npeSum 2000 0. 2 60 0. 15. P.dc.ntrack>0
 
 #-------------------------------
 # SHMS PID AND ACCEPTANCE PLOTS
 #-------------------------------
 
-TH2F ngc_vs_prshw 'SHMS NGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC Total N.P.E. / 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 hgc_vs_prshw 'SHMS HGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC Total N.P.E. / 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 pcal_shw_vs_prshw '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 delta_vs_etracknorm 'SHMS Delta. vs. Normalized Track Energy; Calorimeter Normalized Track Energy; Momentum Acceptance / 0.1 %' P.cal.etracknorm P.gtr.dp 200 0 2 400 -15 25 P.cal.etracknorm>0.0&&P.dc.ntrack>0 
+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&&elec_all
+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&&pi_all
+
+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&&elec_all
+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&&pi_all
+
+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&&elec_all
+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&&pi_all
+
+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&&elec_all
+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&&pi_all
 
 #---------------------------
 #  CLUSTERING PLOTS
 #---------------------------
 
-TH1F pcal_xclusttrack 'SHMS Cal X pos' P.cal.xclusttrack 200 -100. 100. P.cal.nclusttrack>-1
-TH1F pcal_xdiff 'SHMS Cal X pos - X track' P.cal.xclusttrack-P.cal.xtrack 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH2F pcal_xdiff_v_xtr 'SHMS Cal X pos - X track v Xtr' P.cal.xtrack P.cal.xclusttrack-P.cal.xtrack 200 -100. 100. 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack 'SHMS Cal X pos of track' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack1 'SHMS Cal X pos of track no matching clust' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-TH1F pcal_xtrack2 'SHMS Cal X pos of track no matching clust number of cluster=1' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+TH1F pcal_xclusttrack 'SHMS Cal Cluster X Pos; Cluster X (cm); Entries / 1 cm' P.cal.xclusttrack 200 -100. 100. P.cal.nclusttrack>-1
+TH1F pcal_xdiff       'SHMS Cal Cluster X - Track X; Cluster X - Track X (cm); Entries / 0.2 cm' P.cal.xclusttrack-P.cal.xtrack 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH2F pcal_xdiff_v_xtr 'SHMS Cal (Cluster X- Track X) vs. (Track X); Track X (cm) / 0.2 cm; Cluster X - Track X (cm) / 0.2 cm' P.cal.xtrack P.cal.xclusttrack-P.cal.xtrack 1000 -100. 100. 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH1F pcal_xtrack      'SHMS Cal Track X; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH1F pcal_xtrack1     'SHMS Cal Track x pos with no matching clust; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+TH1F pcal_xtrack2     'SHMS Cal Track x pos with no matching clust number of cluster=1; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+TH1F pcal_yclusttrack 'SHMS Cal Cluster y Pos; Cluster y (cm); Entries / 1 cm' P.cal.yclusttrack 200 -100. 100. P.cal.nclusttrack>-1
+TH1F pcal_ydiff       'SHMS Cal Cluster y - Track y; Cluster y - Track y (cm); Entries / 0.2 cm' P.cal.yclusttrack-P.cal.ytrack 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH2F pcal_ydiff_v_ytr 'SHMS Cal (Cluster y - Track y) vs. (Track y); Track y (cm) / 0.2 cm; Cluster y - Track y (cm) / 0.2 cm' P.cal.ytrack P.cal.yclusttrack-P.cal.ytrack 1000 -100. 100. 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH1F pcal_ytrack      'SHMS Cal Track y; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH1F pcal_ytrack1     'SHMS Cal Track y pos with no matching clust; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+TH1F pcal_ytrack2     'SHMS Cal Track y pos with no matching clust number of cluster=1; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&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&&elec_all
+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&&elec_all
+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&&pi_all
+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&&pi_all
diff --git a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
index 78e6874fecf0fda875b1af6c7caee814cb6508b2..87ae82e952151cf268b667e5aeb3435b3e7cefdd 100644
--- a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
@@ -2,3 +2,8 @@
 # SHMS Drift Chambers *
 #**********************
 
+TH1F pdc_trk_beta_elec  'SHMS DC ElectronTrack Beta; Beta; Number of Entires'  P.tr.beta 300 -1.5 1.5 pCleanTrack&&elec_all
+TH1F pdc_trk_beta_pi    'SHMS DC Pion Track Beta; Beta; Number of Entires'     P.tr.beta 300 -1.5 1.5 pCleanTrack&&pi_all
+
+TH1F pdc_trk_mom_elec   'SHMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pCleanTrack&&elec_all
+TH1F pdc_trk_mom_pi     'SHMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV'     P.tr.p 600 0 6 pCleanTrack&&pi_all
diff --git a/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
index 2aa73688590148ea2aa00761036f3b4020ec72ac..7e1067fdd4f93876495949ced50824fec93862c2 100644
--- a/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
@@ -6,5 +6,16 @@
 # SHMS HGC TRACK MATCHING
 #--------------------------
 
-sTH1F phgcer_trk_match 'SHMS Noble Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' P.hgcer.numTracksMatched 4 0.5 4.5
-sTH1F phgcer_trk_fired 'SHMS Noble Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.hgcer.numTracksFired 4 0.5 4.5
+sTH1F phgcer_trk_match 'SHMS Heavy Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' P.hgcer.numTracksMatched 4 0.5 4.5
+sTH1F phgcer_trk_fired 'SHMS Heavy Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.hgcer.numTracksFired 4 0.5 4.5
+
+
+#--------------------------
+# SHMS HGC TRACK PROJECTION
+#--------------------------
+TH1F phgcer_xtrack  'SHMS Heavy Gas Cherenkov Tracking X; X (cm); Number of Entries / 1 cm' P.hgcer.xAtCer 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
+TH1F phgcer_ytrack  'SHMS Heavy Gas Cherenkov Tracking Y; Y (cm); Number of Entries / 1 cm' P.hgcer.yAtCer 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
+TH2F phgcer_xytrack 'SHMS Heavy Gas Cherenkov Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' P.hgcer.yAtCer P.hgcer.xAtCer 120 -60 60 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
+
+TH2F phgcer_x_vs_npe 'SHMS Heavy Gas Cherenkov X vs NPE; NPE / 0.5 PE ; X (cm) / 1 cm' P.hgcer.npeSum P.hgcer.xAtCer 100 0 50 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
+TH2F phgcer_y_vs_npe 'SHMS Heavy Gas Cherenkov Y vs NPE; NPE / 0.5 PE ; Y (cm) / 1 cm' P.hgcer.npeSum P.hgcer.yAtCer 100 0 50 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
diff --git a/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def b/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
index f5c3d7d1a4c7060cccc799ce8c9436faedf2c9e7..5231f77e4c54bf808574c1a879493278fccfe72d 100644
--- a/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
@@ -8,3 +8,13 @@
 
 sTH1F pngcer_trk_match 'SHMS Noble Gas Cherenkov Tracks Matches; PMT Number; Number of Tracks Matched' P.ngcer.numTracksMatched 4 0.5 4.5
 sTH1F pngcer_trk_fired 'SHMS Noble Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.ngcer.numTracksFired 4 0.5 4.5
+
+#--------------------------
+# SHMS NGC TRACK PROJECTION
+#--------------------------
+TH1F pngcer_xtrack  'SHMS Noble Gas Cherenkov Tracking X; X (cm); Number of Entries / 1 cm' P.ngcer.xAtCer 120 -60 60 P.ngcer.xAtCer!=0.0&&P.ngcer.yAtCer!=0
+TH1F pngcer_ytrack  'SHMS Noble Gas Cherenkov Tracking Y; Y (cm); Number of Entries / 1 cm' P.ngcer.yAtCer 120 -60 60 P.ngcer.xAtCer!=0.0&&P.ngcer.yAtCer!=0
+TH2F pngcer_xytrack 'SHMS Noble Gas Cherenkov Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' P.ngcer.yAtCer P.ngcer.xAtCer 120 -60 60 120 -60 60 P.ngcer.xAtCer!=0.0&&P.ngcer.yAtCer!=0
+
+TH2F pngcer_x_vs_npe 'SHMS Noble Gas Cherenkov X vs NPE; NPE / 0.5 PE ; X (cm) / 1 cm' P.ngcer.npeSum P.ngcer.xAtCer 100 0 50 120 -60 60 P.ngcer.xAtCer!=0.0&&P.ngcer.yAtCer!=0
+TH2F pngcer_y_vs_npe 'SHMS Noble Gas Cherenkov Y vs NPE; NPE / 0.5 PE ; Y (cm) / 1 cm' P.ngcer.npeSum P.ngcer.yAtCer 100 0 50 120 -60 60 P.ngcer.xAtCer!=0.0&&P.ngcer.yAtCer!=0
diff --git a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
index 405d161ea8369dce5012ecc97084d840551f6243..552e5bee7d97a5abb37d902f6a2cd18d1d84649c 100644
--- a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
@@ -14,19 +14,19 @@ TH1F ptrig_pT1_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot
 TH1F ptrig_pT2_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.shms.pT2_tdcMultiplicity 11 0 11
 TH1F ptrig_pT3_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 38); Raw TDC Multiplicity; Counts / 10' T.shms.pT3_tdcMultiplicity 11 0 11
 
-TH1F ptrig_p1x_good_tdc 'SHMS p1x Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1X_tdcTime 350 0 3500 T.shms.p1X_tdcMultiplicity==1
-TH1F ptrig_p1y_good_tdc 'SHMS p1y Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1Y_tdcTime 350 0 3500 T.shms.p1Y_tdcMultiplicity==1
-TH1F ptrig_p2x_good_tdc 'SHMS p2x Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2X_tdcTime 350 0 3500 T.shms.p2X_tdcMultiplicity==1
-TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2Y_tdcTime 350 0 3500 T.shms.p2Y_tdcMultiplicity==1
+TH1F ptrig_p1x_good_tdc 'SHMS p1x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1X_tdcTime 800 0 800 T.shms.p1X_tdcMultiplicity==1
+TH1F ptrig_p1y_good_tdc 'SHMS p1y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1Y_tdcTime 800 0 800 T.shms.p1Y_tdcMultiplicity==1
+TH1F ptrig_p2x_good_tdc 'SHMS p2x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p2X_tdcTime 800 0 800 T.shms.p2X_tdcMultiplicity==1
+TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p2Y_tdcTime 800 0 800 T.shms.p2Y_tdcMultiplicity==1
 
-TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1T_tdcTime 350 0 3500 T.shms.p1T_tdcMultiplicity==1
-TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2T_tdcTime 350 0 3500 T.shms.p2T_tdcMultiplicity==1
+TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1T_tdcTime 800 0 800 T.shms.p1T_tdcMultiplicity==1
+TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p2T_tdcTime 800 0 800 T.shms.p2T_tdcMultiplicity==1
 
-TH1F ptrig_pT1_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT1_tdcTime 350 0 3500 T.shms.pT1_tdcMultiplicity==1
-TH1F ptrig_pT2_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT2_tdcTime 350 0 3500 T.shms.pT2_tdcMultiplicity==1
-TH1F ptrig_pT3_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 38); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT3_tdcTime 350 0 3500 T.shms.pT3_tdcMultiplicity==1
+TH1F ptrig_pT1_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT1_tdcTime 800 0 800 T.shms.pT1_tdcMultiplicity==1
+TH1F ptrig_pT2_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT2_tdcTime 800 0 800 T.shms.pT2_tdcMultiplicity==1
+TH1F ptrig_pT3_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 38); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT3_tdcTime 800 0 800 T.shms.pT3_tdcMultiplicity==1
 
 TH2F ptrig_ch1xy_ch2x 'SHMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.shms.p1T_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1T_tdcMultiplicity==1
-TH2F ptrig_ch1x_ch2x 'SHMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.shms.p1X_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
-TH2F ptrig_ch1y_ch2x 'SHMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.shms.p1Y_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1Y_tdcMultiplicity==1
-TH2F ptrig_ch1y_ch1x 'SHMS Hodo Trig; 1X Trig (ns); 1Y Trig (ns)' T.shms.p1X_tdcTime T.shms.p1Y_tdcTime 200 100 300 200 100 300 T.shms.p1Y_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
+TH2F ptrig_ch1x_ch2x  'SHMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)'   T.shms.p1X_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
+TH2F ptrig_ch1y_ch2x  'SHMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)'   T.shms.p1Y_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1Y_tdcMultiplicity==1
+TH2F ptrig_ch1y_ch1x  'SHMS Hodo Trig; 1X Trig (ns); 1Y Trig (ns)'   T.shms.p1X_tdcTime T.shms.p1Y_tdcTime 200 100 300 200 100 300 T.shms.p1Y_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
index 45681726c41c3fe5c22b81adaf4fde18071da9b7..ed338b86744b80f920747a85fce1f36e9d301946 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
@@ -16,3 +16,15 @@
 #include "DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def"
 #include "DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def"
 #include "DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def"
+
+
+
+####################
+# TARGET VARIABLES
+####################
+TH2F pgtr_xtar_vs_ytar   'SHMS DC 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 DC 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 DC 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 DC 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 DC 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 DC 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
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
index 0241630986fcfcf1d3cfdc3dab2af6dc52459940..2d5a47b2ad013a25faf68a0f2385db1599503c77 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
@@ -84,11 +84,11 @@ TH2F pcal_shwr_adcErrFlg2D 'SHMS Shower FPGA Error Flag; PMT Number; Error Flag'
 
 #SHMS Shower RAW Occupancy and Multiplicity
 TH1F pcal_shwr_raw_occ 'SHMS Shower Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.cal.fly.adcCounter 224 0.5 224.5
-TH1F pcal_shwr_raw_mult 'SHMS Shower Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.cal.fly.totNumAdcHits 224 0.5 224.5
+TH1F pcal_shwr_raw_mult 'SHMS Shower Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.cal.fly.totNumAdcHits 40 0.5 40.5
 
 #SHMS Shower GOOD Occupancy and Multiplicity
 TH1F pcal_shwr_good_occ 'SHMS Shower Good Occupancy; PMT Number; Number of Good ADC Hits' P.cal.fly.numGoodAdcHits 224 0.5 224.5
-TH1F pcal_shwr_good_mult 'SHMS Shower Good Multiplicity; Numer of PMTs Hit; Total Number of Good ADC Hits' P.cal.fly.totNumGoodAdcHits 224 0.5 224.5
+TH1F pcal_shwr_good_mult 'SHMS Shower Good Multiplicity; Numer of PMTs Hit; Total Number of Good ADC Hits' P.cal.fly.totNumGoodAdcHits 40 0.5 40.5
 
 #SHMS Shower RAW PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES
 TH2F pcal_shwr_raw_pped_vs_pmt 'SHMS Shower Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 10 ADC Unit' P.cal.fly.adcCounter P.cal.fly.adcPedRaw 224 0.5 224.5 410 0 4100
diff --git a/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
index 5ead4e219cf58f07597a90db822dab8d5eb67e69..566804ff3533d108dd278e22860e884a85dde6d2 100644
--- a/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
+++ b/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
@@ -169,9 +169,11 @@ TH2F pdc2u1_residuals_vs_wirenum 'SHMS 2U1 DC Residuals vs. Wire Number; Wire Nu
 # SHMS DC TRACKING VARIABLES AT FOCAL PLANE
 #-------------------------------------------
 
-TH1F pdc_trk_mom 'SHMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6
-TH1F pdc_trk_beta 'SHMS DC Track Beta; Beta (GeV); Number of Entires' P.tr.beta 300 -1.5 1.5
-TH2F pdc_xfp_vs_yfp 'SHMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' P.dc.y_fp P.dc.x_fp 100 -50 50 100 -50 50
+TH1F pdc_trk_mom      'SHMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6
+TH1F pdc_trk_beta     'SHMS DC Track Beta; Beta (GeV); Number of Entires' P.tr.beta 300 -1.5 1.5
+TH2F pdc_xfp_vs_yfp   'SHMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' P.dc.y_fp P.dc.x_fp 100 -50 50 100 -50 50
 TH2F pdc_xpfp_vs_ypfp 'SHMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' P.dc.yp_fp P.dc.xp_fp 100 -.1 .1 100 -.1 .1
-TH2F pdc_xfp_vs_ypfp 'SHMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm'  P.dc.yp_fp P.dc.x_fp 100 -.1 .1 100 -50 50 
-TH2F pdc_xfp_vs_xpfp 'SHMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' P.dc.xp_fp P.dc.x_fp 100 -.1 .1 100 -50 50
\ No newline at end of file
+TH2F pdc_xfp_vs_ypfp  'SHMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm'  P.dc.yp_fp P.dc.x_fp 100 -.1 .1 100 -50 50 
+TH2F pdc_xfp_vs_xpfp  'SHMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' P.dc.xp_fp P.dc.x_fp 100 -.1 .1 100 -50 50
+TH2F pdc_yfp_vs_ypfp  'SHMS DC Y_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; Y_{fp} / 1 cm'  P.dc.yp_fp P.dc.y_fp 100 -.1 .1 100 -50 50
+TH2F pdc_yfp_vs_xpfp  'SHMS DC Y_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; Y_{fp} / 1 cm' P.dc.xp_fp P.dc.y_fp 100 -.1 .1 100 -50 50
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
index db7e4270dd573afc0cca5bc3d73b7f8ab7a20bbb..382abfb93d23c397afb8fd4a1fb41def9d2d5008 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
@@ -10,10 +10,10 @@ TH1F ptrig_p1y_tdc_raw 'SHMS p1y Raw TDC Time; Raw TDC Time (TDC Units); Counts
 TH1F ptrig_p2x_tdc_raw 'SHMS p2x Raw TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.p2X_tdcTimeRaw 4000 0 4000
 TH1F ptrig_p2y_tdc_raw 'SHMS p2y Raw TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.p2Y_tdcTimeRaw 4000 0 4000
 
-TH1F ptrig_p1x_tdc 'SHMS p1x TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.shms.p1X_tdcTime 4000 0 400
-TH1F ptrig_p1y_tdc 'SHMS p1y TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.shms.p1Y_tdcTime 4000 0 400
-TH1F ptrig_p2x_tdc 'SHMS p2x TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.shms.p2X_tdcTime 4000 0 400
-TH1F ptrig_p2y_tdc 'SHMS p2y TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.shms.p2Y_tdcTime 4000 0 400
+TH1F ptrig_p1x_tdc 'SHMS p1x TDC Time; TDC Time (ns); Counts / 1 ns;' T.shms.p1X_tdcTime 400 0 400
+TH1F ptrig_p1y_tdc 'SHMS p1y TDC Time; TDC Time (ns); Counts / 1 ns;' T.shms.p1Y_tdcTime 400 0 400
+TH1F ptrig_p2x_tdc 'SHMS p2x TDC Time; TDC Time (ns); Counts / 1 ns;' T.shms.p2X_tdcTime 400 0 400
+TH1F ptrig_p2y_tdc 'SHMS p2y TDC Time; TDC Time (ns); Counts / 1 ns;' T.shms.p2Y_tdcTime 400 0 400
 
 
 #-----------------------
@@ -22,8 +22,8 @@ TH1F ptrig_p2y_tdc 'SHMS p2y TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.shms.p
 TH1F ptrig_p1T_tdc_raw 'SHMS p1x/p1y Coincidence Raw TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.p1T_tdcTimeRaw 4000 0 4000
 TH1F ptrig_p2T_tdc_raw 'SHMS p2x/p2y Coincidence Raw TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.p2T_tdcTimeRaw 4000 0 4000
 
-TH1F ptrig_p1T_tdc 'SHMS p1x/p1y Coincidence TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.shms.p1T_tdcTime 4000 0 400
-TH1F ptrig_p2T_tdc 'SHMS p2x/p2y Coincidence TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.shms.p2T_tdcTime 4000 0 400
+TH1F ptrig_p1T_tdc 'SHMS p1x/p1y Coincidence TDC Time; TDC Time (ns); Counts / 1 ns;' T.shms.p1T_tdcTime 400 0 400
+TH1F ptrig_p2T_tdc 'SHMS p2x/p2y Coincidence TDC Time; TDC Time (ns); Counts / 1 ns;' T.shms.p2T_tdcTime 400 0 400
 
 
 #--------------
@@ -33,9 +33,9 @@ TH1F ptrig_pT1_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 20,
 TH1F ptrig_pT2_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 19, Channel 31); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT2_tdcTimeRaw 4000 0 4000
 TH1F ptrig_pT3_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 19, Channel 38); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT3_tdcTimeRaw 4000 0 4000
 
-TH1F ptrig_pT1_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 20, Channel 15); TDC Time (ns); Counts / 0.1 ns;' T.shms.pT1_tdcTime 4000 0 800
-TH1F ptrig_pT2_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 31); TDC Time (ns); Counts / 0.1 ns;' T.shms.pT2_tdcTime 4000 0 800
-TH1F ptrig_pT3_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 38); TDC Time (ns); Counts / 0.1 ns;' T.shms.pT3_tdcTime 4000 0 800
+TH1F ptrig_pT1_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 20, Channel 15); TDC Time (ns); Counts / 1 ns;' T.shms.pT1_tdcTime 800 0 800
+TH1F ptrig_pT2_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 31); TDC Time (ns); Counts / 1 ns;' T.shms.pT2_tdcTime 800 0 800
+TH1F ptrig_pT3_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 38); TDC Time (ns); Counts / 1 ns;' T.shms.pT3_tdcTime 800 0 800
 
 
 #---------
diff --git a/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg b/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
index 529ef9e03898c941dc9b80c31351addf568b9a46..1130bca69fbddf23ee2034667e76e69c0b247c83 100644
--- a/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
+++ b/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
@@ -35,57 +35,50 @@ phodo_1y_good_pped_vs_pmt_neg -nostat
 phodo_2x_good_pped_vs_pmt_neg -nostat
 phodo_2y_good_pped_vs_pmt_neg -nostat
 
-newpage 4 3
-title SHMS DC Wiremaps
-pdc1u1_wirenum -nostat
-pdc1u2_wirenum -nostat
-pdc2u1_wirenum -nostat
-pdc2u2_wirenum -nostat
-pdc1x1_wirenum -nostat
-pdc1x2_wirenum -nostat
-pdc2x1_wirenum -nostat
-pdc2x2_wirenum -nostat
-pdc1v1_wirenum -nostat
-pdc1v2_wirenum -nostat
-pdc2v1_wirenum -nostat
-pdc2v2_wirenum -nostat
-
-newpage 4 3
+newpage 2 3
+title SHMS DC Wire Hits
+macro UTIL/GEN/overlay2.C("pdc1u1_wirenum","pdc2v1_wirenum","1U1","2V1")
+macro UTIL/GEN/overlay2.C("pdc1u2_wirenum","pdc2v2_wirenum","1U2","2V2")
+macro UTIL/GEN/overlay2.C("pdc1x1_wirenum","pdc2x1_wirenum","1X1","2X1")
+macro UTIL/GEN/overlay2.C("pdc1x2_wirenum","pdc2x2_wirenum","1X2","2X2")
+macro UTIL/GEN/overlay2.C("pdc1v1_wirenum","pdc2u1_wirenum","1V1","2U1")
+macro UTIL/GEN/overlay2.C("pdc1v2_wirenum","pdc2u2_wirenum","1V2","2U2")
+
+newpage 2 3
 title SHMS DC Drift Distance
-pdc1u1_ddist -nostat
-pdc1u2_ddist -nostat
-pdc2u1_ddist -nostat
-pdc2u2_ddist -nostat
-pdc1x1_ddist -nostat
-pdc1x2_ddist -nostat
-pdc2x1_ddist -nostat
-pdc2x2_ddist -nostat
-pdc1v1_ddist -nostat
-pdc1v2_ddist -nostat
-pdc2v1_ddist -nostat
-pdc2v2_ddist -nostat
-
-newpage 4 3
+macro UTIL/GEN/overlay2.C("pdc1u1_ddist","pdc2v1_ddist","1U1","2V1")
+macro UTIL/GEN/overlay2.C("pdc1u2_ddist","pdc2v2_ddist","1U2","2V2")
+macro UTIL/GEN/overlay2.C("pdc1x1_ddist","pdc2x1_ddist","1X1","2X1")
+macro UTIL/GEN/overlay2.C("pdc1x2_ddist","pdc2x2_ddist","1X2","2X2")
+macro UTIL/GEN/overlay2.C("pdc1v1_ddist","pdc2u1_ddist","1V1","2U1")
+macro UTIL/GEN/overlay2.C("pdc1v2_ddist","pdc2u2_ddist","1V2","2U2")
+
+newpage 2 3
 title SHMS DC Drift Time
-pdc1u1_drifttime -nostat
-pdc1u2_drifttime -nostat
-pdc2u1_drifttime -nostat
-pdc2u2_drifttime -nostat
-pdc1x1_drifttime -nostat
-pdc1x2_drifttime -nostat
-pdc2x1_drifttime -nostat
-pdc2x2_drifttime -nostat
-pdc1v1_drifttime -nostat
-pdc1v2_drifttime -nostat
-pdc2v1_drifttime -nostat
-pdc2v2_drifttime -nostat
-
-newpage 2 2
-title SHMS DC Focal Plane
+macro UTIL/GEN/overlay2.C("pdc1u1_drifttime","pdc2v1_drifttime","1U1","2V1")
+macro UTIL/GEN/overlay2.C("pdc1u2_drifttime","pdc2v1_drifttime","1U2","2V2")
+macro UTIL/GEN/overlay2.C("pdc1x1_drifttime","pdc2x1_drifttime","1X1","2X1")
+macro UTIL/GEN/overlay2.C("pdc1x2_drifttime","pdc2x2_drifttime","1X2","2X2")
+macro UTIL/GEN/overlay2.C("pdc1v1_drifttime","pdc2u1_drifttime","1V1","2U1")
+macro UTIL/GEN/overlay2.C("pdc1v2_drifttime","pdc2u2_drifttime","1V2","2U2")
+
+newpage 3 2 logz
+title SHMS Focal Plane
 pdc_xfp_vs_yfp -nostat
 pdc_xpfp_vs_ypfp -nostat
 pdc_xfp_vs_xpfp -nostat
 pdc_xfp_vs_ypfp -nostat
+pdc_yfp_vs_xpfp -nostat
+pdc_yfp_vs_ypfp -nostat
+
+newpage 3 2 logz
+title SHMS Target
+pgtr_xtar_vs_ytar -nostat
+pgtr_xptar_vs_yptar -nostat
+pgtr_xtar_vs_xptar -nostat
+pgtr_xtar_vs_yptar -nostat
+pgtr_ytar_vs_xptar -nostat
+pgtr_ytar_vs_yptar -nostat
 
 newpage 3 2
 title SHMS Cherenkov Occ/Mult
@@ -103,7 +96,7 @@ pngcer_good_pped_vs_pmt -nostat
 phgcer_good_pped_vs_pmt -nostat
 paero_good_pped_vs_pmt_neg -nostat
 
-newpage 4 2
+newpage 4 4 logz
 title SHMS Cherenkov NPE
 paero_npe_pos -nostat
 paero_npe_neg -nostat
@@ -113,6 +106,14 @@ paero_tot_npe_pos -nostat
 paero_tot_npe_neg -nostat
 pngcer_tot_npe -nostat
 phgcer_tot_npe -nostat
+paero_x_vs_npe -nostat
+paero_x_vs_npe -nostat
+pngcer_x_vs_npe -nostat
+phgcer_x_vs_npe -nostat
+paero_y_vs_npe -nostat
+paero_y_vs_npe -nostat
+pngcer_y_vs_npe -nostat
+phgcer_y_vs_npe -nostat
 
 newpage 2 2
 title SHMS Calorimeter Occ/Mult
@@ -129,30 +130,30 @@ pcal_prshwr_good_pped_vs_pmt_neg -nostat
 
 newpage 4 3
 title SHMS DC Reference Times
-ptrig_pdc_ref1
-ptrig_pdc_ref2
-ptrig_pdc_ref3
-ptrig_pdc_ref4
-ptrig_pdc_ref5
-ptrig_pdc_ref6
-ptrig_pdc_ref7
-ptrig_pdc_ref8
-ptrig_pdc_ref9
-ptrig_pdc_ref10
+ptrig_pdc_ref1 -nostat
+ptrig_pdc_ref2 -nostat
+ptrig_pdc_ref3 -nostat
+ptrig_pdc_ref4 -nostat
+ptrig_pdc_ref5 -nostat
+ptrig_pdc_ref6 -nostat
+ptrig_pdc_ref7 -nostat
+ptrig_pdc_ref8 -nostat
+ptrig_pdc_ref9 -nostat
+ptrig_pdc_ref10 -nostat
 
 newpage 4 3
 title SHMS Trigger Reference Times
-ptrig_p1x_tdc -nostat
-ptrig_p1y_tdc -nostat
-ptrig_p2x_tdc -nostat
-ptrig_p2y_tdc -nostat
-ptrig_p1T_tdc -nostat
-ptrig_p2T_tdc -nostat
-ptrig_pT1_tdc -nostat
-ptrig_pT2_tdc -nostat
-ptrig_pT3_tdc -nostat
-
-newpage 2 2
+ptrig_p1x_good_tdc -nostat
+ptrig_p1y_good_tdc -nostat
+ptrig_p2x_good_tdc -nostat
+ptrig_p2y_good_tdc -nostat
+ptrig_p1T_good_tdc -nostat
+ptrig_p2T_good_tdc -nostat
+ptrig_pT1_good_tdc -nostat
+ptrig_pT2_good_tdc -nostat
+ptrig_pT3_good_tdc -nostat
+
+newpage 2 1
 title SHMS Fast Raster
 pFRA_XvsY -nostat
 pFRB_XvsY -nostat
@@ -164,11 +165,46 @@ pkin_w -nostat
 pkin_omega -nostat
 pkin_theta -nostat
 
-newpage 2 3 logz
+newpage 4 2 logz
+title SHMS Tracked Variables
+pcal_xtrack -nostat
+pcal_xclusttrack -nostat
+pcal_xdiff -nostat
+pcal_xdiff_v_xtr -nostat
+pcal_ytrack -nostat
+pcal_yclusttrack -nostat
+pcal_ydiff -nostat
+pcal_ydiff_v_ytr -nostat
+
+newpage 2 4 logz
 title SHMS PID
 hgc_vs_prshw -nostat
 ngc_vs_prshw -nostat
 pcal_shw_vs_prshw -nostat
-delta_vs_etracknorm -nostat
-pdc_trk_mom -nostat
+pcal_delta_etracknorm -nostat
 pdc_trk_beta -nostat
+pdc_trk_mom -nostat
+pcal_xtrack_vs_etrack -nostat
+pcal_ytrack_vs_etrack -nostat
+
+newpage 2 4 logz
+title SHMS PID (electrons)
+hgc_vs_prshw_elec -nostat
+ngc_vs_prshw_elec -nostat
+pcal_shw_vs_prshw_elec -nostat
+pcal_delta_etracknorm_elec -nostat
+pdc_trk_beta_elec -nostat
+pdc_trk_mom_elec -nostat
+pcal_xtrack_vs_etrack_elec -nostat
+pcal_ytrack_vs_etrack_elec -nostat
+
+newpage 2 4 logz
+title SHMS PID (pions)
+hgc_vs_prshw_pi -nostat
+ngc_vs_prshw_pi -nostat
+pcal_shw_vs_prshw_pi -nostat
+pcal_delta_etracknorm_pi -nostat
+pdc_trk_beta_pi -nostat
+pdc_trk_mom_pi -nostat
+pcal_xtrack_vs_etrack_pi -nostat
+pcal_ytrack_vs_etrack_pi -nostat
diff --git a/onlineGUI/UTIL/GEN/overlay2.C b/onlineGUI/UTIL/GEN/overlay2.C
index 272b32f87d944614d88afe1ae9f93a928d6e666d..282776711b44b26c7adab04844b0b35c1e41d81e 100755
--- a/onlineGUI/UTIL/GEN/overlay2.C
+++ b/onlineGUI/UTIL/GEN/overlay2.C
@@ -27,6 +27,8 @@ void overlay2(TString hist1name, TString hist2name, TString label1="", TString l
     H1->SetLineWidth(2);
     H2->SetLineWidth(2);
     H2->SetLineColor(2);
+    H1->SetMinimum(1);
+    H2->SetMinimum(1);
     H1->SetStats(0);
     H2->SetStats(0);
     H1->SetTitle(htitle);