diff --git a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
index b0316c8b27b56a8648beadc0bb6fe9d7601e178a..ed29b288f569e2a345d449094c9c906fc5caf238 100644
--- a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
+++ b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
@@ -7,7 +7,6 @@ block H.cer.*
block H.dc.*
block H.tr.*
block H.hod.*
-block H.aero.*
block H.cal.*
block H.gtr.*
block H.kin.*
diff --git a/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def b/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
index 6be2502ab2ce356f77a345091fbf52bbfe2c79ef..a3241a0d451d911781308eeb8ba05d852e91b952 100644
--- a/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
+++ b/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
@@ -1,3 +1,57 @@
#******************
# HMS CALORIMETER
#******************
+#-------------------------------------------------------------------------------------
+# HMS PRE-SHOWER AND SHOWER (CALORIMETER) TOTAL ENERGY DEPOSITION
+# TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
+#-------------------------------------------------------------------------------------
+
+TH1F hcal_etrack 'HMS Calorimeter Total Track Energy; Track Energy Deposition (GeV); Number of Entries / 0.1 GeV' H.cal.etrack 100 0 10 H.cal.etrack>0.0
+TH1F hcal_etracknorm 'HMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' H.cal.etracknorm 100 0 10 H.cal.etracknorm>0.0
+TH1F hcal_etracknorm_track 'HMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' H.cal.etracknorm 100 0 10 H.cal.etracknorm>0.0&&H.dc.ntrack>0
+TH1F hcal_etracknorm_track_elec 'HMS Cal E/p Elec (npeSum>.5 && abs(del)<8); E/p; Entries / 0.005' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum>.5&&H.cer.npeSum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+TH1F hcal_etracknorm_track_pion 'HMS Cal E/p Pion (npeSum<.5 && abs(del)<8); E/p; Entries / 0.005' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum<.5&&H.cer.npeSum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+TH1F hcal_etrack_track_elec 'HMS Cal Electron Energy (npeSum>.5 && abs(del)<8); etrack; Entries / 0.005' H.cal.etrack 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum>.5&&H.cer.npeSum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+TH1F hcal_etrack_track_pion 'HMS Cal Pion Energy (npeSum<.5 && abs(del)<8); etrack; Entries / 0.005' H.cal.etrack 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum<.5&&H.cer.npeSum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+TH2F hcal_etot_etrack 'HMS Cal energy vs. track energy; Track Energy Deposition (GeV) / 0.005 GeV; Total Energy (GeV) / 0.005 GeV' H.cal.etrack H.cal.etot 1000 0. 5. 1000 0. 5. H.dc.ntrack>0
+TH2F hcal_npe_etracknorm 'HMS Cer Npe vs. Cal E/p; Normalized Track Energy Deposition / 0.005; cer NPE / 0.025 NPE' H.cal.etracknorm H.cer.npeSum 300 0. 1.5 60 0. 15. H.dc.ntrack>0
+
+#-------------------------------
+# HMS PID AND ACCEPTANCE PLOTS
+#-------------------------------
+
+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 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_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
+
+#---------------------------
+# CLUSTERING PLOTS
+#---------------------------
+
+TH1F hcal_xclusttrack 'HMS Cal Cluster X Pos; Cluster X (cm); Entries / 1 cm' H.cal.xclusttrack 200 -100. 100. H.cal.nclusttrack>-1
+TH1F hcal_xdiff 'HMS Cal Cluster X - Track X; Cluster X - Track X (cm); Entries / 0.2 cm' H.cal.xclusttrack-H.cal.xtrack 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH2F hcal_xdiff_v_xtr 'HMS Cal (Cluster X- Track X) vs. (Track X); Track X (cm) / 0.2 cm; Cluster X - Track X (cm) / 0.2 cm' H.cal.xtrack H.cal.xclusttrack-H.cal.xtrack 1000 -100. 100. 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH1F hcal_xtrack 'HMS Cal Track X; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH1F hcal_xtrack1 'HMS Cal Track x pos with no matching clust; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+TH1F hcal_xtrack2 'HMS Cal Track x pos with no matching clust number of cluster=1; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.cal.nclust==0&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+TH1F hcal_yclusttrack 'HMS Cal Cluster y Pos; Cluster y (cm); Entries / 1 cm' H.cal.yclusttrack 200 -100. 100. H.cal.nclusttrack>-1
+TH1F hcal_ydiff 'HMS Cal Cluster y - Track y; Cluster y - Track y (cm); Entries / 0.2 cm' H.cal.yclusttrack-H.cal.ytrack 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH2F hcal_ydiff_v_ytr 'HMS Cal (Cluster y - Track y) vs. (Track y); Track y (cm) / 0.2 cm; Cluster y - Track y (cm) / 0.2 cm' H.cal.ytrack H.cal.yclusttrack-H.cal.ytrack 1000 -100. 100. 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH1F hcal_ytrack 'HMS Cal Track y; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH1F hcal_ytrack1 'HMS Cal Track y pos with no matching clust; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+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_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_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
diff --git a/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def b/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
index 5330c8a14fc503e499583b52bd1a67432b2af7c1..a85f4dec26fb14c704d446608d085eeb25c7b1e1 100644
--- a/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
+++ b/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
@@ -2,12 +2,19 @@
# HMS Gas Cherenkov *
#********************
-
-
-
#--------------------------
# HMS Gas CER TRACK MATCHING
#--------------------------
TH1F hcer_trk_match 'HMS Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' H.cer.numTracksMatched 2 0.5 2.5
TH1F hcer_trk_fired 'HMS Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' H.cer.numTracksFired 2 0.5 2.5
+
+#--------------------------
+# HMS Gas CER TRACK PROJECTION
+#--------------------------
+TH1F hcer_xtrack 'HMS Cherenkov Tracking X; X (cm); Number of Entries / 1 cm' H.cer.xAtCer 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
+TH1F hcer_ytrack 'HMS Cherenkov Tracking Y; Y (cm); Number of Entries / 1 cm' H.cer.yAtCer 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
+TH2F hcer_xytrack 'HMS Cherenkov Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' H.cer.yAtCer H.cer.xAtCer 120 -60 60 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
+
+TH2F hcer_x_vs_npe 'HMS Cherenkov X vs NPE; NPE / 0.5 PE ; X (cm) / 1 cm' H.cer.npeSum H.cer.xAtCer 100 0 50 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
+TH2F hcer_y_vs_npe 'HMS Cherenkov Y vs NPE; NPE / 0.5 PE ; Y (cm) / 1 cm' H.cer.npeSum H.cer.yAtCer 100 0 50 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
diff --git a/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def b/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
index e3307524e8703d15779912ea519f60df0a99a33d..72e374472e614e0069f572db253bac5d03304480 100644
--- a/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
+++ b/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
@@ -2,4 +2,8 @@
# HMS Drift Chambers *
#**********************
-#include "DEF-files/HMS/TEST_STANDS/DC/hdcana.def"
+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_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
diff --git a/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def b/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def
index 8dd900b2eaa75ebcb4c58c3b078cacbe39016e7d..cbe7388598c4e16b453c33223b75b278520b38bb 100644
--- a/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def
+++ b/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def
@@ -13,4 +13,4 @@ TH1F hhodo_beta 'HMS Hodo Beta; Beta; Number of Entries / 0.02' H.hod.beta 100 0
TH1F hhodo_fpHitsTime 'HMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' H.hod.fpHitsTime 90 0 90
TH1F hhodo_starttime 'HMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' H.hod.starttime 90 0 90
TH1F hhodo_good_startime 'HMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' H.hod.goodstarttime 90 0 90
-TH2F hhodo_xhod_vs_yhod 'HMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' H.hod.y_hodo H.hod.x_hodo 1000 -50 50 1000 -50 50
+#TH2F hhodo_xhod_vs_yhod 'HMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' H.hod.y_hodo H.hod.x_hodo 1000 -50 50 1000 -50 50
diff --git a/DEF-files/HMS/PRODUCTION/KIN/hkin_histos.def b/DEF-files/HMS/PRODUCTION/KIN/hkin_histos.def
index 07e76a3cc638e9e376c3b8269f4e6da6eff0b5c6..1353abe44a7b7eedad9fe5d87c170f65c8e2e06e 100644
--- a/DEF-files/HMS/PRODUCTION/KIN/hkin_histos.def
+++ b/DEF-files/HMS/PRODUCTION/KIN/hkin_histos.def
@@ -8,4 +8,4 @@ TH1F hkin_q2 'HMS Q^{2}; Q^{2} (GeV^{2}); Number of Entries / 0.050 GeV^{2}' H.k
TH1F hkin_omega 'HMS Omega; E_{beam} - E_{scat} (GeV); Number of Entries / 0.050 GeV' H.kin.omega 100 0 5
TH1F hkin_w2 'HMS W^{2}; W^{2} (GeV^{2}); Number of Entries / 0.100 GeV^{2}' H.kin.W2 100 0 10
TH1F hkin_w 'HMS W; W (GeV); Number of Entries / 0.050 GeV' H.kin.W 100 0 5
-TH1F hkin_theta 'HMS Scattering Angle Theta; HMS Scattering Angle (deg); Number of Entries / 0.06 deg' H.kin.scat_ang_deg 100 12 18
\ No newline at end of file
+TH1F hkin_theta 'HMS Scattering Angle Theta; HMS Scattering Angle (deg); Number of Entries / 0.06 deg' H.kin.scat_ang_deg 100 12 18
diff --git a/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def b/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def
index f0aee556a14b175e272f09fd08577163a3debf1e..4da6fac0987e298ce9b09fcd6fdbe7ec00bae4aa 100644
--- a/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def
+++ b/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def
@@ -10,13 +10,13 @@ formula FRXB_V H.rb.raster.frxbRawAdc*(1./4096.)/25.
formula FRYA_V H.rb.raster.fryaRawAdc*(1./4096.)/25.
formula FRYB_V H.rb.raster.frybRawAdc*(1./4096.)/25.
-TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' H.rb.raster.frxaRawAdc 1000 0 100000
-TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' H.rb.raster.frxbRawAdc 1000 0 100000
-TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' H.rb.raster.fryaRawAdc 1000 0 100000
-TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' H.rb.raster.frybRawAdc 1000 0 100000
-TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
-TH2F pFRA_XvsY 'SHMS FRA X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
-TH2F pFRB_XvsY 'SHMS FRB X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
+TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' H.rb.raster.frxaRawAdc 1000 0 100000
+TH1F hFRXA_V 'HMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
+TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' H.rb.raster.frxbRawAdc 1000 0 100000
+TH1F hFRXB_V 'HMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
+TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' H.rb.raster.fryaRawAdc 1000 0 100000
+TH1F hFRYA_V 'HMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
+TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' H.rb.raster.frybRawAdc 1000 0 100000
+TH1F hFRYB_V 'HMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
+TH2F hFRA_XvsY 'HMS FRA X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
+TH2F hFRB_XvsY 'HMS FRB X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
diff --git a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
index a3d61b4619fd56d9f43ac2e04cbe4b5d7a0c8b2e..2c343ff37b86c614f84526a58742a290d82188bf 100644
--- a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
@@ -1,3 +1,29 @@
#********************
# Trigger Apparatus *
#********************
+TH1F htrig_h1x_tdc_mult 'HMS h1x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h1X_tdcMultiplicity 11 0 11
+TH1F htrig_h1y_tdc_mult 'HMS h1y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h1Y_tdcMultiplicity 11 0 11
+TH1F htrig_h2x_tdc_mult 'HMS h2x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h2X_tdcMultiplicity 11 0 11
+TH1F htrig_h2y_tdc_mult 'HMS h2y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h2Y_tdcMultiplicity 11 0 11
+
+TH1F htrig_h1T_tdc_mult 'HMS h1x/h1y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h1T_tdcMultiplicity 11 0 11
+TH1F htrig_h2T_tdc_mult 'HMS h2x/h2y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h2T_tdcMultiplicity 11 0 11
+
+TH1F htrig_hT1_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 20, Channel 15); Raw TDC Multiplicity; Counts / 10' T.hms.hT1_tdcMultiplicity 11 0 11
+TH1F htrig_hT2_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.hms.hT2_tdcMultiplicity 11 0 11
+
+TH1F htrig_h1x_good_tdc 'HMS h1x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h1X_tdcTime 800 0 800 T.hms.h1X_tdcMultiplicity==1
+TH1F htrig_h1y_good_tdc 'HMS h1y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h1Y_tdcTime 800 0 800 T.hms.h1Y_tdcMultiplicity==1
+TH1F htrig_h2x_good_tdc 'HMS h2x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h2X_tdcTime 800 0 800 T.hms.h2X_tdcMultiplicity==1
+TH1F htrig_h2y_good_tdc 'HMS h2y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h2Y_tdcTime 800 0 800 T.hms.h2Y_tdcMultiplicity==1
+
+TH1F htrig_h1T_good_tdc 'HMS h1x/h1y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h1T_tdcTime 350 0 3500 T.hms.h1T_tdcMultiplicity==1
+TH1F htrig_h2T_good_tdc 'HMS h2x/h2y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h2T_tdcTime 350 0 3500 T.hms.h2T_tdcMultiplicity==1
+
+TH1F htrig_hT1_good_tdc 'HMS T1 Coincidence Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (ns); Counts / 1 ns' T.hms.hT1_tdcTime 350 0 3500 T.hms.hT1_tdcMultiplicity==1
+TH1F htrig_hT2_good_tdc 'HMS T2 Coincidence Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (ns); Counts / 1 ns' T.hms.hT2_tdcTime 350 0 3500 T.hms.hT2_tdcMultiplicity==1
+
+TH2F htrig_ch1xy_ch2x 'HMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.hms.h1T_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300 T.hms.h2X_tdcMultiplicity==1&&T.hms.h1T_tdcMultiplicity==1
+TH2F htrig_ch1x_ch2x 'HMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.hms.h1X_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300 T.hms.h2X_tdcMultiplicity==1&&T.hms.h1X_tdcMultiplicity==1
+TH2F htrig_ch1y_ch2x 'HMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.hms.h1Y_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300 T.hms.h2X_tdcMultiplicity==1&&T.hms.h1Y_tdcMultiplicity==1
+TH2F htrig_ch1y_ch1x 'HMS Hodo Trig; 1X Trig (ns); 1Y Trig (ns)' T.hms.h1X_tdcTime T.hms.h1Y_tdcTime 200 100 300 200 100 300 T.hms.h1Y_tdcMultiplicity==1&&T.hms.h1X_tdcMultiplicity==1
diff --git a/DEF-files/HMS/PRODUCTION/hstackana.def b/DEF-files/HMS/PRODUCTION/hstackana.def
deleted file mode 100644
index 54f72690aa83551c8e152dda550a5cddd85b6263..0000000000000000000000000000000000000000
--- a/DEF-files/HMS/PRODUCTION/hstackana.def
+++ /dev/null
@@ -1,61 +0,0 @@
-
-#********************
-# Block Definitions *
-#********************
-
-block T.hms.*
-block H.cer.*
-block H.dc.*
-block H.tr.*
-block H.hod.*
-block H.aero.*
-block H.cal.*
-block H.gtr.*
-block H.kin.*
-
-
-#--------------------------
-# HMS Gas CER TRACK MATCHING
-#--------------------------
-
-TH1F hcer_trk_match 'HMS Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' H.cer.numTracksMatched 2 0.5 2.5
-TH1F hcer_trk_fired 'HMS Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' H.cer.numTracksFired 2 0.5 2.5
-
-#----------------------------------------------------------------
-# HMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
-#----------------------------------------------------------------
-
-TH1F hhodo_beta_notrack 'HMS Hodo Calculated Beta Without Track Info; Beta; Number of Entries / 0.02' H.hod.betanotrack 100 0 2.0 H.hod.betanotrack>0.0
-TH1F hhodo_beta 'HMS Hodo Beta; Beta; Number of Entries / 0.02' H.hod.beta 100 0 2.0 H.hod.beta>0.0
-TH1F hhodo_fpHitsTime 'HMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' H.hod.fpHitsTime 90 0 90
-TH1F hhodo_starttime 'HMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' H.hod.starttime 90 0 90
-TH1F hhodo_good_startime 'HMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' H.hod.goodstarttime 90 0 90
-TH2F hhodo_xhod_vs_yhod 'HMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' H.hod.y_hodo H.hod.x_hodo 1000 -50 50 1000 -50 50
-
-
-#*****************************************
-# HMS Single Arm Primary (Scattered Beam)
-# Kinematic Quantities
-#*****************************************
-
-TH1F hkin_q2 'HMS Q^{2}; Q^{2} (GeV^{2}); Number of Entries / 0.050 GeV^{2}' H.kin.Q2 100 0 5
-TH1F hkin_omega 'HMS Omega; E_{beam} - E_{scat} (GeV); Number of Entries / 0.050 GeV' H.kin.omega 100 0 5
-TH1F hkin_w2 'HMS W^{2}; W^{2} (GeV^{2}); Number of Entries / 0.100 GeV^{2}' H.kin.W2 100 0 10
-TH1F hkin_w 'HMS W; W (GeV); Number of Entries / 0.050 GeV' H.kin.W 100 0 5
-TH1F hkin_theta 'HMS Scattering Angle Theta; HMS Scattering Angle (deg); Number of Entries / 0.06 deg' H.kin.scat_ang_deg 100 12 18
-
-#******************
-# EPICS VARIABLES *
-#******************
-
-begin epics
-
-IBC3H00CRCUR4
-hac_bcm_average
-ibcm1
-ibcm2
-iunser
-itov3out
-itov4out
-
-end epics
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def b/DEF-files/HMS/PRODUCTION/hstackana_production.def
index 28d32e0b7c83fb0a2d8a49184b68ea0107baa58e..8e0f9ccf44c3a46ae6015d74564c75dde87d763e 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def
@@ -4,4 +4,24 @@
#include "DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def"
#include "DEF-files/HMS/TEST_STANDS/CAL/hcalana.def"
#include "DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def"
-#include "DEF-files/HMS/PRODUCTION/hstackana.def"
+
+#include "DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def"
+#include "DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def"
+#include "DEF-files/HMS/PRODUCTION/CER/hcer_histos.def"
+#include "DEF-files/HMS/PRODUCTION/DC/hdc_histos.def"
+#include "DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def"
+#include "DEF-files/HMS/PRODUCTION/KIN/hkin_histos.def"
+#include "DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def"
+#include "DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def"
+#include "DEF-files/HMS/PRODUCTION/EPICS/hepics_vars.def"
+
+
+####################
+# TARGET VARIABLES
+####################
+TH2F hgtr_xtar_vs_ytar 'HMS DC 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 DC 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 DC 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 DC 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 DC 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 DC 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
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
index 5d6bf529ace461910f7a32ab5d07550165505a61..7a87d0e4d574ce2a80737f5c8ed5d0d4b381b63c 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
@@ -167,7 +167,7 @@ realhdc1v1 goodHDC1v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)
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 goodHDC2y1 && ((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)
diff --git a/DEF-files/HMS/RASTER/hms_raster_simple.def b/DEF-files/HMS/RASTER/hms_raster_simple.def
index 62956cc02d1e3b4d69d6ec2ea8b91873deff9def..631e523b8ca315c16a0ce00ab1652680732fdb39 100644
--- a/DEF-files/HMS/RASTER/hms_raster_simple.def
+++ b/DEF-files/HMS/RASTER/hms_raster_simple.def
@@ -10,16 +10,16 @@ formula FRXB_V H.rb.raster.frxbRawAdc*(1./4096.)/25.
formula FRYA_V H.rb.raster.fryaRawAdc*(1./4096.)/25.
formula FRYB_V H.rb.raster.frybRawAdc*(1./4096.)/25.
-TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' H.rb.raster.frxaRawAdc 1000 0 100000
-TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' H.rb.raster.frxbRawAdc 1000 0 100000
-TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' H.rb.raster.fryaRawAdc 1000 0 100000
-TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' H.rb.raster.frybRawAdc 1000 0 100000
-TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
-TH2F pFRA_XvsY 'SHMS FRA X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
-TH2F pFRB_XvsY 'SHMS FRB X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
+TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' H.rb.raster.frxaRawAdc 1000 0 100000
+TH1F hFRXA_V 'HMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
+TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' H.rb.raster.frxbRawAdc 1000 0 100000
+TH1F hFRXB_V 'HMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
+TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' H.rb.raster.fryaRawAdc 1000 0 100000
+TH1F hFRYA_V 'HMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
+TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' H.rb.raster.frybRawAdc 1000 0 100000
+TH1F hFRYB_V 'HMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
+TH2F hFRA_XvsY 'HMS FRA X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
+TH2F hFRB_XvsY 'HMS FRB X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
#******************
# EPICS VARIABLES *
#******************
diff --git a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def
index a364cd34d30d479084b34c64af7a771c663bd0f7..53b157729d7319134aee55a96eb01e40cb288924 100644
--- a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def
+++ b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def
@@ -373,7 +373,3 @@ TH2F hhodo_1x_good_tdctime_tofcorr_vs_pmt_neg 'HMS 1X- Good TOF Corrected TDC Ti
TH2F hhodo_1y_good_tdctime_tofcorr_vs_pmt_neg 'HMS 1Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] H.hod.1y.GoodNegTdcTimeTOFCorr 10 0.5 10.5 1200 0 120 H.hod.1y.GoodNegTdcTimeTOFCorr>0.0
TH2F hhodo_2x_good_tdctime_tofcorr_vs_pmt_neg 'HMS 2X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] H.hod.2x.GoodNegTdcTimeTOFCorr 16 0.5 16.5 1200 0 120 H.hod.2x.GoodNegTdcTimeTOFCorr>0.0
TH2F hhodo_2y_good_tdctime_tofcorr_vs_pmt_neg 'HMS 2Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] H.hod.2y.GoodNegTdcTimeTOFCorr 10 0.5 10.5 1200 0 120 H.hod.2y.GoodNegTdcTimeTOFCorr>0.0
-
-
-
-
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
index 123c922b18cec32bd4a7eed95143c238b3cdb3ab..b52304eeaca0b5270ee5edcd7ceceadb020421ad 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
@@ -21,8 +21,8 @@ TH1F htrig_h2y_tdc 'HMS h2y TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.h2Y
TH1F htrig_h1T_tdc 'HMS h1X/h1Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.h1T_tdcTimeRaw 4000 0 4000
TH1F htrig_h2T_tdc 'HMS h2X/h2Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.h2T_tdcTimeRaw 4000 0 4000
-TH1F htrig_hT1_tdc 'HMS h1X/h1Y/h2X/h2Y Coincidence TDC Time (Slot 2); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT1_tdcTimeRaw 4000 0 4000
-TH1F htrig_hT2_tdc 'HMS h1X/h1Y/h2X/h2Y Coincidence TDC Time (Slot 20); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT2_tdcTimeRaw 4000 0 4000
+TH1F htrig_hT1_tdc 'HMS T1 Coincidence TDC Time (Slot 2); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT1_tdcTimeRaw 4000 0 4000
+TH1F htrig_hT2_tdc 'HMS T2 Coincidence TDC Time (Slot 20); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT2_tdcTimeRaw 4000 0 4000
#----------------------------
# HMS Raw DC TRIG Reference Time
@@ -84,7 +84,7 @@ TH1F htrig_hpreShwr_adc_rawpi 'HMS Pre-Shower Raw Pulse Integral; Raw Pulse Inte
TH1F htrig_hpreShwr_adc_rawpamp 'HMS Pre-Shower Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hPSHWR_adcPulseAmpRaw 410 -500 4000
TH1F htrig_hpreShwr_adc_rawptime 'HMS Pre-Shower Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hPSHWR_adcPulseTimeRaw 3000 0 3000
TH1F htrig_hpreShwr_adc_ptime 'HMS Pre-Shower Pulse Time; Pulse Time (ns); Counts ;' T.hms.hPSHWR_adcPulseTime 300 0 300
-TH1F htrig_hpreShwr_rawtdc 'HMS Pre-Shower Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWR_tdcTimeRaw 4000 -1000 1000
+#TH1F htrig_hpreShwr_rawtdc 'HMS Pre-Shower Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWR_tdcTimeRaw 4000 -1000 1000
TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRLO_tdcTimeRaw 4000 -500 2500
TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWRHI_tdcTimeRaw 4000 -500 2500
@@ -132,7 +132,7 @@ TH1F htrig_hdsum_tdc 'HMS hDsum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hm
TH1F htrig_hpreShwr_adc_pped 'HMS Pre-Shower Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hPSHWR_adcPed 500 -500 500
TH1F htrig_hpreShwr_adc_pi 'HMS Pre-Shower Pulse Integral; Pulse Integral (pC); Counts / 0.25 pC;' T.hms.hPSHWR_adcPulseInt 4000 -2000 15000
TH1F htrig_hpreShwr_adc_pamp 'HMS Pre-Shower Pulse Amplitude; Pulse Amplitude (mV); Counts / 2 mV;' T.hms.hPSHWR_adcPulseAmp 410 -500 3000
-TH1F htrig_hpreShwr_tdc 'HMS Pre-Shower TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hPSHWR_tdcTime 4000 -1000 1000
+#TH1F htrig_hpreShwr_tdc 'HMS Pre-Shower TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hPSHWR_tdcTime 4000 -1000 1000
#----------------------------------
# HMS Shower TRIG Pulse Profile
@@ -172,7 +172,7 @@ TH1F htrig_haersum_adc_rawpi 'HMS Aerogel Sum Raw Pulse Integral; Raw Pulse Inte
TH1F htrig_haersum_adc_rawpamp 'HMS Aerogel Sum Raw Pulse Amplitude; Raw Pulse Amplitude (ADC Units); Counts / 10 ADC Units;' T.hms.hAERSUM_adcPulseAmpRaw 410 0 4100
TH1F htrig_haersum_adc_rawptime 'HMS Aerogel Sum Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 10 ADC Units;' T.hms.hAERSUM_adcPulseTimeRaw 3000 0 3000
TH1F htrig_haersum_adc_ptime 'HMS Aerogel Sum Pulse Time; Raw Pulse Time (ns); Counts;' T.hms.hAERSUM_adcPulseTime 300 0 300
-TH1F htrig_haersum_rawtdc 'HMS Aerogel Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAERSUM_tdcTimeRaw 4000 0 40000
+#TH1F htrig_haersum_rawtdc 'HMS Aerogel Sum Raw TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAERSUM_tdcTimeRaw 4000 0 40000
#------------------------------------------
# HMS Aerogel TRIG Pulse Profile
@@ -181,6 +181,6 @@ TH1F htrig_haersum_rawtdc 'HMS Aerogel Sum Raw TDC Time; Raw TDC Time (TDC Units
TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hAERSUM_adcPed 500 0 5000
TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (pC); Counts / 0.25 pC;' T.hms.hAERSUM_adcPulseInt 4000 0 40000
TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (mV); Counts / 2 mV;' T.hms.hAERSUM_adcPulseAmp 410 0 4100
-TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hAERSUM_tdcTime 4000 0 40000
+#TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hAERSUM_tdcTime 4000 0 40000
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
index 8e75c5f4bfada46914a2df60959466cb110d7c4a..226a42cc7a3b81cfc19532c29bab80507da05867 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
@@ -72,11 +72,14 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Include golden track information
THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
gHaPhysics->Add(gtr);
- // Add Ideal Beam Apparatus
- THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
- gHaApps->Add(beam);
+// Add Rastered Beam Apparatus
+ THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
+ gHaApps->Add(beam);
+// Add Ideal Beam Apparatus
+ // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
+ // gHaApps->Add(beam);
// Add Physics Module to calculate primary (scattered) beam kinematics
- THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "IB");
+ THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "H.rb");
gHaPhysics->Add(hkin);
// Add handler for prestart event 125.
diff --git a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
index 004368953c9ee532823cf12d692d89cfed1b9331..cde7cf9a25acc1795836f7d6cd1b69cba9833705 100644
--- a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
+++ b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
@@ -54,7 +54,7 @@ void replay_hms_scalers(Int_t RunNumber=0, Int_t MaxEvent=0) {
gHaEvtHandlers->Add(hcepics);
// Add event handler for scaler events
THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H","Hall C scaler event type 129");
- hscaler->AddEvtType(129);
+ hscaler->AddEvtType(1);
hscaler->SetUseFirstEvent(kTRUE);
gHaEvtHandlers->Add(hscaler);
// Add event handler for DAQ configuration event
diff --git a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production_kpp.cfg b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production_kpp.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..dd0ed595efb9af86ef93efbc8e91f9fc82fa5d8e
--- /dev/null
+++ b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production_kpp.cfg
@@ -0,0 +1,213 @@
+protorootfile ../ROOTfiles/hms_replay_production_XXXXX_50000.root
+guicolor orange
+canvassize 1500 900
+
+newpage 2 2
+title HMS CAL Good Occupancy
+macro 'UTIL/GEN/overlay2.C("hcal_hA_good_occ_pos","hcal_hA_good_occ_neg","hA+","hA-","hA Good Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hcal_hB_good_occ_pos","hcal_hB_good_occ_neg","hB+","hB-","hB Good Occupancy")'
+hcal_hC_good_occ_pos -nostat
+hcal_hD_good_occ_pos -nostat
+
+newpage 2 2
+title HMS CAL Good Multiplicity
+macro 'UTIL/GEN/overlay2.C("hcal_hA_good_mult_pos","hcal_hA_good_mult_neg","hA+","hA-","hA Good Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hcal_hB_good_mult_pos","hcal_hB_good_mult_neg","hB+","hB-","hB Good Multiplicity")'
+hcal_hC_good_mult_pos -nostat
+hcal_hD_good_mult_pos -nostat
+
+newpage 2 3 logz
+title HMS CAL Good Pulse Ped
+hcal_hA_good_pped_vs_pmt_pos -nostat
+hcal_hA_good_pped_vs_pmt_neg -nostat
+hcal_hB_good_pped_vs_pmt_pos -nostat
+hcal_hB_good_pped_vs_pmt_neg -nostat
+hcal_hC_good_pped_vs_pmt_pos -nostat
+hcal_hD_good_pped_vs_pmt_pos -nostat
+
+newpage 2 2
+title HMS CER Good Occu/Mult/Ped
+hcer_good_occ -nostat
+hcer_good_mult -nostat
+hcer_good_pped_vs_pmt -nostat
+
+newpage 1 2 logz
+title HMS CER NPEs
+hcer_npe -nostat
+hcer_tot_npe -nostat
+
+newpage 2 2
+title HMS DC Focal Plane
+hdc_xfp_vs_yfp -nostat
+hdc_xpfp_vs_ypfp -nostat
+hdc_xfp_vs_ypfp -nostat
+hdc_xfp_vs_xpfp -nostat
+
+newpage 4 3
+title HMS DC Reference Time
+htrig_hdc_ref1 -nostat
+htrig_hdc_ref2 -nostat
+htrig_hdc_ref3 -nostat
+htrig_hdc_ref4 -nostat
+hdc_refdiff_1m2 -nostat
+hdc_refdiff_1m3 -nostat
+hdc_refdiff_1m4 -nostat
+hdc_refdiff_2m3 -nostat
+hdc_refdiff_2m4 -nostat
+hdc_refdiff_3m4 -nostat
+
+newpage 2 3
+title HMS DC Wire map
+macro 'UTIL/GEN/overlay2.C("hdc1x1_wirenum","hdc2x1_wirenum","1X1","2X1","1X1/2X1 Wiremap")'
+macro 'UTIL/GEN/overlay2.C("hdc1u1_wirenum","hdc2v1_wirenum","1U1","2V1","1U1/2V1 Wiremap")'
+macro 'UTIL/GEN/overlay2.C("hdc1y1_wirenum","hdc2y1_wirenum","1U2","2V2","1U2/2V2 Wiremap")'
+macro 'UTIL/GEN/overlay2.C("hdc1x2_wirenum","hdc2x2_wirenum","1X2","2X2","1X2/2X2 Wiremap")'
+macro 'UTIL/GEN/overlay2.C("hdc1v1_wirenum","hdc2u1_wirenum","1V1","2U1","1V1/2U1 Wiremap")'
+macro 'UTIL/GEN/overlay2.C("hdc1y2_wirenum","hdc2y2_wirenum","1V2","2U2","1V2/2U2 Wiremap")'
+
+newpage 2 3
+title HMS DC wire hits
+macro UTIL/GEN/overlay2.C("hdc1u1_wirenum","hdc2v1_wirenum","1U1","2V1")
+macro UTIL/GEN/overlay2.C("hdc1u2_wirenum","hdc2v2_wirenum","1U2","2V2")
+macro UTIL/GEN/overlay2.C("hdc1x1_wirenum","hdc2x1_wirenum","1X1","2X1")
+macro UTIL/GEN/overlay2.C("hdc1x2_wirenum","hdc2x2_wirenum","1X2","2X2")
+macro UTIL/GEN/overlay2.C("hdc1v1_wirenum","hdc2u1_wirenum","1V1","2U1")
+macro UTIL/GEN/overlay2.C("hdc1v2_wirenum","hdc2u2_wirenum","1V2","2U2")
+
+newpage 2 3
+title HMS DC drift distance
+macro UTIL/GEN/overlay2.C("hdc1u1_ddist","hdc2v1_ddist","1U1","2V1")
+macro UTIL/GEN/overlay2.C("hdc1u2_ddist","hdc2v2_ddist","1U2","2V2")
+macro UTIL/GEN/overlay2.C("hdc1x1_ddist","hdc2x1_ddist","1X1","2X1")
+macro UTIL/GEN/overlay2.C("hdc1x2_ddist","hdc2x2_ddist","1X2","2X2")
+macro UTIL/GEN/overlay2.C("hdc1v1_ddist","hdc2u1_ddist","1V1","2U1")
+macro UTIL/GEN/overlay2.C("hdc1v2_ddist","hdc2u2_ddist","1V2","2U2")
+
+newpage 2 3
+title HMS DC drift time
+macro UTIL/GEN/overlay2.C("hdc1u1_drifttime","hdc2v1_drifttime","1U1","2V1")
+macro UTIL/GEN/overlay2.C("hdc1u2_drifttime","hdc2v1_drifttime","1U2","2V2")
+macro UTIL/GEN/overlay2.C("hdc1x1_drifttime","hdc2x1_drifttime","1X1","2X1")
+macro UTIL/GEN/overlay2.C("hdc1x2_drifttime","hdc2x2_drifttime","1X2","2X2")
+macro UTIL/GEN/overlay2.C("hdc1v1_drifttime","hdc2u1_drifttime","1V1","2U1")
+macro UTIL/GEN/overlay2.C("hdc1v2_drifttime","hdc2u2_drifttime","1V2","2U2")
+
+newpage 4 2
+title HMS HODO Good Occuupancy
+macro 'UTIL/GEN/overlay2.C("hhodo_1x_good_adc_occ_pos","hhodo_1x_good_adc_occ_neg","1x+","1x-","1x Good ADC Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hhodo_1y_good_adc_occ_pos","hhodo_1y_good_adc_occ_neg","1y+","1y-","1y Good ADC Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2x_good_adc_occ_pos","hhodo_2x_good_adc_occ_neg","2x+","2x-","2x Good ADC Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2y_good_adc_occ_pos","hhodo_2y_good_adc_occ_neg","2y+","2y+","2y Good ADC Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hhodo_1x_good_tdc_occ_pos","hhodo_1x_good_tdc_occ_neg","1x+","1x-","1x Good TDC Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hhodo_1y_good_tdc_occ_pos","hhodo_1y_good_tdc_occ_neg","1y+","1y-","1y Good TDC Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2x_good_tdc_occ_pos","hhodo_2x_good_tdc_occ_neg","2x+","2x-","2x Good TDC Occupancy")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2y_good_tdc_occ_pos","hhodo_2y_good_tdc_occ_neg","2y+","2y-","2y Good TDC Occupancy")'
+
+newpage 4 2
+title HMS HODO Good Multiplicity
+macro 'UTIL/GEN/overlay2.C("hhodo_1x_good_adc_mult_pos","hhodo_1x_good_adc_mult_neg","1x+","1x-","1x Good ADC Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hhodo_1y_good_adc_mult_pos","hhodo_1y_good_adc_mult_neg","1y+","1y-","1y Good ADC Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2x_good_adc_mult_pos","hhodo_2x_good_adc_mult_neg","2x+","2x-","2x Good ADC Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2y_good_adc_mult_pos","hhodo_2y_good_adc_mult_neg","2y+","2y-","2y Good ADC Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hhodo_1x_good_tdc_mult_pos","hhodo_1x_good_tdc_mult_neg","1x+","1x-","1x Good TDC Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hhodo_1y_good_tdc_mult_pos","hhodo_1y_good_tdc_mult_neg","1y+","1y-","1y Good TDC Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2x_good_tdc_mult_pos","hhodo_2x_good_tdc_mult_neg","2x+","2x-","2x Good TDC Multiplicity")'
+macro 'UTIL/GEN/overlay2.C("hhodo_2y_good_tdc_mult_pos","hhodo_2y_good_tdc_mult_neg","2y+","2y-","2y Good TDC Multiplicity")'
+
+newpage 4 2 logz
+title HMS HODO Pulse Ped
+hhodo_1x_good_pped_vs_pmt_pos -nostat
+hhodo_1y_good_pped_vs_pmt_pos -nostat
+hhodo_2x_good_pped_vs_pmt_pos -nostat
+hhodo_2y_good_pped_vs_pmt_pos -nostat
+hhodo_1x_good_pped_vs_pmt_neg -nostat
+hhodo_1y_good_pped_vs_pmt_neg -nostat
+hhodo_2x_good_pped_vs_pmt_neg -nostat
+hhodo_2y_good_pped_vs_pmt_neg -nostat
+
+newpage 4 2 logz
+title HMS HODO Hits
+hhodo_1x_good_adc_occ_pos -nostat
+hhodo_1y_good_adc_occ_pos -nostat
+hhodo_2x_good_adc_occ_pos -nostat
+hhodo_2y_good_adc_occ_pos -nostat
+hhodo_1x_good_tdc_occ_pos -nostat
+hhodo_1y_good_tdc_occ_pos -nostat
+hhodo_2x_good_tdc_occ_pos -nostat
+hhodo_2y_good_tdc_occ_pos -nostat
+
+newpage 2 2
+title HMS TRIG CAL ADC Pulse Ped
+htrig_hasum_adc_pped -nostat
+htrig_hbsum_adc_pped -nostat
+htrig_hcsum_adc_pped -nostat
+htrig_hdsum_adc_pped -nostat
+
+newpage 2 2
+title HMS TRIG Psh/Sh/Che ADC Pulse Ped
+htrig_hpreShwr_adc_pped -nostat
+htrig_hshwr_adc_pped -nostat
+htrig_hcersum_adc_pped -nostat
+
+newpage 4 3
+title HMS TRIG Reference Time
+htrig_h1x_tdc -nostat
+htrig_h1x_tdc -nostat
+htrig_h2x_tdc -nostat
+htrig_h2y_tdc -nostat
+htrig_h1T_tdc -nostat
+htrig_h1T_tdc -nostat
+htrig_hT1_tdc -nostat
+htrig_hT2_tdc -nostat
+
+newpage 3 2
+title HMS Kinematics
+hkin_q2 -nostat
+hkin_omega -nostat
+hkin_w2 -nostat
+hkin_w -nostat
+hkin_theta -nostat
+
+newpage 3 2
+title Energy Depo vs PMT HISTO
+hA_Epos_vs_pmt -nostat
+hA_Epos_vs_pmt -nostat
+hA_Epos_vs_pmt -nostat
+hB_Epos_vs_pmt -nostat
+hB_Eneg_vs_pmt -nostat
+hB_Emean_vs_pmt -nostat
+hC_Epos_vs_pmt -nostat
+hD_Epos_vs_pmt -nostat
+
+newpage 3 2
+title Energy Depo per CAL Plane
+hcal_hA_Eplane_pos -nostat
+hcal_hA_Eplane_neg -nostat
+hcal_hA_Eplane -nostat
+hcal_hB_Eplane_pos -nostat
+hcal_hB_Eplane_neg -nostat
+hcal_hB_Eplane -nostat
+hcal_hC_Eplane_pos -nostat
+hcal_hD_Eplane_pos -nostat
+
+newpage 2 2
+title HMS EPICS
+hac_bcm_average -nostat
+ibcm1 -nostat
+ibcm2 -nostat
+iunser -nostat
+
+newpage 3 2 logz
+title HMS Fast Raster
+hFRXA -nostat
+hFRYA -nostat
+hFRA_XvsY -nostat
+hFRXB -nostat
+hFRYB -nostat
+hFRB_XvsY -nostat
+
+newpage 2 2
+title HMS Tracking Variable
+hdc_trk_mom -nostat
+hdc_trk_beta -nostat
+hhodo_beta -nostat