From 99ad1e55c40ad3527e485e83307346799e002666 Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Wed, 13 Dec 2017 19:47:45 -0500
Subject: [PATCH] Production restructure (#339)
* SHMS aerogel histos
* SHMS calorimeter histos
* Add DC histos
* Add HGCER histos
* Add SHMS hodoscope histos
* Add NGCER histos
* Clean up some straggling files
* Create new prodcution_ all replay that includes leaves and all histos
* Include PID production histos
* Clean up production_all work
* HMS calorimeter histos
* Add HMS production all infrastructure and PID histos
* Add HMS HGCER histos
* Add HMS drift chamber histos
* Add HMS hodo histos
* Add HMS trigger histos
* Add new production all script and infrastucture
---
.../HMS/PRODUCTION/BLOCK/hblock_vars.def | 2 +-
DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def | 72 +++-----
DEF-files/HMS/PRODUCTION/CER/hcer_histos.def | 13 ++
DEF-files/HMS/PRODUCTION/DC/hdc_histos.def | 69 +++++++-
.../HMS/PRODUCTION/HODO/hhodo_histos.def | 95 ++++++++--
DEF-files/HMS/PRODUCTION/PID/hpid_histos.def | 85 +++++++++
.../HMS/PRODUCTION/TRIG/htrig_histos.def | 10 ++
.../HMS/PRODUCTION/hstackana_production.def | 8 +-
.../PRODUCTION/hstackana_production_all.def | 20 +++
DEF-files/HMS/TEST_STANDS/AERO/haeroana.def | 2 +-
DEF-files/HMS/TEST_STANDS/CAL/hcalana.def | 4 +-
.../HMS/TEST_STANDS/CAL/hcalana_cuts.def | 19 +-
.../HMS/TEST_STANDS/CAL/hcalana_histos.def | 67 ++-----
DEF-files/HMS/TEST_STANDS/CER/hcerana.def | 3 +-
.../HMS/TEST_STANDS/CER/hcerana_cuts.def | 19 +-
.../HMS/TEST_STANDS/CER/hcerana_histos.def | 13 +-
DEF-files/HMS/TEST_STANDS/DC/hdcana.def | 4 +-
DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def | 19 +-
.../HMS/TEST_STANDS/DC/hdcana_histos.def | 69 +-------
DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def | 5 +-
.../HMS/TEST_STANDS/HODO/hhodoana_cuts.def | 19 +-
.../HMS/TEST_STANDS/HODO/hhodoana_histos.def | 88 +---------
DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def | 1 +
.../HMS/TEST_STANDS/TRIG/htrigana_cuts.def | 19 +-
.../HMS/TEST_STANDS/TRIG/htrigana_histos.def | 9 +-
.../SHMS/PRODUCTION/AERO/paero_histos.def | 27 ++-
.../SHMS/PRODUCTION/BLOCK/pblock_vars.def | 9 +-
DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def | 71 ++------
DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def | 71 +++++++-
.../SHMS/PRODUCTION/HGCER/phgcer_histos.def | 18 +-
.../SHMS/PRODUCTION/HODO/phodo_histos.def | 78 ++++++++-
.../SHMS/PRODUCTION/NGCER/pngcer_histos.def | 13 ++
DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def | 77 ++++++++
.../SHMS/PRODUCTION/TRIG/ptrig_histos.def | 45 +++--
.../SHMS/PRODUCTION/pstackana_production.def | 9 +-
.../PRODUCTION/pstackana_production_all.def | 24 +++
DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def | 3 +-
.../SHMS/TEST_STANDS/AERO/paeroana_cuts.def | 19 +-
.../SHMS/TEST_STANDS/AERO/paeroana_histos.def | 44 ++---
DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def | 3 +-
.../SHMS/TEST_STANDS/CAL/pcalana_cuts.def | 19 +-
.../SHMS/TEST_STANDS/CAL/pcalana_histos.def | 67 ++++---
DEF-files/SHMS/TEST_STANDS/DC/pdcana.def | 4 +-
DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def | 19 +-
.../SHMS/TEST_STANDS/DC/pdcana_histos.def | 69 +-------
.../SHMS/TEST_STANDS/HGCER/phgcerana.def | 3 +-
.../SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def | 19 +-
.../TEST_STANDS/HGCER/phgcerana_histos.def | 22 +--
DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def | 3 +-
.../SHMS/TEST_STANDS/HODO/phodoana_cuts.def | 19 +-
.../SHMS/TEST_STANDS/HODO/phodoana_histos.def | 115 +++---------
.../SHMS/TEST_STANDS/NGCER/pngcerana.def | 3 +-
.../SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def | 19 +-
.../TEST_STANDS/NGCER/pngcerana_histos.def | 22 +--
.../PRODUCTION/replay_production_all_hms.C | 159 +++++++++++++++++
.../HMS/TEST_STANDS/replay_hcal_test_stand.C | 11 +-
.../PRODUCTION/replay_production_all_shms.C | 164 ++++++++++++++++++
.../SHMS/TEST_STANDS/replay_pcal_test_stand.C | 4 +-
.../SHMS/TEST_STANDS/replay_pdc_test_stand.C | 14 +-
59 files changed, 1260 insertions(+), 740 deletions(-)
create mode 100644 DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
create mode 100644 DEF-files/HMS/PRODUCTION/hstackana_production_all.def
create mode 100644 DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
create mode 100644 DEF-files/SHMS/PRODUCTION/pstackana_production_all.def
create mode 100644 SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
create mode 100644 SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
diff --git a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
index c0e460cd..3a4fac27 100644
--- a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
+++ b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def
@@ -11,4 +11,4 @@ block H.cal.*
block H.gtr.*
block H.kin.*
block H.rb.*
-block H.react.*
+block H.react.*
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def b/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
index 87a447de..75354767 100644
--- a/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
+++ b/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
@@ -1,58 +1,32 @@
#******************
# 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
+# Good Occupancy
+TH1F hcal_hA_good_occ_pos 'HMS hA+ Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodPosAdcHits 13 0.5 13.5
+TH1F hcal_hA_good_occ_neg 'HMS hA- Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodNegAdcHits 13 0.5 13.5
+TH1F hcal_hB_good_occ_pos 'HMS hB+ Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodPosAdcHits 13 0.5 13.5
+TH1F hcal_hB_good_occ_neg 'HMS hB- Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodNegAdcHits 13 0.5 13.5
+TH1F hcal_hC_good_occ_pos 'HMS hC+ Good Occupancy; PMT Number; Number of Entries' H.cal.3ta.numGoodPosAdcHits 13 0.5 13.5
+TH1F hcal_hD_good_occ_pos 'HMS hD+ Good Occupancy; PMT Number; Number of Entries' H.cal.4ta.numGoodPosAdcHits 13 0.5 13.5
-#-------------------------------
-# HMS PID AND ACCEPTANCE PLOTS
-#-------------------------------
+# Good Multiplicity
+TH1F hcal_hA_good_mult_pos 'HMS hA+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.1pr.totNumGoodPosAdcHits 13 0.5 13.5
+TH1F hcal_hA_good_mult_neg 'HMS hA- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.1pr.totNumGoodNegAdcHits 13 0.5 13.5
+TH1F hcal_hA_good_mult 'HMS hA Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.1pr.totnumGoodAdcHits 26 0.5 26.5
-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
+TH1F hcal_hB_good_mult_pos 'HMS hB+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.2ta.totNumGoodPosAdcHits 13 0.5 13.5
+TH1F hcal_hB_good_mult_neg 'HMS hB- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.2ta.totNumGoodNegAdcHits 13 0.5 13.5
+TH1F hcal_hB_good_mult 'HMS hB Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.2ta.totnumGoodAdcHits 26 0.5 26.5
-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
+TH1F hcal_hC_good_mult_pos 'HMS hC+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.3ta.totNumGoodPosAdcHits 13 0.5 13.5
+TH1F hcal_hD_good_mult_pos 'HMS hD+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.4ta.totNumGoodPosAdcHits 13 0.5 13.5
-#---------------------------
-# CLUSTERING PLOTS
-#---------------------------
+# Good Pulse Pedestals
+TH2F hcal_hA_good_pped_vs_pmt_pos 'HMS hA+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.1pr.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.1pr.goodPosAdcPed>0.0
+TH2F hcal_hA_good_pped_vs_pmt_neg 'HMS hA- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.1pr.goodNegAdcPed 13 0.5 13.5 200 0 200 H.cal.1pr.goodNegAdcPed>0.0
+TH2F hcal_hB_good_pped_vs_pmt_pos 'HMS hB+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.2ta.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.2ta.goodPosAdcPed>0.0
+TH2F hcal_hB_good_pped_vs_pmt_neg 'HMS hB- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.2ta.goodNegAdcPed 13 0.5 13.5 200 0 200 H.cal.2ta.goodNegAdcPed>0.0
+TH2F hcal_hC_good_pped_vs_pmt_pos 'HMS hC+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.3ta.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.3ta.goodPosAdcPed>0.0
+TH2F hcal_hD_good_pped_vs_pmt_pos 'HMS hD+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.4ta.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.4ta.goodPosAdcPed>0.0
-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_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_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 a85f4dec..deb6be7d 100644
--- a/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
+++ b/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
@@ -2,6 +2,19 @@
# HMS Gas Cherenkov *
#********************
+# HMS CER GOOD Pulse Profile
+TH2F hcer_good_pped_vs_pmt 'HMS Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / mV' [I+1] H.cer.goodAdcPed 2 0.5 2.5 200 0 200
+
+# HMS CER Good Occupancy and Multiplity
+TH1F hcer_good_occ 'HMS Cherenkov Good Occupancy; PMT Number; Number of Entries' H.cer.numGoodAdcHits 2 0.5 2.5
+TH1F hcer_good_mult 'HMS Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cer.totNumGoodAdcHits 2 0.5 2.5
+
+# HMS CER Num. of P.E. / PMT
+TH2F hcer_npe 'HMS Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] H.cer.npe 2 0.5 2.5 100 0 50 H.cer.npe>0.0
+
+# HMS CER Total Number of P.E.
+TH1F hcer_tot_npe 'HMS Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.cer.npeSum 100 0 50 H.cer.npeSum>0.0
+
#--------------------------
# HMS Gas CER TRACK MATCHING
#--------------------------
diff --git a/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def b/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
index 72e37447..34e8dd2c 100644
--- a/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
+++ b/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
@@ -2,8 +2,69 @@
# 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
+#------------------
+# HMS DC WIRE MAP
+#------------------
-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 hdc1u1_wirenum 'HMS DC 1U1 Wiremap; Wire Number; Number of Entries' H.dc.1u1.wirenum 96 0.5 96.5
+TH1F hdc1u2_wirenum 'HMS DC 1U2 Wiremap; Wire Number; Number of Entries' H.dc.1u2.wirenum 96 0.5 96.5
+TH1F hdc1x1_wirenum 'HMS DC 1X1 Wiremap; Wire Number; Number of Entries' H.dc.1x1.wirenum 102 0.5 102.5
+TH1F hdc1x2_wirenum 'HMS DC 1X2 Wiremap; Wire Number; Number of Entries' H.dc.1x2.wirenum 102 0.5 102.5
+TH1F hdc1v1_wirenum 'HMS DC 1V1 Wiremap; Wire Number; Number of Entries' H.dc.1v1.wirenum 96 0.5 96.5
+TH1F hdc1v2_wirenum 'HMS DC 1V2 Wiremap; Wire Number; Number of Entries' H.dc.1v2.wirenum 96 0.5 96.5
+
+TH1F hdc2v2_wirenum 'HMS DC 2V2 Wiremap; Wire Number; Number of Entries' H.dc.2v2.wirenum 96 0.5 96.5
+TH1F hdc2v1_wirenum 'HMS DC 2V1 Wiremap; Wire Number; Number of Entries' H.dc.2v1.wirenum 96 0.5 96.5
+TH1F hdc2x2_wirenum 'HMS DC 2X2 Wiremap; Wire Number; Number of Entries' H.dc.2x2.wirenum 102 0.5 102.5
+TH1F hdc2x1_wirenum 'HMS DC 2X1 Wiremap; Wire Number; Number of Entries' H.dc.2x1.wirenum 102 0.5 102.5
+TH1F hdc2u2_wirenum 'HMS DC 2U2 Wiremap; Wire Number; Number of Entries' H.dc.2u2.wirenum 96 0.5 96.5
+TH1F hdc2u1_wirenum 'HMS DC 2U1 Wiremap; Wire Number; Number of Entries' H.dc.2u1.wirenum 96 0.5 96.5
+
+#------------------------------
+# HMS DC DRIFT TIME PER PLANE
+#------------------------------
+
+TH1F hdc1u1_drifttime 'HMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1u1.time 400 -50 350
+TH1F hdc1u2_drifttime 'HMS DC 1U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1u2.time 400 -50 350
+TH1F hdc1x1_drifttime 'HMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x1.time 400 -50 350
+TH1F hdc1x2_drifttime 'HMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x2.time 400 -50 350
+TH1F hdc1v1_drifttime 'HMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1v1.time 400 -50 350
+TH1F hdc1v2_drifttime 'HMS DC 1V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1v2.time 400 -50 350
+
+TH1F hdc2v2_drifttime 'HMS DC 2V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2v2.time 400 -50 350
+TH1F hdc2v1_drifttime 'HMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2v1.time 400 -50 350
+TH1F hdc2x2_drifttime 'HMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x2.time 400 -50 350
+TH1F hdc2x1_drifttime 'HMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x1.time 400 -50 350
+TH1F hdc2u2_drifttime 'HMS DC 2U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2u2.time 400 -50 350
+TH1F hdc2u1_drifttime 'HMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2u1.time 400 -50 350
+
+#----------------------------------
+# HMS DC Drift Distance Per Plane
+#----------------------------------
+
+TH1F hdc1u1_ddist 'HMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1u1.dist 28 -0.1 0.6
+TH1F hdc1u2_ddist 'HMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1u2.dist 28 -0.1 0.6
+TH1F hdc1x1_ddist 'HMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x1.dist 28 -0.1 0.6
+TH1F hdc1x2_ddist 'HMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x2.dist 28 -0.1 0.6
+TH1F hdc1v1_ddist 'HMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1v1.dist 28 -0.1 0.6
+TH1F hdc1v2_ddist 'HMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1v2.dist 28 -0.1 0.6
+
+TH1F hdc2u2_ddist 'HMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2u2.dist 28 -0.1 0.6
+TH1F hdc2u1_ddist 'HMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2u1.dist 28 -0.1 0.6
+TH1F hdc2x2_ddist 'HMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x2.dist 28 -0.1 0.6
+TH1F hdc2x1_ddist 'HMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x1.dist 28 -0.1 0.6
+TH1F hdc2v2_ddist 'HMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2v2.dist 28 -0.1 0.6
+TH1F hdc2v1_ddist 'HMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2v1.dist 28 -0.1 0.6
+
+#-------------------------------------------
+# HMS DC TRACKING VARIABLES AT FOCAL PLANE
+#-------------------------------------------
+
+TH1F hdc_trk_mom 'HMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6
+TH1F hdc_trk_beta 'HMS DC Track Beta; Beta (GeV); Number of Entires' H.tr.beta 300 -1.5 1.5
+TH2F hdc_xfp_vs_yfp 'HMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' H.dc.y_fp H.dc.x_fp 100 -50 50 100 -50 50
+TH2F hdc_xpfp_vs_ypfp 'HMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' H.dc.yp_fp H.dc.xp_fp 100 -.1 .1 100 -.1 .1
+TH2F hdc_xfp_vs_ypfp 'HMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.yp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
+TH2F hdc_xfp_vs_xpfp 'HMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.xp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
+TH2F hdc_yfp_vs_xpfp 'HMS DC Y_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; Y_{fp} / 1 cm' H.dc.xp_fp H.dc.y_fp 100 -.1 .1 100 -50 50
+TH2F hdc_yfp_vs_ypfp 'HMS DC Y_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; Y_{fp} / 1 cm' H.dc.yp_fp H.dc.y_fp 100 -.1 .1 100 -50 50
diff --git a/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def b/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def
index 2b97db9e..4dd4e3da 100644
--- a/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def
+++ b/DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def
@@ -2,23 +2,82 @@
# HMS HODOSCOPES *
#*****************
+#-----------------------------------
+# HMS HODO GOOD ADC Multiplicities
+#-----------------------------------
+TH1F hhodo_1x_good_adc_mult_pos 'HMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1x.totNumGoodPosAdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_adc_mult_pos 'HMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1y.totNumGoodPosAdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_adc_mult_pos 'HMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2x.totNumGoodPosAdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_adc_mult_pos 'HMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2y.totNumGoodPosAdcHits 10 0.5 10.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.015' H.hod.betanotrack 100 0 1.5
-TH1F hhodo_beta 'HMS Hodo Beta; Beta; Number of Entries / 0.015' H.hod.beta 100 0 1.5
-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 Flag; Good Start Time Flag (=1 is good); Number of Entries' H.hod.goodstarttime 5 0 5
-#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
-TH1F hhodo_1x_diffdistrack 'HMS Hodo 1X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1x.DiffDisTrack 100 -10. 10.
-TH1F hhodo_1y_diffdistrack 'HMS Hodo 1Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1y.DiffDisTrack 100 -10. 10.
-TH1F hhodo_2x_diffdistrack 'HMS Hodo 2X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2x.DiffDisTrack 100 -10. 10.
-TH1F hhodo_2y_diffdistrack 'HMS Hodo 2Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2y.DiffDisTrack 100 -10. 10.
-TH2F hhodo_1x_diffdistrack_v_xtrack 'HMS Hodo 1X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.1x.DiffDisTrack H.hod.1x.TrackXPos 100 -10. 10. 200 -100 100
-TH2F hhodo_1y_diffdistrack_v_ytrack 'HMS Hodo 1Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.1y.DiffDisTrack H.hod.1y.TrackYPos 100 -10. 10. 240 -60 60
-TH2F hhodo_2x_diffdistrack_v_xtrack 'HMS Hodo 2X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.2x.DiffDisTrack H.hod.2x.TrackXPos 100 -10. 10. 200 -100 100
-TH2F hhodo_2y_diffdistrack_v_ytrack 'HMS Hodo 2Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.2y.DiffDisTrack H.hod.2y.TrackYPos 100 -10. 10. 240 -60 60
+TH1F hhodo_1x_good_adc_mult_neg 'HMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1x.totNumGoodNegAdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_adc_mult_neg 'HMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1y.totNumGoodNegAdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_adc_mult_neg 'HMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2x.totNumGoodNegAdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_adc_mult_neg 'HMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2y.totNumGoodNegAdcHits 10 0.5 10.5
+
+TH1F hhodo_1x_good_adc_mult 'HMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1x.totNumGoodAdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_adc_mult 'HMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1y.totNumGoodAdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_adc_mult 'HMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2x.totNumGoodAdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_adc_mult 'HMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2y.totNumGoodAdcHits 10 0.5 10.5
+
+#-----------------------------------
+# HMS HODO Good TDC Multiplicities
+#-----------------------------------
+
+TH1F hhodo_1x_good_tdc_mult_pos 'HMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1x.totNumGoodPosTdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_tdc_mult_pos 'HMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1y.totNumGoodPosTdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_tdc_mult_pos 'HMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2x.totNumGoodPosTdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_tdc_mult_pos 'HMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2y.totNumGoodPosTdcHits 10 0.5 10.5
+
+TH1F hhodo_1x_good_tdc_mult_neg 'HMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1x.totNumGoodNegTdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_tdc_mult_neg 'HMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1y.totNumGoodNegTdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_tdc_mult_neg 'HMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2x.totNumGoodNegTdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_tdc_mult_neg 'HMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2y.totNumGoodNegTdcHits 10 0.5 10.5
+
+TH1F hhodo_1x_good_tdc_mult 'HMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1x.totNumGoodTdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_tdc_mult 'HMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1y.totNumGoodTdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_tdc_mult 'HMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2x.totNumGoodTdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_tdc_mult 'HMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2y.totNumGoodTdcHits 10 0.5 10.5
+
+#---------------------------------
+# HMS HODO GOOD ADC OCCUPANCIES
+#---------------------------------
+
+TH1F hhodo_1x_good_adc_occ_pos 'HMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1x.numGoodPosAdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_adc_occ_pos 'HMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1y.numGoodPosAdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_adc_occ_pos 'HMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2x.numGoodPosAdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_adc_occ_pos 'HMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2y.numGoodPosAdcHits 10 0.5 10.5
+
+TH1F hhodo_1x_good_adc_occ_neg 'HMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1x.numGoodNegAdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_adc_occ_neg 'HMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1y.numGoodNegAdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_adc_occ_neg 'HMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2x.numGoodNegAdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_adc_occ_neg 'HMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2y.numGoodNegAdcHits 10 0.5 10.5
+
+#--------------------------------
+# HMS HODO GOOD TDC OCCUPANCIES
+#--------------------------------
+
+TH1F hhodo_1x_good_tdc_occ_pos 'HMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1x.numGoodPosTdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_tdc_occ_pos 'HMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1y.numGoodPosTdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_tdc_occ_pos 'HMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2x.numGoodPosTdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_tdc_occ_pos 'HMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2y.numGoodPosTdcHits 10 0.5 10.5
+
+TH1F hhodo_1x_good_tdc_occ_neg 'HMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1x.numGoodNegTdcHits 16 0.5 16.5
+TH1F hhodo_1y_good_tdc_occ_neg 'HMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1y.numGoodNegTdcHits 10 0.5 10.5
+TH1F hhodo_2x_good_tdc_occ_neg 'HMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2x.numGoodNegTdcHits 16 0.5 16.5
+TH1F hhodo_2y_good_tdc_occ_neg 'HMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2y.numGoodNegTdcHits 10 0.5 10.5
+
+#------------------------------
+# HMS HODO Good PULSE PEDESTAL
+#------------------------------
+
+TH2F hhodo_1x_good_pped_vs_pmt_pos 'HMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1x.GoodPosAdcPed 16 0.5 16.5 200 0 200 H.hod.1x.GoodPosAdcPed>0.0
+TH2F hhodo_1y_good_pped_vs_pmt_pos 'HMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1y.GoodPosAdcPed 10 0.5 10.5 200 0 200 H.hod.1y.GoodPosAdcPed>0.0
+TH2F hhodo_2x_good_pped_vs_pmt_pos 'HMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2x.GoodPosAdcPed 16 0.5 16.5 200 0 200 H.hod.2x.GoodPosAdcPed>0.0
+TH2F hhodo_2y_good_pped_vs_pmt_pos 'HMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2y.GoodPosAdcPed 10 0.5 10.5 200 0 200 H.hod.2y.GoodPosAdcPed>0.0
+
+TH2F hhodo_1x_good_pped_vs_pmt_neg 'HMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1x.GoodNegAdcPed 16 0.5 16.5 200 0 200 H.hod.1x.GoodNegAdcPed>0.0
+TH2F hhodo_1y_good_pped_vs_pmt_neg 'HMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1y.GoodNegAdcPed 10 0.5 10.5 200 0 200 H.hod.1y.GoodNegAdcPed>0.0
+TH2F hhodo_2x_good_pped_vs_pmt_neg 'HMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2x.GoodNegAdcPed 16 0.5 16.5 200 0 200 H.hod.2x.GoodNegAdcPed>0.0
+TH2F hhodo_2y_good_pped_vs_pmt_neg 'HMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2y.GoodNegAdcPed 10 0.5 10.5 200 0 200 H.hod.2y.GoodNegAdcPed>0.0
diff --git a/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def b/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
new file mode 100644
index 00000000..54ff0e17
--- /dev/null
+++ b/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
@@ -0,0 +1,85 @@
+#-------------------------------------------------------------------------------------
+# 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_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_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
+
+
+#**********************
+# 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_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
+
+#----------------------------------------------------------------
+# 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.015' H.hod.betanotrack 100 0 1.5
+TH1F hhodo_beta 'HMS Hodo Beta; Beta; Number of Entries / 0.015' H.hod.beta 100 0 1.5
+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 Flag; Good Start Time Flag (=1 is good); Number of Entries' H.hod.goodstarttime 5 0 5
+#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
+TH1F hhodo_1x_diffdistrack 'HMS Hodo 1X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1x.DiffDisTrack 100 -10. 10.
+TH1F hhodo_1y_diffdistrack 'HMS Hodo 1Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1y.DiffDisTrack 100 -10. 10.
+TH1F hhodo_2x_diffdistrack 'HMS Hodo 2X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2x.DiffDisTrack 100 -10. 10.
+TH1F hhodo_2y_diffdistrack 'HMS Hodo 2Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2y.DiffDisTrack 100 -10. 10.
+TH2F hhodo_1x_diffdistrack_v_xtrack 'HMS Hodo 1X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.1x.DiffDisTrack H.hod.1x.TrackXPos 100 -10. 10. 200 -100 100
+TH2F hhodo_1y_diffdistrack_v_ytrack 'HMS Hodo 1Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.1y.DiffDisTrack H.hod.1y.TrackYPos 100 -10. 10. 240 -60 60
+TH2F hhodo_2x_diffdistrack_v_xtrack 'HMS Hodo 2X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.2x.DiffDisTrack H.hod.2x.TrackXPos 100 -10. 10. 200 -100 100
+TH2F hhodo_2y_diffdistrack_v_ytrack 'HMS Hodo 2Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.2y.DiffDisTrack H.hod.2y.TrackYPos 100 -10. 10. 240 -60 60
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
index 15bdb453..20485325 100644
--- a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
@@ -1,6 +1,7 @@
#********************
# Trigger Apparatus *
#********************
+
TH1F htrig_h1x_tdc_mult 'HMS h1x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1X_tdcMultiplicity 11 0 11
TH1F htrig_h1y_tdc_mult 'HMS h1y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1Y_tdcMultiplicity 11 0 11
TH1F htrig_h2x_tdc_mult 'HMS h2x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2X_tdcMultiplicity 11 0 11
@@ -27,3 +28,12 @@ TH2F htrig_ch1xy_ch2x 'HMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.hms.h1T_td
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
+
+#----------------------------
+# HMS DC TRIG Reference Time
+#----------------------------
+
+TH1F htrig_hdc_ref1 'HMS DC Reference Time 1; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF1_tdcTime 2000 0 2000
+TH1F htrig_hdc_ref2 'HMS DC Reference Time 2; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF2_tdcTime 2000 0 2000
+TH1F htrig_hdc_ref3 'HMS DC Reference Time 3; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF3_tdcTime 2000 0 2000
+TH1F htrig_hdc_ref4 'HMS DC Reference Time 4; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF4_tdcTime 2000 0 2000
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def b/DEF-files/HMS/PRODUCTION/hstackana_production.def
index f5fd31dd..430ec754 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def
@@ -1,11 +1,4 @@
-#include "DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.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"
@@ -15,3 +8,4 @@
#include "DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def"
#include "DEF-files/HMS/PRODUCTION/EPICS/hepics_vars.def"
#include "DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def"
+#include "DEF-files/HMS/PRODUCTION/PID/hpid_histos.def"
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_all.def b/DEF-files/HMS/PRODUCTION/hstackana_production_all.def
new file mode 100644
index 00000000..b6687fa4
--- /dev/null
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production_all.def
@@ -0,0 +1,20 @@
+#include "DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def"
+
+#include "DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def"
+#include "DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def"
+#include "DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def"
+#include "DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def"
+#include "DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.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/GTR/hgtr_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"
+#include "DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def"
+#include "DEF-files/HMS/PRODUCTION/PID/hpid_histos.def"
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/AERO/haeroana.def b/DEF-files/HMS/TEST_STANDS/AERO/haeroana.def
index a5d38a41..3d94d43c 100644
--- a/DEF-files/HMS/TEST_STANDS/AERO/haeroana.def
+++ b/DEF-files/HMS/TEST_STANDS/AERO/haeroana.def
@@ -3,4 +3,4 @@
block H.aero.*
block T.hms.*
-#include "DEF-files/HMS/TEST_STANDS/AERO/haeroana_histos.def"
+#include "DEF-files/HMS/TEST_STANDS/AERO/haeroana_histos.def"
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def b/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def
index e86c936e..797c491f 100644
--- a/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def
+++ b/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def
@@ -1,5 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
+block T.hms.*
block H.cal.*
#include "DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def"
+#include "DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def"
diff --git a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
index 0499dee1..2bc1c172 100644
--- a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
+HMS_event g.evtyp == 2
+SHMS_event g.evtyp == 1
+COIN_event g.evtyp == 4
+
+TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+hms_trigs HMS_event
+edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+physics_accepted T.hms.hEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def
index 3457c871..810c21af 100644
--- a/DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def
+++ b/DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def
@@ -1,6 +1,6 @@
-#HMS CALORIMETER HISTOGRAMS
+# HMS CALORIMETER HISTOGRAMS
-#FPGA Error Flags
+# FPGA Error Flags
TH2F hcal_hA_adcErrFlg2D_pos 'HMS hA+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
TH2F hcal_hA_adcErrFlg2D_neg 'HMS hA- FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
TH2F hcal_hB_adcErrFlg2D_pos 'HMS hB+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
@@ -8,7 +8,7 @@ TH2F hcal_hB_adcErrFlg2D_neg 'HMS hB- FPGA Error Flag; Error Flag; PMT Number; E
TH2F hcal_hC_adcErrFlg2D_pos 'HMS hC+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
TH2F hcal_hD_adcErrFlg2D_pos 'HMS hD+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
-#Raw Occupancy
+# Raw Occupancy
TH1F hcal_hA_raw_occ_pos 'HMS hA+ Raw Occupancy; PMT Number; Number of Entries' H.cal.1pr.posAdcCounter 13 0.5 13.5
TH1F hcal_hA_raw_occ_neg 'HMS hA- Raw Occupancy; PMT Number; Number of Entries' H.cal.1pr.negAdcCounter 13 0.5 13.5
TH1F hcal_hB_raw_occ_pos 'HMS hB+ Raw Occupancy; PMT Number; Number of Entries' H.cal.2ta.posAdcCounter 13 0.5 13.5
@@ -16,7 +16,7 @@ TH1F hcal_hB_raw_occ_neg 'HMS hB- Raw Occupancy; PMT Number; Number of Entries'
TH1F hcal_hC_raw_occ_pos 'HMS hC+ Raw Occupancy; PMT Number; Number of Entries' H.cal.3ta.posAdcCounter 13 0.5 13.5
TH1F hcal_hD_raw_occ_pos 'HMS hD+ Raw Occupancy; PMT Number; Number of Entries' H.cal.4ta.posAdcCounter 13 0.5 13.5
-#Raw Multiplicity
+# Raw Multiplicity
TH1F hcal_hA_raw_mult_pos 'HMS hA+ Raw Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits / PMT' H.cal.1pr.totNumPosAdcHits 13 0.5 13.5
TH1F hcal_hA_raw_mult_neg 'HMS hA- Raw Multiplicity; Number of PMTs Hit; Total Number of Raw -ADC Hits / PMT' H.cal.1pr.totNumNegAdcHits 13 0.5 13.5
TH1F hcal_hA_raw_mult 'HMS hA Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits / PMT' H.cal.1pr.totnumAdcHits 26 0.5 26.5
@@ -28,27 +28,7 @@ TH1F hcal_hB_raw_mult 'HMS hB Raw Multiplicity; Number of PMTs Hit; Total Number
TH1F hcal_hC_raw_mult_pos 'HMS hC+ Raw Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits / PMT' H.cal.3ta.totNumPosAdcHits 13 0.5 13.5
TH1F hcal_hD_raw_mult_pos 'HMS hD+ Raw Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits / PMT' H.cal.4ta.totNumPosAdcHits 13 0.5 13.5
-#Good Occupancy
-TH1F hcal_hA_good_occ_pos 'HMS hA+ Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_occ_neg 'HMS hA- Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_occ_pos 'HMS hB+ Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_occ_neg 'HMS hB- Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hC_good_occ_pos 'HMS hC+ Good Occupancy; PMT Number; Number of Entries' H.cal.3ta.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hD_good_occ_pos 'HMS hD+ Good Occupancy; PMT Number; Number of Entries' H.cal.4ta.numGoodPosAdcHits 13 0.5 13.5
-
-#Good Multiplicity
-TH1F hcal_hA_good_mult_pos 'HMS hA+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.1pr.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_mult_neg 'HMS hA- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.1pr.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_mult 'HMS hA Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.1pr.totnumGoodAdcHits 26 0.5 26.5
-
-TH1F hcal_hB_good_mult_pos 'HMS hB+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.2ta.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_mult_neg 'HMS hB- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.2ta.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_mult 'HMS hB Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.2ta.totnumGoodAdcHits 26 0.5 26.5
-
-TH1F hcal_hC_good_mult_pos 'HMS hC+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.3ta.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hD_good_mult_pos 'HMS hD+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.4ta.totNumGoodPosAdcHits 13 0.5 13.5
-
-#Raw Pulse Pedestals
+# Raw Pulse Pedestals
TH2F hcal_hA_raw_pped_vs_pmt_pos 'HMS hA+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPedRaw 13 0.5 13.5 2000 1000 3000
TH2F hcal_hA_raw_pped_vs_pmt_neg 'HMS hA- Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcPedRaw 13 0.5 13.5 2000 1000 3000
TH2F hcal_hB_raw_pped_vs_pmt_pos 'HMS hB+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcPedRaw 13 0.5 13.5 2000 1000 3000
@@ -56,7 +36,7 @@ TH2F hcal_hB_raw_pped_vs_pmt_neg 'HMS hB- Raw Pulse Pedestal vs. PMT Number; PMT
TH2F hcal_hC_raw_pped_vs_pmt_pos 'HMS hC+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcPedRaw 13 0.5 13.5 2000 1000 3000
TH2F hcal_hD_raw_pped_vs_pmt_pos 'HMS hD+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPedRaw 13 0.5 13.5 2000 1000 3000
-#Raw Pulse Integrals
+# Raw Pulse Integrals
TH2F hcal_hA_raw_pi_vs_pmt_pos 'HMS hA+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPulseIntRaw 13 0.5 13.5 650 0 32500
TH2F hcal_hA_raw_pi_vs_pmt_neg 'HMS hA- Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcPulseIntRaw 13 0.5 13.5 650 0 32500
TH2F hcal_hB_raw_pi_vs_pmt_pos 'HMS hB+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcPulseIntRaw 13 0.5 13.5 650 0 32500
@@ -64,7 +44,7 @@ TH2F hcal_hB_raw_pi_vs_pmt_neg 'HMS hB- Raw Pulse Integral vs. PMT Number; PMT N
TH2F hcal_hC_raw_pi_vs_pmt_pos 'HMS hC+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcPulseIntRaw 13 0.5 13.5 650 0 32500
TH2F hcal_hD_raw_pi_vs_pmt_pos 'HMS hD+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPulseIntRaw 13 0.5 13.5 650 0 32500
-#Raw Pulse Amplitudes
+# Raw Pulse Amplitudes
TH2F hcal_hA_raw_pamp_vs_pmt_pos 'HMS hA+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPulseAmpRaw 13 0.5 13.5 410 0 8200
TH2F hcal_hA_raw_pamp_vs_pmt_neg 'HMS hA- Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcPulseAmpRaw 13 0.5 13.5 410 0 8200
TH2F hcal_hB_raw_pamp_vs_pmt_pos 'HMS hB+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcPulseAmpRaw 13 0.5 13.5 410 0 8200
@@ -72,7 +52,7 @@ TH2F hcal_hB_raw_pamp_vs_pmt_neg 'HMS hB- Raw Pulse Amplitude vs. PMT Number; PM
TH2F hcal_hC_raw_pamp_vs_pmt_pos 'HMS hC+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcPulseAmpRaw 13 0.5 13.5 410 0 8200
TH2F hcal_hD_raw_pamp_vs_pmt_pos 'HMS hD+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPulseAmpRaw 13 0.5 13.5 410 0 8200
-#Raw Pulse Times
+# Raw Pulse Times
TH2F hcal_hA_raw_ptime_vs_pmt_pos 'HMS hA+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPulseTimeRaw 13 0.5 13.5 650 0 6500
TH2F hcal_hA_raw_ptime_vs_pmt_neg 'HMS hA- Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcPulseTimeRaw 13 0.5 13.5 650 0 6500
TH2F hcal_hB_raw_ptime_vs_pmt_pos 'HMS hB+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcPulseTimeRaw 13 0.5 13.5 650 0 6500
@@ -80,7 +60,7 @@ TH2F hcal_hB_raw_ptime_vs_pmt_neg 'HMS hB- Raw Pulse Time vs. PMT Number; PMT Nu
TH2F hcal_hC_raw_ptime_vs_pmt_pos 'HMS hC+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcPulseTimeRaw 13 0.5 13.5 650 0 6500
TH2F hcal_hD_raw_ptime_vs_pmt_pos 'HMS hD+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPulseTimeRaw 13 0.5 13.5 650 0 6500
-#Pulse Pedestals
+# Pulse Pedestals
TH2F hcal_hA_pped_vs_pmt_pos 'HMS hA+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 mV' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPed 13 0.5 13.5 300 0 300
TH2F hcal_hA_pped_vs_pmt_neg 'HMS hA- Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 mV' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcPed 13 0.5 13.5 300 0 300
TH2F hcal_hB_pped_vs_pmt_pos 'HMS hB+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 mV' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcPed 13 0.5 13.5 300 0 300
@@ -88,7 +68,7 @@ TH2F hcal_hB_pped_vs_pmt_neg 'HMS hB- Pulse Pedestal vs. PMT Number; PMT Number;
TH2F hcal_hC_pped_vs_pmt_pos 'HMS hC+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 mV' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcPed 13 0.5 13.5 300 0 300
TH2F hcal_hD_pped_vs_pmt_pos 'HMS hD+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 mV' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPed 13 0.5 13.5 300 0 300
-#Pulse Integrals
+# Pulse Integrals
TH2F hcal_hA_pi_vs_pmt_pos 'HMS hA+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPulseInt 13 0.5 13.5 320 0 80
TH2F hcal_hA_pi_vs_pmt_neg 'HMS hA- Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcPulseInt 13 0.5 13.5 320 0 80
TH2F hcal_hB_pi_vs_pmt_pos 'HMS hB+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcPulseInt 13 0.5 13.5 320 0 80
@@ -96,7 +76,7 @@ TH2F hcal_hB_pi_vs_pmt_neg 'HMS hB- Pulse Integral vs. PMT Number; PMT Number; P
TH2F hcal_hC_pi_vs_pmt_pos 'HMS hC+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcPulseInt 13 0.5 13.5 320 0 80
TH2F hcal_hD_pi_vs_pmt_pos 'HMS hD+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPulseInt 13 0.5 13.5 320 0 80
-#Pulse Amplitudes
+# Pulse Amplitudes
TH2F hcal_hA_pamp_vs_pmt_pos 'HMS hA+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPulseAmp 13 0.5 13.5 500 0 1000
TH2F hcal_hA_pamp_vs_pmt_neg 'HMS hA- Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcPulseAmp 13 0.5 13.5 500 0 1000
TH2F hcal_hB_pamp_vs_pmt_pos 'HMS hB+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcPulseAmp 13 0.5 13.5 500 0 1000
@@ -104,15 +84,7 @@ TH2F hcal_hB_pamp_vs_pmt_neg 'HMS hB- Pulse Amplitude vs. PMT Number; PMT Number
TH2F hcal_hC_pamp_vs_pmt_pos 'HMS hC+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcPulseAmp 13 0.5 13.5 500 0 1000
TH2F hcal_hD_pamp_vs_pmt_pos 'HMS hD+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPulseAmp 13 0.5 13.5 500 0 1000
-#Good Pulse Pedestals
-TH2F hcal_hA_good_pped_vs_pmt_pos 'HMS hA+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.1pr.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.1pr.goodPosAdcPed>0.0
-TH2F hcal_hA_good_pped_vs_pmt_neg 'HMS hA- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.1pr.goodNegAdcPed 13 0.5 13.5 200 0 200 H.cal.1pr.goodNegAdcPed>0.0
-TH2F hcal_hB_good_pped_vs_pmt_pos 'HMS hB+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.2ta.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.2ta.goodPosAdcPed>0.0
-TH2F hcal_hB_good_pped_vs_pmt_neg 'HMS hB- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.2ta.goodNegAdcPed 13 0.5 13.5 200 0 200 H.cal.2ta.goodNegAdcPed>0.0
-TH2F hcal_hC_good_pped_vs_pmt_pos 'HMS hC+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.3ta.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.3ta.goodPosAdcPed>0.0
-TH2F hcal_hD_good_pped_vs_pmt_pos 'HMS hD+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 mV' [I+1] H.cal.4ta.goodPosAdcPed 13 0.5 13.5 200 0 200 H.cal.4ta.goodPosAdcPed>0.0
-
-#Good Pulse Integrals
+# Good Pulse Integrals
TH2F hcal_hA_good_pi_vs_pmt_pos 'HMS hA+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] H.cal.1pr.goodPosAdcPulseInt 13 0.5 13.5 320 0 80 H.cal.1pr.goodPosAdcPulseInt>0.0
TH2F hcal_hA_good_pi_vs_pmt_neg 'HMS hA- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] H.cal.1pr.goodNegAdcPulseInt 13 0.5 13.5 320 0 80 H.cal.1pr.goodNegAdcPulseInt>0.0
TH2F hcal_hB_good_pi_vs_pmt_pos 'HMS hB+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] H.cal.2ta.goodPosAdcPulseInt 13 0.5 13.5 320 0 80 H.cal.2ta.goodPosAdcPulseInt>0.0
@@ -120,7 +92,7 @@ TH2F hcal_hB_good_pi_vs_pmt_neg 'HMS hB- Good Pulse Integral vs. PMT Number; PMT
TH2F hcal_hC_good_pi_vs_pmt_pos 'HMS hC+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] H.cal.3ta.goodPosAdcPulseInt 13 0.5 13.5 320 0 80 H.cal.3ta.goodPosAdcPulseInt>0.0
TH2F hcal_hD_good_pi_vs_pmt_pos 'HMS hD+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] H.cal.4ta.goodPosAdcPulseInt 13 0.5 13.5 320 0 80 H.cal.4ta.goodPosAdcPulseInt>0.0
-#Good Pulse Amplitudes
+# Good Pulse Amplitudes
TH2F hcal_hA_good_pamp_vs_pmt_pos 'HMS hA+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] H.cal.1pr.goodPosAdcPulseAmp 13 0.5 13.5 500 0 1000 H.cal.1pr.goodPosAdcPulseAmp>0.0
TH2F hcal_hA_good_pamp_vs_pmt_neg 'HMS hA- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] H.cal.1pr.goodNegAdcPulseAmp 13 0.5 13.5 500 0 1000 H.cal.1pr.goodNegAdcPulseAmp>0.0
TH2F hcal_hB_good_pamp_vs_pmt_pos 'HMS hB+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] H.cal.2ta.goodPosAdcPulseAmp 13 0.5 13.5 500 0 1000 H.cal.2ta.goodPosAdcPulseAmp>0.0
@@ -128,7 +100,7 @@ TH2F hcal_hB_good_pamp_vs_pmt_neg 'HMS hB- Good Pulse Amplitude vs. PMT Number;
TH2F hcal_hC_good_pamp_vs_pmt_pos 'HMS hC+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] H.cal.3ta.goodPosAdcPulseAmp 13 0.5 13.5 500 0 1000 H.cal.3ta.goodPosAdcPulseAmp>0.0
TH2F hcal_hD_good_pamp_vs_pmt_pos 'HMS hD+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] H.cal.4ta.goodPosAdcPulseAmp 13 0.5 13.5 500 0 1000 H.cal.4ta.goodPosAdcPulseAmp>0.0
-#Good Pulse Times
+# Good Pulse Times
TH2F hcal_hA_good_ptime_vs_pmt_pos 'HMS hA+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] H.cal.1pr.goodPosAdcPulseTime 13 0.5 13.5 4000 0 400 H.cal.1pr.goodPosAdcPulseTime>0.0
TH2F hcal_hA_good_ptime_vs_pmt_neg 'HMS hA- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] H.cal.1pr.goodNegAdcPulseTime 13 0.5 13.5 4000 0 400 H.cal.1pr.goodNegAdcPulseTime>0.0
TH2F hcal_hB_good_ptime_vs_pmt_pos 'HMS hB+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] H.cal.2ta.goodPosAdcPulseTime 13 0.5 13.5 4000 0 400 H.cal.2ta.goodPosAdcPulseTime>0.0
@@ -136,7 +108,7 @@ TH2F hcal_hB_good_ptime_vs_pmt_neg 'HMS hB- Good Pulse Time vs. PMT Number; PMT
TH2F hcal_hC_good_ptime_vs_pmt_pos 'HMS hC+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] H.cal.3ta.goodPosAdcPulseTime 13 0.5 13.5 4000 0 400 H.cal.3ta.goodPosAdcPulseTime>0.0
TH2F hcal_hD_good_ptime_vs_pmt_pos 'HMS hD+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] H.cal.4ta.goodPosAdcPulseTime 13 0.5 13.5 4000 0 400 H.cal.4ta.goodPosAdcPulseTime>0.0
-#Good Hodo Start - Pulse Times
+# Good Hodo Start - Pulse Times
TH2F hcal_hA_good_dtime_vs_pmt_pos 'HMS hA+ Good Hodo Start -Pulse Time vs. PMT Number; PMT Number; Good Hodo Start -Pulse Time / 0.1 ns' [I+1] H.cal.1pr.goodPosAdcTdcDiffTime 13 0.5 13.5 4000 -200 200
TH2F hcal_hA_good_dtime_vs_pmt_neg 'HMS hA- Good Hodo Start -Pulse Time vs. PMT Number; PMT Number; Good Hodo Start -Pulse Time / 0.1 ns' [I+1] H.cal.1pr.goodNegAdcTdcDiffTime 13 0.5 13.5 4000 -200 200
TH2F hcal_hB_good_dtime_vs_pmt_pos 'HMS hB+ Good Hodo Start -Pulse Time vs. PMT Number; PMT Number; Good Hodo Start -Pulse Time / 0.1 ns' [I+1] H.cal.2ta.goodPosAdcTdcDiffTime 13 0.5 13.5 4000 -200 200
@@ -144,7 +116,7 @@ TH2F hcal_hB_good_dtime_vs_pmt_neg 'HMS hB- Good Hodo Start -Pulse Time vs. PMT
TH2F hcal_hC_good_dtime_vs_pmt_pos 'HMS hC+ Good Hodo Start -Pulse Time vs. PMT Number; PMT Number; Good Hodo Start -Pulse Time / 0.1 ns' [I+1] H.cal.3ta.goodPosAdcTdcDiffTime 13 0.5 13.5 4000 -200 200
TH2F hcal_hD_good_dtime_vs_pmt_pos 'HMS hD+ Good Hodo Start -Pulse Time vs. PMT Number; PMT Number; Good Hodo Start -Pulse Time / 0.1 ns' [I+1] H.cal.4ta.goodPosAdcTdcDiffTime 13 0.5 13.5 4000 -200 200
-#GOOD RAW PULSE INTEGRALS
+# GOOD RAW PULSE INTEGRALS
TH2F hcal_hA_good_raw_pi_vs_pmt_pos 'HMS hA+ Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] H.cal.1pr.goodPosAdcPulseIntRaw 13 0.5 13.5 650 0 32500 H.cal.1pr.goodPosAdcPulseIntRaw>0.0
TH2F hcal_hA_good_raw_pi_vs_pmt_neg 'HMS hA- Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] H.cal.1pr.goodNegAdcPulseIntRaw 13 0.5 13.5 650 0 32500 H.cal.1pr.goodNegAdcPulseIntRaw>0.0
TH2F hcal_hB_good_raw_pi_vs_pmt_pos 'HMS hB+ Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] H.cal.2ta.goodPosAdcPulseIntRaw 13 0.5 13.5 650 0 32500 H.cal.2ta.goodPosAdcPulseIntRaw>0.0
@@ -152,13 +124,11 @@ TH2F hcal_hB_good_raw_pi_vs_pmt_neg 'HMS hB- Good Raw Pulse Integral vs. PMT Num
TH2F hcal_hC_good_raw_pi_vs_pmt_pos 'HMS hC+ Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] H.cal.3ta.goodPosAdcPulseIntRaw 13 0.5 13.5 650 0 32500 H.cal.3ta.goodPosAdcPulseIntRaw>0.0
TH2F hcal_hD_good_raw_pi_vs_pmt_pos 'HMS hD+ Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] H.cal.4ta.goodPosAdcPulseIntRaw 13 0.5 13.5 650 0 32500 H.cal.4ta.goodPosAdcPulseIntRaw>0.0
-
-#ENERGY DEPOSITION vs. PMT HISTOGRAMS (calib consts (GAIN) are in GeV/ADC units )
+# ENERGY DEPOSITION vs. PMT HISTOGRAMS (calib consts (GAIN) are in GeV/ADC units )
TH2F hA_Epos_vs_pmt 'HMS hA+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.epos 13 0.5 13.5 200 0 2 H.cal.1pr.epos>0.0
TH2F hA_Eneg_vs_pmt 'HMS hA- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.eneg 13 0.5 13.5 200 0 2 H.cal.1pr.eneg>0.0
TH2F hA_Emean_vs_pmt 'HMS hA Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.emean 13 0.5 13.5 300 0 3 H.cal.1pr.emean>0.0
-
TH2F hB_Epos_vs_pmt 'HMS hB+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.epos 13 0.5 13.5 200 0 2 H.cal.2ta.epos>0.0
TH2F hB_Eneg_vs_pmt 'HMS hB- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.eneg 13 0.5 13.5 200 0 2 H.cal.2ta.eneg>0.0
TH2F hB_Emean_vs_pmt 'HMS hB Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.emean 13 0.5 13.5 300 0 3 H.cal.2ta.emean>0.0
@@ -166,8 +136,7 @@ TH2F hB_Emean_vs_pmt 'HMS hB Mean Energy Deposition vs. PMT Number; PMT Number;
TH2F hC_Epos_vs_pmt 'HMS hC+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.3ta.epos 13 0.5 13.5 200 0 2 H.cal.3ta.epos>0.0
TH2F hD_Epos_vs_pmt 'HMS hD+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.4ta.epos 13 0.5 13.5 200 0 2 H.cal.4ta.epos>0.0
-
-#ENERGY DEPOSITION in each Calorimeter Plane
+# ENERGY DEPOSITION in each Calorimeter Plane
TH1F hcal_hA_Eplane_pos 'HMS hA+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane_pos 200 0 2 H.cal.1pr.eplane_pos>0.0
TH1F hcal_hA_Eplane_neg 'HMS hA- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane_neg 200 0 2 H.cal.1pr.eplane_neg>0.0
TH1F hcal_hA_Eplane 'HMS hA Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane 300 0 3 H.cal.1pr.eplane>0.0
diff --git a/DEF-files/HMS/TEST_STANDS/CER/hcerana.def b/DEF-files/HMS/TEST_STANDS/CER/hcerana.def
index 04504f89..7906d8a5 100644
--- a/DEF-files/HMS/TEST_STANDS/CER/hcerana.def
+++ b/DEF-files/HMS/TEST_STANDS/CER/hcerana.def
@@ -1,6 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
block H.cer.*
block T.hms.*
#include "DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def"
+#include "DEF-files/HMS/PRODUCTION/CER/hcer_histos.def"
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def b/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
index 0499dee1..2bc1c172 100644
--- a/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
+HMS_event g.evtyp == 2
+SHMS_event g.evtyp == 1
+COIN_event g.evtyp == 4
+
+TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+hms_trigs HMS_event
+edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+physics_accepted T.hms.hEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def b/DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def
index 81406a01..25c27df3 100644
--- a/DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def
+++ b/DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def
@@ -5,16 +5,6 @@ TH2F hcer_adcErrFlg2D 'HMS Cherenkov FPGA Error Flag; Error Flag; Number of Entr
TH1F hcer_raw_occ 'HMS Cherenkov Raw Occupancy; PMT Number; Number of Entries' H.cer.adcCounter 2 0.5 2.5
TH1F hcer_raw_mult 'HMS Cherenkov Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits / PMT' H.cer.totNumAdcHits 2 0.5 2.5
-# HMS CER Good Occupancy and Multiplity
-TH1F hcer_good_occ 'HMS Cherenkov Good Occupancy; PMT Number; Number of Entries' H.cer.numGoodAdcHits 2 0.5 2.5
-TH1F hcer_good_mult 'HMS Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cer.totNumGoodAdcHits 2 0.5 2.5
-
-# HMS CER Num. of P.E. / PMT
-TH2F hcer_npe 'HMS Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] H.cer.npe 2 0.5 2.5 100 0 50 H.cer.npe>0.0
-
-# HMS CER Total Number of P.E.
-TH1F hcer_tot_npe 'HMS Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.cer.npeSum 100 0 50 H.cer.npeSum>0.0
-
# HMS CER Raw Pulse Profile
TH2F hcer_raw_pped_vs_pmt 'HMS Cherenkov Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' H.cer.adcCounter H.cer.adcPedRaw 2 0.5 2.5 5000 0 5000
TH2F hcer_raw_pi_vs_pmt 'HMS Cherenkov Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' H.cer.adcCounter H.cer.adcPulseIntRaw 2 0.5 2.5 650 0 32500
@@ -27,9 +17,8 @@ TH2F hcer_pi_vs_pmt 'HMS Cherenkov Pulse Integral vs. PMT Number; PMT Number; P
TH2F hcer_pamp_vs_pmt 'HMS Cherenkov Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' H.cer.adcCounter H.cer.adcPulseAmp 2 0.5 2.5 500 0 1000
# HMS CER GOOD Pulse Profile
-TH2F hcer_good_pped_vs_pmt 'HMS Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / mV' [I+1] H.cer.goodAdcPed 2 0.5 2.5 200 0 200
TH2F hcer_good_pi_vs_pmt 'HMS Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.04 pC' [I+1] H.cer.goodAdcPulseInt 2 0.5 2.5 2000 0 80 H.cer.goodAdcPulseInt>0.0
TH2F hcer_good_rawpi_vs_pmt 'HMS Cherenkov Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I+1] H.cer.goodAdcPulseIntRaw 2 0.5 2.5 600 0 30000 H.cer.goodAdcPulseIntRaw>0.0
TH2F hcer_good_pamp_vs_pmt 'HMS Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' [I+1] H.cer.goodAdcPulseAmp 2 0.5 2.5 500 0 1000 H.cer.goodAdcPulseAmp>0.0
TH2F hcer_good_ptime_vs_pmt 'HMS Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 0.1 ns' [I+1] H.cer.goodAdcPulseTime 2 0.5 2.5 4000 0 400
-TH2F hcer_good_dtime_vs_pmt 'HMS Cherenkov Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Hodo Staart - Pulse Time / 0.1 ns' [I+1] H.cer.goodAdcTdcDiffTime 2 0.5 2.5 4000 -200 200
+TH2F hcer_good_dtime_vs_pmt 'HMS Cherenkov Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Hodo Staart - Pulse Time / 0.1 ns' [I+1] H.cer.goodAdcTdcDiffTime 2 0.5 2.5 4000 -200 200
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/DC/hdcana.def b/DEF-files/HMS/TEST_STANDS/DC/hdcana.def
index d9ae0a28..5a9a3081 100644
--- a/DEF-files/HMS/TEST_STANDS/DC/hdcana.def
+++ b/DEF-files/HMS/TEST_STANDS/DC/hdcana.def
@@ -1,5 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
+block T.hms.*
block H.dc.*
#include "DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def"
+#include "DEF-files/HMS/PRODUCTION/DC/hdc_histos.def"
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def b/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
index 0499dee1..2bc1c172 100644
--- a/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
+HMS_event g.evtyp == 2
+SHMS_event g.evtyp == 1
+COIN_event g.evtyp == 4
+
+TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+hms_trigs HMS_event
+edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+physics_accepted T.hms.hEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def b/DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def
index fbd8aedc..992c7ffe 100644
--- a/DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def
+++ b/DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def
@@ -1,20 +1,3 @@
-#------------------
-# HMS DC WIRE MAP
-#------------------
-
-TH1F hdc1u1_wirenum 'HMS DC 1U1 Wiremap; Wire Number; Number of Entries' H.dc.1u1.wirenum 96 0.5 96.5
-TH1F hdc1u2_wirenum 'HMS DC 1U2 Wiremap; Wire Number; Number of Entries' H.dc.1u2.wirenum 96 0.5 96.5
-TH1F hdc1x1_wirenum 'HMS DC 1X1 Wiremap; Wire Number; Number of Entries' H.dc.1x1.wirenum 102 0.5 102.5
-TH1F hdc1x2_wirenum 'HMS DC 1X2 Wiremap; Wire Number; Number of Entries' H.dc.1x2.wirenum 102 0.5 102.5
-TH1F hdc1v1_wirenum 'HMS DC 1V1 Wiremap; Wire Number; Number of Entries' H.dc.1v1.wirenum 96 0.5 96.5
-TH1F hdc1v2_wirenum 'HMS DC 1V2 Wiremap; Wire Number; Number of Entries' H.dc.1v2.wirenum 96 0.5 96.5
-
-TH1F hdc2v2_wirenum 'HMS DC 2V2 Wiremap; Wire Number; Number of Entries' H.dc.2v2.wirenum 96 0.5 96.5
-TH1F hdc2v1_wirenum 'HMS DC 2V1 Wiremap; Wire Number; Number of Entries' H.dc.2v1.wirenum 96 0.5 96.5
-TH1F hdc2x2_wirenum 'HMS DC 2X2 Wiremap; Wire Number; Number of Entries' H.dc.2x2.wirenum 102 0.5 102.5
-TH1F hdc2x1_wirenum 'HMS DC 2X1 Wiremap; Wire Number; Number of Entries' H.dc.2x1.wirenum 102 0.5 102.5
-TH1F hdc2u2_wirenum 'HMS DC 2U2 Wiremap; Wire Number; Number of Entries' H.dc.2u2.wirenum 96 0.5 96.5
-TH1F hdc2u1_wirenum 'HMS DC 2U1 Wiremap; Wire Number; Number of Entries' H.dc.2u1.wirenum 96 0.5 96.5
#------------------------------
# HMS DC RAW TDC PER PLANE
@@ -52,23 +35,6 @@ TH2F hdc2x1_raw_tdc_vs_wirenum 'HDC 2X1 Raw TDC vs. Wire Number; Wire Number; Ra
TH2F hdc2u2_raw_tdc_vs_wirenum 'HDC 2U2 Raw TDC vs. Wire Number; Wire Number; Raw TDC Value / 10 TDC Units' H.dc.2u2.wirenum H.dc.2u2.rawtdc 96 0.5 96.5 5000 -25000 25000
TH2F hdc2u1_raw_tdc_vs_wirenum 'HDC 2U1 Raw TDC vs. Wire Number; Wire Number; Raw TDC Value / 10 TDC Units' H.dc.2u1.wirenum H.dc.2u1.rawtdc 96 0.5 96.5 5000 -25000 25000
-#------------------------------
-# HMS DC DRIFT TIME PER PLANE
-#------------------------------
-TH1F hdc1u1_drifttime 'HMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1u1.time 400 -50 350
-TH1F hdc1u2_drifttime 'HMS DC 1U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1u2.time 400 -50 350
-TH1F hdc1x1_drifttime 'HMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x1.time 400 -50 350
-TH1F hdc1x2_drifttime 'HMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x2.time 400 -50 350
-TH1F hdc1v1_drifttime 'HMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1v1.time 400 -50 350
-TH1F hdc1v2_drifttime 'HMS DC 1V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1v2.time 400 -50 350
-
-TH1F hdc2v2_drifttime 'HMS DC 2V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2v2.time 400 -50 350
-TH1F hdc2v1_drifttime 'HMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2v1.time 400 -50 350
-TH1F hdc2x2_drifttime 'HMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x2.time 400 -50 350
-TH1F hdc2x1_drifttime 'HMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x1.time 400 -50 350
-TH1F hdc2u2_drifttime 'HMS DC 2U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2u2.time 400 -50 350
-TH1F hdc2u1_drifttime 'HMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2u1.time 400 -50 350
-
#----------------------------------
# HMS DC DRIFT TIME VS. WIRENUMBER
#----------------------------------
@@ -87,24 +53,6 @@ TH2F hdc2x1_drifttime_vs_wirenum 'HMS DC 2X1Drift Time vs. Wire Number; Wire Num
TH2F hdc2u2_drifttime_vs_wirenum 'HMS DC 2U2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2u2.wirenum H.dc.2u2.time 96 0.5 96.5 500 0 500
TH2F hdc2u1_drifttime_vs_wirenum 'HMS DC 2U1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2u1.wirenum H.dc.2u1.time 96 0.5 96.5 500 0 500
-#----------------------------------
-# HMS DC Drift Distance Per Plane
-#----------------------------------
-TH1F hdc1u1_ddist 'HMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1u1.dist 28 -0.1 0.6
-TH1F hdc1u2_ddist 'HMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1u2.dist 28 -0.1 0.6
-TH1F hdc1x1_ddist 'HMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x1.dist 28 -0.1 0.6
-TH1F hdc1x2_ddist 'HMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x2.dist 28 -0.1 0.6
-TH1F hdc1v1_ddist 'HMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1v1.dist 28 -0.1 0.6
-TH1F hdc1v2_ddist 'HMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1v2.dist 28 -0.1 0.6
-
-TH1F hdc2u2_ddist 'HMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2u2.dist 28 -0.1 0.6
-TH1F hdc2u1_ddist 'HMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2u1.dist 28 -0.1 0.6
-TH1F hdc2x2_ddist 'HMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x2.dist 28 -0.1 0.6
-TH1F hdc2x1_ddist 'HMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x1.dist 28 -0.1 0.6
-TH1F hdc2v2_ddist 'HMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2v2.dist 28 -0.1 0.6
-TH1F hdc2v1_ddist 'HMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2v1.dist 28 -0.1 0.6
-
-
#----------------------------------------
# HMS DC Drift Distance vs. Wire number
#----------------------------------------
@@ -141,8 +89,6 @@ TH1F hdc2x1_residuals 'HMS 2X1 DC Residuals; Residuals (cm); Number of Entries /
TH1F hdc2u2_residuals 'HMS 2U2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[10] 200 -1.0 1.0
TH1F hdc2u1_residuals 'HMS 2U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[11] 200 -1.0 1.0
-
-
#-----------------------------------
# HMS DC RESIDUALS vs. Wire Number
#-----------------------------------
@@ -159,17 +105,4 @@ TH2F hdc2v1_residuals_vs_wirenum 'HMS 2V1 DC Residuals vs. Wire Number; Wire Num
TH2F hdc2x2_residuals_vs_wirenum 'HMS 2X2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' H.dc.2x2.wirenum H.dc.residual[8] 102 0.5 102.5 200 -1.0 1.0
TH2F hdc2x1_residuals_vs_wirenum 'HMS 2X1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' H.dc.2x1.wirenum H.dc.residual[9] 102 0.5 102.5 200 -1.0 1.0
TH2F hdc2u2_residuals_vs_wirenum 'HMS 2U2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' H.dc.2u2.wirenum H.dc.residual[10] 96 0.5 96.5 200 -1.0 1.0
-TH2F hdc2u1_residuals_vs_wirenum 'HMS 2U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' H.dc.2u1.wirenum H.dc.residual[11] 96 0.5 96.5 200 -1.0 1.0
-
-#-------------------------------------------
-# HMS DC TRACKING VARIABLES AT FOCAL PLANE
-#-------------------------------------------
-
-TH1F hdc_trk_mom 'HMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6
-TH1F hdc_trk_beta 'HMS DC Track Beta; Beta (GeV); Number of Entires' H.tr.beta 300 -1.5 1.5
-TH2F hdc_xfp_vs_yfp 'HMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' H.dc.y_fp H.dc.x_fp 100 -50 50 100 -50 50
-TH2F hdc_xpfp_vs_ypfp 'HMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' H.dc.yp_fp H.dc.xp_fp 100 -.1 .1 100 -.1 .1
-TH2F hdc_xfp_vs_ypfp 'HMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.yp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
-TH2F hdc_xfp_vs_xpfp 'HMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.xp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
-TH2F hdc_yfp_vs_xpfp 'HMS DC Y_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; Y_{fp} / 1 cm' H.dc.xp_fp H.dc.y_fp 100 -.1 .1 100 -50 50
-TH2F hdc_yfp_vs_ypfp 'HMS DC Y_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; Y_{fp} / 1 cm' H.dc.yp_fp H.dc.y_fp 100 -.1 .1 100 -50 50
+TH2F hdc2u1_residuals_vs_wirenum 'HMS 2U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' H.dc.2u1.wirenum H.dc.residual[11] 96 0.5 96.5 200 -1.0 1.0
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def
index 28af8db2..3602c27f 100644
--- a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def
+++ b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def
@@ -1,6 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
-block H.hod.*
+
block T.hms.*
+block H.hod.*
#include "DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def"
+#include "DEF-files/HMS/PRODUCTION/HODO/hhodo_histos.def"
diff --git a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
index 0499dee1..2bc1c172 100644
--- a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
+HMS_event g.evtyp == 2
+SHMS_event g.evtyp == 1
+COIN_event g.evtyp == 4
+
+TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+hms_trigs HMS_event
+edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+physics_accepted T.hms.hEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def
index f19610d4..fb4feea0 100644
--- a/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def
+++ b/DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def
@@ -1,6 +1,7 @@
#-----------------------
# HMS Hodo Error Flags
#-----------------------
+
TH2F hhodo_1x_pos_adcErrFlg2D 'HMS 1X+ FPGA Error Flag; PMT Number; Error Flag' H.hod.1x.posAdcCounter H.hod.1x.posAdcErrorFlag 16 0.5 16.5 2 -0.5 1.5
TH2F hhodo_1y_pos_adcErrFlg2D 'HMS 1Y+ FPGA Error Flag; PMT Number; Error Flag' H.hod.1y.posAdcCounter H.hod.1y.posAdcErrorFlag 10 0.5 10.5 2 -0.5 1.5
TH2F hhodo_2x_pos_adcErrFlg2D 'HMS 2X+ FPGA Error Flag; PMT Number; Error Flag' H.hod.2x.posAdcCounter H.hod.2x.posAdcErrorFlag 16 0.5 16.5 2 -0.5 1.5
@@ -154,6 +155,7 @@ TH2F hhodo_2y_neg_raw_tdc_time_vs_pad 'HMS 2Y- Raw TDC Time vs. Paddle Number; P
#-------------------------
# HMS Hodo Pulse Pedestal
#-------------------------
+
TH2F hhodo_1x_pos_ped_vs_pad 'HMS 1X+ Pulse Pedestal vs. Paddle Number; Paddle Number; Pulse Pedestal / mV' H.hod.1x.posAdcCounter H.hod.1x.posAdcPed 16 0.5 16.5 200 0 200
TH2F hhodo_1y_pos_ped_vs_pad 'HMS 1Y+ Pulse Pedestal vs. Paddle Number; Paddle Number; Pulse Pedestal / mV' H.hod.1y.posAdcCounter H.hod.1y.posAdcPed 10 0.5 10.5 200 0 200
TH2F hhodo_2x_pos_ped_vs_pad 'HMS 2X+ Pulse Pedestal vs. Paddle Number; Paddle Number; Pulse Pedestal / mV' H.hod.2x.posAdcCounter H.hod.2x.posAdcPed 16 0.5 16.5 200 0 200
@@ -167,6 +169,7 @@ TH2F hhodo_2y_neg_ped_vs_pad 'HMS 2Y- Pulse Pedestal vs. Paddle Number; Paddle N
#-------------------------
# HMS Hodo Pulse Integral
#-------------------------
+
TH2F hhodo_1x_pos_pi_vs_pad 'HMS 1X+ Pulse Integral vs. Paddle Number; Paddle Number; Pulse Integral / 0.25 pC' H.hod.1x.posAdcCounter H.hod.1x.posAdcPulseInt 16 0.5 16.5 320 0 80
TH2F hhodo_1y_pos_pi_vs_pad 'HMS 1Y+ Pulse Integral vs. Paddle Number; Paddle Number; Pulse Integral / 0.25 pC' H.hod.1y.posAdcCounter H.hod.1y.posAdcPulseInt 10 0.5 10.5 320 0 80
TH2F hhodo_2x_pos_pi_vs_pad 'HMS 2X+ Pulse Integral vs. Paddle Number; Paddle Number; Pulse Integral / 0.25 pC' H.hod.2x.posAdcCounter H.hod.2x.posAdcPulseInt 16 0.5 16.5 320 0 80
@@ -181,6 +184,7 @@ TH2F hhodo_2y_neg_pi_vs_pad 'HMS 2Y- Pulse Integral vs. Paddle Number; Paddle Nu
#--------------------------
# HMS Hodo Pulse Amplitude
#--------------------------
+
TH2F hhodo_1x_pos_pamp_vs_pad 'HMS 1X+ Pulse Amplitude vs. Paddle Number; Paddle Number; Pulse Amplitude / 2 mV' H.hod.1x.posAdcCounter H.hod.1x.posAdcPulseAmp 16 0.5 16.5 500 0 1000
TH2F hhodo_1y_pos_pamp_vs_pad 'HMS 1Y+ Pulse Amplitude vs. Paddle Number; Paddle Number; Pulse Amplitude / 2 mV' H.hod.1y.posAdcCounter H.hod.1y.posAdcPulseAmp 10 0.5 10.5 500 0 1000
TH2F hhodo_2x_pos_pamp_vs_pad 'HMS 2X+ Pulse Amplitude vs. Paddle Number; Paddle Number; Pulse Amplitude / 2 mV' H.hod.2x.posAdcCounter H.hod.2x.posAdcPulseAmp 16 0.5 16.5 500 0 1000
@@ -194,6 +198,7 @@ TH2F hhodo_2y_neg_pamp_vs_pad 'HMS 2Y- Pulse Amplitude vs. Paddle Number; Paddle
#-------------------
# HMS Hodo TDC Time
#-------------------
+
TH2F hhodo_1x_pos_tdc_time_vs_pad 'HMS 1X+ TDC Time vs. Paddle Number; Paddle Number; TDC Time / 10 TDC Units' H.hod.1x.posTdcCounter H.hod.1x.posTdcTime 16 0.5 16.5 200 -2000 0
TH2F hhodo_1y_pos_tdc_time_vs_pad 'HMS 1Y+ TDC Time vs. Paddle Number; Paddle Number; TDC Time / 10 TDC Units' H.hod.1y.posTdcCounter H.hod.1y.posTdcTime 10 0.5 10.5 200 -2000 0
TH2F hhodo_2x_pos_tdc_time_vs_pad 'HMS 2X+ TDC Time vs. Paddle Number; Paddle Number; TDC Time / 10 TDC Units' H.hod.2x.posTdcCounter H.hod.2x.posTdcTime 16 0.5 16.5 200 -2000 0
@@ -204,87 +209,6 @@ TH2F hhodo_1y_neg_tdc_time_vs_pad 'HMS 1Y- TDC Time vs. Paddle Number; Paddle Nu
TH2F hhodo_2x_neg_tdc_time_vs_pad 'HMS 2X- TDC Time vs. Paddle Number; Paddle Number; TDC Time / 10 TDC Units' H.hod.2x.negTdcCounter H.hod.2x.negTdcTime 16 0.5 16.5 200 -2000 0
TH2F hhodo_2y_neg_tdc_time_vs_pad 'HMS 2Y- TDC Time vs. Paddle Number; Paddle Number; TDC Time / 10 TDC Units' H.hod.2y.negTdcCounter H.hod.2y.negTdcTime 10 0.5 10.5 200 -2000 0
-
-#-----------------------------------
-# HMS HODO GOOD ADC Multiplicities
-#-----------------------------------
-
-TH1F hhodo_1x_good_adc_mult_pos 'HMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1x.totNumGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult_pos 'HMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1y.totNumGoodPosAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult_pos 'HMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2x.totNumGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult_pos 'HMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2y.totNumGoodPosAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_mult_neg 'HMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1x.totNumGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult_neg 'HMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1y.totNumGoodNegAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult_neg 'HMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2x.totNumGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult_neg 'HMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2y.totNumGoodNegAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_mult 'HMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1x.totNumGoodAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult 'HMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1y.totNumGoodAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult 'HMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2x.totNumGoodAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult 'HMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2y.totNumGoodAdcHits 10 0.5 10.5
-
-#-----------------------------------
-# HMS HODO Good TDC Multiplicities
-#-----------------------------------
-
-TH1F hhodo_1x_good_tdc_mult_pos 'HMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1x.totNumGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult_pos 'HMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1y.totNumGoodPosTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult_pos 'HMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2x.totNumGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult_pos 'HMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2y.totNumGoodPosTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_mult_neg 'HMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1x.totNumGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult_neg 'HMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1y.totNumGoodNegTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult_neg 'HMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2x.totNumGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult_neg 'HMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2y.totNumGoodNegTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_mult 'HMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1x.totNumGoodTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult 'HMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1y.totNumGoodTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult 'HMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2x.totNumGoodTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult 'HMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2y.totNumGoodTdcHits 10 0.5 10.5
-
-#---------------------------------
-# HMS HODO GOOD ADC OCCUPANCIES
-#---------------------------------
-
-TH1F hhodo_1x_good_adc_occ_pos 'HMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1x.numGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_occ_pos 'HMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1y.numGoodPosAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_occ_pos 'HMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2x.numGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_occ_pos 'HMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2y.numGoodPosAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_occ_neg 'HMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1x.numGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_occ_neg 'HMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1y.numGoodNegAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_occ_neg 'HMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2x.numGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_occ_neg 'HMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2y.numGoodNegAdcHits 10 0.5 10.5
-
-#--------------------------------
-# HMS HODO GOOD TDC OCCUPANCIES
-#--------------------------------
-
-TH1F hhodo_1x_good_tdc_occ_pos 'HMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1x.numGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_occ_pos 'HMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1y.numGoodPosTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_occ_pos 'HMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2x.numGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_occ_pos 'HMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2y.numGoodPosTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_occ_neg 'HMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1x.numGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_occ_neg 'HMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1y.numGoodNegTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_occ_neg 'HMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2x.numGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_occ_neg 'HMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2y.numGoodNegTdcHits 10 0.5 10.5
-
-#------------------------------
-# HMS HODO Good PULSE PEDESTAL
-#------------------------------
-
-TH2F hhodo_1x_good_pped_vs_pmt_pos 'HMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1x.GoodPosAdcPed 16 0.5 16.5 200 0 200 H.hod.1x.GoodPosAdcPed>0.0
-TH2F hhodo_1y_good_pped_vs_pmt_pos 'HMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1y.GoodPosAdcPed 10 0.5 10.5 200 0 200 H.hod.1y.GoodPosAdcPed>0.0
-TH2F hhodo_2x_good_pped_vs_pmt_pos 'HMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2x.GoodPosAdcPed 16 0.5 16.5 200 0 200 H.hod.2x.GoodPosAdcPed>0.0
-TH2F hhodo_2y_good_pped_vs_pmt_pos 'HMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2y.GoodPosAdcPed 10 0.5 10.5 200 0 200 H.hod.2y.GoodPosAdcPed>0.0
-
-TH2F hhodo_1x_good_pped_vs_pmt_neg 'HMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1x.GoodNegAdcPed 16 0.5 16.5 200 0 200 H.hod.1x.GoodNegAdcPed>0.0
-TH2F hhodo_1y_good_pped_vs_pmt_neg 'HMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.1y.GoodNegAdcPed 10 0.5 10.5 200 0 200 H.hod.1y.GoodNegAdcPed>0.0
-TH2F hhodo_2x_good_pped_vs_pmt_neg 'HMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2x.GoodNegAdcPed 16 0.5 16.5 200 0 200 H.hod.2x.GoodNegAdcPed>0.0
-TH2F hhodo_2y_good_pped_vs_pmt_neg 'HMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / mV' [I+1] H.hod.2y.GoodNegAdcPed 10 0.5 10.5 200 0 200 H.hod.2y.GoodNegAdcPed>0.0
-
#------------------------------
# HMS HODO Good PULSE INTEGRAL
#------------------------------
@@ -381,4 +305,4 @@ TH2F hhodo_2y_good_tdctime_tofcorr_vs_pmt_pos 'HMS 2Y+ Good TOF Corrected TDC Ti
TH2F hhodo_1x_good_tdctime_tofcorr_vs_pmt_neg 'HMS 1X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] H.hod.1x.GoodNegTdcTimeTOFCorr 16 0.5 16.5 1200 0 120 H.hod.1x.GoodNegTdcTimeTOFCorr>0.0
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
+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
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
index c8de0b9c..9d2172c8 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
@@ -1,3 +1,4 @@
block T.hms.*
#include "DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def"
+#include "DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def"
\ No newline at end of file
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
index 0499dee1..2bc1c172 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
+HMS_event g.evtyp == 2
+SHMS_event g.evtyp == 1
+COIN_event g.evtyp == 4
+
+TRIG1 T.hms.hTRIG1_tdcTimeRaw > 0
+TRIG2 T.hms.hTRIG2_tdcTimeRaw > 0
+TRIG3 T.hms.hTRIG3_tdcTimeRaw > 0
+HMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+hms_trigs HMS_event
+edtm_accepted T.hms.hEDTM_tdcTime != 0.0
+physics_accepted T.hms.hEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def
index 40b7f42d..03af7e00 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def
@@ -37,11 +37,6 @@ TH1F htrig_hdc_raw_ref2 'HMS DC Reference Time 2; Raw TDC Time (TDC Units); Coun
TH1F htrig_hdc_raw_ref3 'HMS DC Reference Time 3; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF3_tdcTimeRaw 1500 0 15000
TH1F htrig_hdc_raw_ref4 'HMS DC Reference Time 4; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF4_tdcTimeRaw 1500 0 15000
-TH1F htrig_hdc_ref1 'HMS DC Reference Time 1; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF1_tdcTime 2000 0 2000
-TH1F htrig_hdc_ref2 'HMS DC Reference Time 2; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF2_tdcTime 2000 0 2000
-TH1F htrig_hdc_ref3 'HMS DC Reference Time 3; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF3_tdcTime 2000 0 2000
-TH1F htrig_hdc_ref4 'HMS DC Reference Time 4; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF4_tdcTime 2000 0 2000
-
TH1F hdc_refdiff_1m2 'HDC Reference time 1 minus 2; TDC Time (ns); Number of Entries / 0.1 ns' T.hms.hDCREF1_tdcTime-T.hms.hDCREF2_tdcTime 2000 -100 100
TH1F hdc_refdiff_1m3 'HDC Reference time 1 minus 3; TDC Time (ns); Number of Entries / 0.1 ns' T.hms.hDCREF1_tdcTime-T.hms.hDCREF3_tdcTime 2000 -100 100
TH1F hdc_refdiff_1m4 'HDC Reference time 1 minus 4; TDC Time (ns); Number of Entries / 0.1 ns' T.hms.hDCREF1_tdcTime-T.hms.hDCREF4_tdcTime 2000 -100 100
@@ -189,6 +184,4 @@ TH1F htrig_haersum_adc_ptime 'HMS Aerogel Sum Pulse Time; Raw Pulse Time (ns); C
TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hAERSUM_adcPed 500 0 1000
TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (pC); Counts / 0.25 pC;' T.hms.hAERSUM_adcPulseInt 320 0 80
TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (mV); Counts / 2 mV;' T.hms.hAERSUM_adcPulseAmp 500 0 1000
-#TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hAERSUM_tdcTime 4000 0 400
-
-
+#TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.hAERSUM_tdcTime 4000 0 400
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
index f06305d9..74a5fc04 100644
--- a/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
@@ -2,9 +2,30 @@
# SHMS AEROGEL *
#***************
-#--------------------------
-# SHMS HGC TRACK PROJECTION
-#--------------------------
+#------------------------------
+# SHMS AERO FADC/NPE MONITORING
+#------------------------------
+
+TH2F paero_good_pped_vs_pmt_pos 'SHMS Aero+ Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.aero.goodPosAdcPed 7 0.5 7.5 500 0 1000 P.aero.goodPosAdcPed>0.0
+TH2F paero_good_pped_vs_pmt_neg 'SHMS Aero- Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.aero.goodNegAdcPed 7 0.5 7.5 500 0 1000 P.aero.goodNegAdcPed>0.0
+
+TH1F paero_good_occ_pos 'SHMS Aero+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.aero.numGoodPosAdcHits 7 0.5 7.5
+TH1F paero_good_occ_neg 'SHMS Aero- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.aero.numGoodNegAdcHits 7 0.5 7.5
+TH1F paero_good_mult_pos 'SHMS Aero+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.aero.totNumGoodPosAdcHits 7 0.5 7.5
+TH1F paero_good_mult_neg 'SHMS Aero- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.aero.totNumGoodNegAdcHits 7 0.5 7.5
+TH1F paero_good_mult 'SHMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.aero.totnumGoodAdcHits 14 0.5 14.5
+
+TH1F paero_tot_npe_pos 'SHMS Aero+ Total Number of Photoelectrons; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.posNpeSum 100 0 50 P.aero.posNpeSum>0.0
+TH1F paero_tot_npe_neg 'SHMS Aero- Total Number of Photoelectrons; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.negNpeSum 100 0 50 P.aero.negNpeSum>0.0
+TH1F paero_tot_npe 'SHMS Aero Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.npeSum 100 0 50 P.aero.npeSum>0.0
+
+TH2F paero_npe_pos 'SHMS Aero+ Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.aero.posNpe 7 0.5 7.5 100 0 50 P.aero.posNpe>0.0
+TH2F paero_npe_neg 'SHMS Aero- Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.aero.negNpe 7 0.5 7.5 100 0 50 P.aero.negNpe>0.0
+
+#----------------------------
+# SHMS AERO 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
diff --git a/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
index 3ce711a0..10d1b4b7 100644
--- a/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
+++ b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
@@ -2,8 +2,15 @@
# Block Definitions *
#********************
+block T.shms.*
+block P.ngcer.*
+block P.dc.*
+block P.hod.*
+block P.hgcer.*
+block P.aero.*
+block P.cal.*
block P.tr.*
block P.gtr.*
block P.kin.*
block P.rb.*
-block P.react.*
+block P.react.*
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
index f6c5a42d..9a5abfc0 100644
--- a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
@@ -2,65 +2,20 @@
# SHMS CALORIMETER *
#*******************
-#-------------------------------------------------------------------------------------
-# SHMS PRE-SHOWER AND SHOWER (CALORIMETER) TOTAL ENERGY DEPOSITION
-# TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
-#-------------------------------------------------------------------------------------
+#---------------------------------
+# SHMS CALORIMETER FADC MONITORING
+#---------------------------------
-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
+TH1F pcal_prshwr_good_occ_pos 'SHMS PreShower+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.cal.pr.numGoodPosAdcHits 14 0.5 14.5
+TH1F pcal_prshwr_good_occ_neg 'SHMS PreShower- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.cal.pr.numGoodNegAdcHits 14 0.5 14.5
+TH1F pcal_prshwr_good_mult_pos 'SHMS PreShower+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.cal.pr.totNumGoodPosAdcHits 14 0.5 14.5
+TH1F pcal_prshwr_good_mult_neg 'SHMS PreShower- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.cal.pr.totNumGoodNegAdcHits 14 0.5 14.5
+TH1F pcal_prshwr_good_mult 'SHMS PreShower Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.cal.pr.totnumGoodAdcHits 28 0.5 28.5
-#-------------------------------
-# SHMS PID AND ACCEPTANCE PLOTS
-#-------------------------------
+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 40 0.5 40.5
-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 pcal_prshwr_good_pped_vs_pmt_pos 'SHMS PreShower+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.cal.pr.goodPosAdcPed 14 0.5 14.5 500 0 1000 P.cal.pr.goodPosAdcPed>0.0
+TH2F pcal_prshwr_good_pped_vs_pmt_neg 'SHMS PreShower- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.cal.pr.goodNegAdcPed 14 0.5 14.5 500 0 1000 P.cal.pr.goodNegAdcPed>0.0
-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 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_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&&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
+TH2F pcal_shwr_good_pped_vs_pmt 'SHMS Shower Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.cal.fly.goodAdcPed 224 0.5 224.5 500 0 1000 P.cal.fly.goodAdcPed>0.0
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
index 87ae82e9..60273259 100644
--- a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
@@ -1,9 +1,66 @@
-#**********************
-# SHMS Drift Chambers *
-#**********************
+#------------------
+# SHMS DC WIRE MAP
+#------------------
-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 pdc1u1_wirenum 'SHMS DC 1U1 Wiremap; Wire Number; Number of Entries' P.dc.1u1.wirenum 107 0.5 107.5
+TH1F pdc1u2_wirenum 'SHMS DC 1U2 Wiremap; Wire Number; Number of Entries' P.dc.1u2.wirenum 107 0.5 107.5
+TH1F pdc1x1_wirenum 'SHMS DC 1X1 Wiremap; Wire Number; Number of Entries' P.dc.1x1.wirenum 79 0.5 79.5
+TH1F pdc1x2_wirenum 'SHMS DC 1X2 Wiremap; Wire Number; Number of Entries' P.dc.1x2.wirenum 79 0.5 79.5
+TH1F pdc1v1_wirenum 'SHMS DC 1V1 Wiremap; Wire Number; Number of Entries' P.dc.1v1.wirenum 107 0.5 107.5
+TH1F pdc1v2_wirenum 'SHMS DC 1V2 Wiremap; Wire Number; Number of Entries' P.dc.1v2.wirenum 107 0.5 107.5
-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
+TH1F pdc2v2_wirenum 'SHMS DC 2V2 Wiremap; Wire Number; Number of Entries' P.dc.2v2.wirenum 107 0.5 107.5
+TH1F pdc2v1_wirenum 'SHMS DC 2V1 Wiremap; Wire Number; Number of Entries' P.dc.2v1.wirenum 107 0.5 107.5
+TH1F pdc2x2_wirenum 'SHMS DC 2X2 Wiremap; Wire Number; Number of Entries' P.dc.2x2.wirenum 79 0.5 79.5
+TH1F pdc2x1_wirenum 'SHMS DC 2X1 Wiremap; Wire Number; Number of Entries' P.dc.2x1.wirenum 79 0.5 79.5
+TH1F pdc2u2_wirenum 'SHMS DC 2U2 Wiremap; Wire Number; Number of Entries' P.dc.2u2.wirenum 107 0.5 107.5
+TH1F pdc2u1_wirenum 'SHMS DC 2U1 Wiremap; Wire Number; Number of Entries' P.dc.2u1.wirenum 107 0.5 107.5
+
+#------------------------------
+# SHMS DC DRIFT TIME PER PLANE
+#------------------------------
+
+TH1F pdc1u1_drifttime 'SHMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u1.time 400 -50 350
+TH1F pdc1u2_drifttime 'SHMS DC 1U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u2.time 400 -50 350
+TH1F pdc1x1_drifttime 'SHMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x1.time 400 -50 350
+TH1F pdc1x2_drifttime 'SHMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x2.time 400 -50 350
+TH1F pdc1v1_drifttime 'SHMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v1.time 400 -50 350
+TH1F pdc1v2_drifttime 'SHMS DC 1V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v2.time 400 -50 350
+
+TH1F pdc2v2_drifttime 'SHMS DC 2V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v2.time 400 -50 350
+TH1F pdc2v1_drifttime 'SHMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v1.time 400 -50 350
+TH1F pdc2x2_drifttime 'SHMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x2.time 400 -50 350
+TH1F pdc2x1_drifttime 'SHMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x1.time 400 -50 350
+TH1F pdc2u2_drifttime 'SHMS DC 2U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u2.time 400 -50 350
+TH1F pdc2u1_drifttime 'SHMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u1.time 400 -50 350
+
+#----------------------------------
+# SHMS DC Drift Distance Per Plane
+#----------------------------------
+
+TH1F pdc1u1_ddist 'SHMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u1.dist 28 -0.1 0.6
+TH1F pdc1u2_ddist 'SHMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u2.dist 28 -0.1 0.6
+TH1F pdc1x1_ddist 'SHMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x1.dist 28 -0.1 0.6
+TH1F pdc1x2_ddist 'SHMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x2.dist 28 -0.1 0.6
+TH1F pdc1v1_ddist 'SHMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v1.dist 28 -0.1 0.6
+TH1F pdc1v2_ddist 'SHMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v2.dist 28 -0.1 0.6
+
+TH1F pdc2u2_ddist 'SHMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u2.dist 28 -0.1 0.6
+TH1F pdc2u1_ddist 'SHMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u1.dist 28 -0.1 0.6
+TH1F pdc2x2_ddist 'SHMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x2.dist 28 -0.1 0.6
+TH1F pdc2x1_ddist 'SHMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x1.dist 28 -0.1 0.6
+TH1F pdc2v2_ddist 'SHMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v2.dist 28 -0.1 0.6
+TH1F pdc2v1_ddist 'SHMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v1.dist 28 -0.1 0.6
+
+#-------------------------------------------
+# 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
+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
+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
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
index 7e1067fd..11109317 100644
--- a/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
@@ -2,17 +2,29 @@
# Heavy Gas Cherenkov *
#**********************
-#--------------------------
+#------------------------------
+# SHMS HGC FADC/NPE MONITORING
+#------------------------------
+
+TH2F phgcer_good_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.hgcer.goodAdcPed 4 0.5 4.5 500 0 1000
+
+TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Number Good ADC Hits' P.hgcer.numGoodAdcHits 4 0.5 4.5
+TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
+
+TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.hgcer.npe 4 0.5 4.5 100 0 50 P.hgcer.npe>0.0
+TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 100 0 50 P.hgcer.npeSum>0.0
+
+#-------------------------
# SHMS HGC TRACK MATCHING
-#--------------------------
+#-------------------------
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
diff --git a/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
index 5ad5d950..391e513e 100644
--- a/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
@@ -2,9 +2,79 @@
# SHMS HODOSCOPES
#*****************
-#----------------------------------------------------------------
-# SHMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
-#----------------------------------------------------------------
+#-------------------------
+# SHMS FADC/TDC Monitoring
+#-------------------------
+
+# SHMS HODO GOOD PULSE PEDESTAL
+
+TH2F phodo_1x_good_pped_vs_pmt_pos 'SHMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1x.GoodPosAdcPed 13 0.5 13.5 500 0 1000 P.hod.1x.GoodPosAdcPed>0.0
+TH2F phodo_1y_good_pped_vs_pmt_pos 'SHMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1y.GoodPosAdcPed 13 0.5 13.5 500 0 1000 P.hod.1y.GoodPosAdcPed>0.0
+TH2F phodo_2x_good_pped_vs_pmt_pos 'SHMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2x.GoodPosAdcPed 14 0.5 14.5 500 0 1000 P.hod.2x.GoodPosAdcPed>0.0
+TH2F phodo_2y_good_pped_vs_pmt_pos 'SHMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2y.GoodPosAdcPed 21 0.5 21.5 500 0 1000 P.hod.2y.GoodPosAdcPed>0.0
+
+TH2F phodo_1x_good_pped_vs_pmt_neg 'SHMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1x.GoodNegAdcPed 13 0.5 13.5 500 0 1000 P.hod.1x.GoodNegAdcPed>0.0
+TH2F phodo_1y_good_pped_vs_pmt_neg 'SHMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1y.GoodNegAdcPed 13 0.5 13.5 500 0 1000 P.hod.1y.GoodNegAdcPed>0.0
+TH2F phodo_2x_good_pped_vs_pmt_neg 'SHMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2x.GoodNegAdcPed 14 0.5 14.5 500 0 1000 P.hod.2x.GoodNegAdcPed>0.0
+TH2F phodo_2y_good_pped_vs_pmt_neg 'SHMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2y.GoodNegAdcPed 21 0.5 21.5 500 0 1000 P.hod.2y.GoodNegAdcPed>0.0
+
+# SHMS HODO GOOD ADC Multiplicities
+
+TH1F phodo_1x_good_adc_mult_pos 'SHMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1x.totNumGoodPosAdcHits 13 0.5 13.5
+TH1F phodo_1y_good_adc_mult_pos 'SHMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1y.totNumGoodPosAdcHits 13 0.5 13.5
+TH1F phodo_2x_good_adc_mult_pos 'SHMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2x.totNumGoodPosAdcHits 14 0.5 14.5
+TH1F phodo_2y_good_adc_mult_pos 'SHMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2y.totNumGoodPosAdcHits 21 0.5 21.5
+
+TH1F phodo_1x_good_adc_mult_neg 'SHMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1x.totNumGoodNegAdcHits 13 0.5 13.5
+TH1F phodo_1y_good_adc_mult_neg 'SHMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1y.totNumGoodNegAdcHits 13 0.5 13.5
+TH1F phodo_2x_good_adc_mult_neg 'SHMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2x.totNumGoodNegAdcHits 14 0.5 14.5
+TH1F phodo_2y_good_adc_mult_neg 'SHMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2y.totNumGoodNegAdcHits 21 0.5 21.5
+
+TH1F phodo_1x_good_adc_mult 'SHMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1x.totNumGoodAdcHits 13 0.5 13.5
+TH1F phodo_1y_good_adc_mult 'SHMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1y.totNumGoodAdcHits 13 0.5 13.5
+TH1F phodo_2x_good_adc_mult 'SHMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2x.totNumGoodAdcHits 14 0.5 14.5
+TH1F phodo_2y_good_adc_mult 'SHMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2y.totNumGoodAdcHits 21 0.5 21.5
+
+# SHMS HODO Good TDC Multiplicities
+
+TH1F phodo_1x_good_tdc_mult_pos 'SHMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1x.totNumGoodPosTdcHits 13 0.5 13.5
+TH1F phodo_1y_good_tdc_mult_pos 'SHMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1y.totNumGoodPosTdcHits 13 0.5 13.5
+TH1F phodo_2x_good_tdc_mult_pos 'SHMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2x.totNumGoodPosTdcHits 14 0.5 14.5
+TH1F phodo_2y_good_tdc_mult_pos 'SHMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2y.totNumGoodPosTdcHits 21 0.5 21.5
+
+TH1F phodo_1x_good_tdc_mult_neg 'SHMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1x.totNumGoodNegTdcHits 13 0.5 13.5
+TH1F phodo_1y_good_tdc_mult_neg 'SHMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1y.totNumGoodNegTdcHits 13 0.5 13.5
+TH1F phodo_2x_good_tdc_mult_neg 'SHMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2x.totNumGoodNegTdcHits 14 0.5 14.5
+TH1F phodo_2y_good_tdc_mult_neg 'SHMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2y.totNumGoodNegTdcHits 21 0.5 21.5
+
+TH1F phodo_1x_good_tdc_mult 'SHMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1x.totNumGoodTdcHits 13 0.5 13.5
+TH1F phodo_1y_good_tdc_mult 'SHMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1y.totNumGoodTdcHits 13 0.5 13.5
+TH1F phodo_2x_good_tdc_mult 'SHMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2x.totNumGoodTdcHits 14 0.5 14.5
+TH1F phodo_2y_good_tdc_mult 'SHMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2y.totNumGoodTdcHits 21 0.5 21.5
+
+# SHMS HODO GOOD ADC OCCUPANCIES
+
+TH1F phodo_1x_good_adc_occ_pos 'SHMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1x.numGoodPosAdcHits 13 0.5 13.5
+TH1F phodo_1y_good_adc_occ_pos 'SHMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1y.numGoodPosAdcHits 13 0.5 13.5
+TH1F phodo_2x_good_adc_occ_pos 'SHMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2x.numGoodPosAdcHits 14 0.5 14.5
+TH1F phodo_2y_good_adc_occ_pos 'SHMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2y.numGoodPosAdcHits 21 0.5 21.5
+
+TH1F phodo_1x_good_adc_occ_neg 'SHMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1x.numGoodNegAdcHits 13 0.5 13.5
+TH1F phodo_1y_good_adc_occ_neg 'SHMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1y.numGoodNegAdcHits 13 0.5 13.5
+TH1F phodo_2x_good_adc_occ_neg 'SHMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2x.numGoodNegAdcHits 14 0.5 14.5
+TH1F phodo_2y_good_adc_occ_neg 'SHMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2y.numGoodNegAdcHits 21 0.5 21.5
+
+#SHMS HODO GOOD TDC OCCUPANCIES
+
+TH1F phodo_1x_good_tdc_occ_pos 'SHMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1x.numGoodPosTdcHits 13 0.5 13.5
+TH1F phodo_1y_good_tdc_occ_pos 'SHMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1y.numGoodPosTdcHits 13 0.5 13.5
+TH1F phodo_2x_good_tdc_occ_pos 'SHMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2x.numGoodPosTdcHits 14 0.5 14.5
+TH1F phodo_2y_good_tdc_occ_pos 'SHMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2y.numGoodPosTdcHits 21 0.5 21.5
+
+TH1F phodo_1x_good_tdc_occ_neg 'SHMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1x.numGoodNegTdcHits 13 0.5 13.5
+TH1F phodo_1y_good_tdc_occ_neg 'SHMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1y.numGoodNegTdcHits 13 0.5 13.5
+TH1F phodo_2x_good_tdc_occ_neg 'SHMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2x.numGoodNegTdcHits 14 0.5 14.5
+TH1F phodo_2y_good_tdc_occ_neg 'SHMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2y.numGoodNegTdcHits 21 0.5 21.5
#----------------------------------------------------------------
# SHMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
@@ -26,4 +96,4 @@ TH1F phodo_2y_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.2y.DiffDis
TH2F phodo_1x_diffdistrack_v_xtrack 'SHMS Hodo Diff Distance track (cm) versus Track X (cm)' P.hod.1x.DiffDisTrack P.hod.1x.TrackXPos 100 -10. 10. 240 -60 60
TH2F phodo_1y_diffdistrack_v_ytrack 'SHMS Hodo Diff Distance track (cm) versus Track Y (cm)' P.hod.1y.DiffDisTrack P.hod.1y.TrackYPos 100 -10. 10. 240 -60 60
TH2F phodo_2x_diffdistrack_v_xtrack 'SHMS Hodo Diff Distance track (cm) versus Track X (cm)' P.hod.2x.DiffDisTrack P.hod.2x.TrackXPos 100 -10. 10. 240 -60 60
-TH2F phodo_2y_diffdistrack_v_ytrack 'SHMS Hodo Diff Distance track (cm) versus Track Y (cm)' P.hod.2y.DiffDisTrack P.hod.2y.TrackXPos 100 -10. 10. 240 -60 60
+TH2F phodo_2y_diffdistrack_v_ytrack 'SHMS Hodo Diff Distance track (cm) versus Track Y (cm)' P.hod.2y.DiffDisTrack P.hod.2y.TrackXPos 100 -10. 10. 240 -60 60
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def b/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
index 5231f77e..35f2979e 100644
--- a/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
@@ -2,6 +2,18 @@
# Noble Gas Cherenkov *
#**********************
+#-----------------------------
+# SHMS NGC FADC/NPE MONITORING
+#-----------------------------
+
+TH2F pngcer_good_pped_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.ngcer.goodAdcPed 4 0.5 4.5 500 0 1000
+
+TH1F pngcer_good_occ 'SHMS Noble Gas Cherenkov Good Occupancy; PMT Number; Number of Good ADC Hits' P.ngcer.numGoodAdcHits 4 0.5 4.5
+TH1F pngcer_good_mult 'SHMS Noble Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.ngcer.totNumGoodAdcHits 4 0.5 4.5
+
+TH2F pngcer_npe 'SHMS Noble Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.ngcer.npe 4 0.5 4.5 100 0 50 P.ngcer.npe>0.0
+TH1F pngcer_tot_npe 'SHMS Noble Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.ngcer.npeSum 100 0 50 P.ngcer.npeSum>0.0
+
#--------------------------
# SHMS NGC TRACK MATCHING
#--------------------------
@@ -12,6 +24,7 @@ sTH1F pngcer_trk_fired 'SHMS Noble Gas Cherenkov Tracks Fired; PMT Number; Numbe
#--------------------------
# 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
diff --git a/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def b/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
new file mode 100644
index 00000000..6a85039f
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
@@ -0,0 +1,77 @@
+
+#-------------------------------------------------------------------------------------
+# SHMS PRE-SHOWER AND SHOWER (CALORIMETER) TOTAL ENERGY DEPOSITION
+# TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
+#-------------------------------------------------------------------------------------
+
+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
+
+#---------------------------
+# CLUSTERING PLOTS
+#---------------------------
+
+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_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&&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
+
+#-------------------------------
+# 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&&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
+
+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
+TH2F pcal_shwr_good_dtime_vs_pmt 'SHMS Shower Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.fly.goodAdcPulseTime 224 0.5 224.5 4000 -200 200
+
+#-----------------------------
+# 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&&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
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
index 0756f3d6..10fea5f7 100644
--- a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
@@ -2,19 +2,24 @@
# Trigger Apparatus *
#********************
-TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1X_tdcMultiplicity 11 0 11
-TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1Y_tdcMultiplicity 11 0 11
-TH1F ptrig_p2x_tdc_mult 'SHMS p2x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2X_tdcMultiplicity 11 0 11
-TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2Y_tdcMultiplicity 11 0 11
-
-TH1F ptrig_p1T_tdc_mult 'SHMS p1x/p1y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1T_tdcMultiplicity 11 0 11
-TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2T_tdcMultiplicity 11 0 11
-
-TH1F ptrig_pT1_tdc_mult 'SHMS pT1 TDC Multiplicity (Slot 20, Channel 15); TDC Multiplicity; Counts / 1' T.shms.pT1_tdcMultiplicity 11 0 11
-TH1F ptrig_pT2_tdc_mult 'SHMS pT2 TDC Multiplicity (Slot 19, Channel 31); TDC Multiplicity; Counts / 1' T.shms.pT2_tdcMultiplicity 11 0 11
-TH1F ptrig_pT3_tdc_mult 'SHMS pT3 TDC Multiplicity (Slot 19, Channel 38); TDC Multiplicity; Counts / 1' T.shms.pT3_tdcMultiplicity 11 0 11
-
-TH1F ptrig_pFADC_TREF_ROC2_ptime_mult 'SHMS pFADC_TREF_ROC2 ADC Multiplicity; ADC Multiplicity; Counts / 1' T.shms.pFADC_TREF_ROC2_adcMultiplicity 11 0 11
+#-------------------
+# DC REFERENCE TIMES
+#-------------------
+
+TH1F ptrig_pdc_ref1 'SHMS PDC Reference Time 1; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF1_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref2 'SHMS PDC Reference Time 2; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF2_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref3 'SHMS PDC Reference Time 3; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF3_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref4 'SHMS PDC Reference Time 4; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF4_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref5 'SHMS PDC Reference Time 5; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF5_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref6 'SHMS PDC Reference Time 6; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF6_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref7 'SHMS PDC Reference Time 7; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF7_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref8 'SHMS PDC Reference Time 8; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF8_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref9 'SHMS PDC Reference Time 9; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF9_tdcTime 4000 0 4000
+TH1F ptrig_pdc_ref10 'SHMS PDC Reference Time 10; TDC Time (ns); Counts / 1 ns;' T.shms.pDCREF10_tdcTime 4000 0 4000
+
+#------------------------
+# TRIGGER REFERENCE TIMES
+#------------------------
TH1F ptrig_p1x_good_tdc 'SHMS p1x Good TDC Time; Good 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 TDC Time (ns); Counts / 1 ns' T.shms.p1Y_tdcTime 800 0 800 T.shms.p1Y_tdcMultiplicity==1
@@ -34,3 +39,17 @@ TH2F ptrig_ch1xy_ch2x 'SHMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.shms.p1T_
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
+
+TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1X_tdcMultiplicity 11 0 11
+TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1Y_tdcMultiplicity 11 0 11
+TH1F ptrig_p2x_tdc_mult 'SHMS p2x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2X_tdcMultiplicity 11 0 11
+TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2Y_tdcMultiplicity 11 0 11
+
+TH1F ptrig_p1T_tdc_mult 'SHMS p1x/p1y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1T_tdcMultiplicity 11 0 11
+TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2T_tdcMultiplicity 11 0 11
+
+TH1F ptrig_pT1_tdc_mult 'SHMS pT1 TDC Multiplicity (Slot 20, Channel 15); TDC Multiplicity; Counts / 1' T.shms.pT1_tdcMultiplicity 11 0 11
+TH1F ptrig_pT2_tdc_mult 'SHMS pT2 TDC Multiplicity (Slot 19, Channel 31); TDC Multiplicity; Counts / 1' T.shms.pT2_tdcMultiplicity 11 0 11
+TH1F ptrig_pT3_tdc_mult 'SHMS pT3 TDC Multiplicity (Slot 19, Channel 38); TDC Multiplicity; Counts / 1' T.shms.pT3_tdcMultiplicity 11 0 11
+
+TH1F ptrig_pFADC_TREF_ROC2_ptime_mult 'SHMS pFADC_TREF_ROC2 ADC Multiplicity; ADC Multiplicity; Counts / 1' T.shms.pFADC_TREF_ROC2_adcMultiplicity 11 0 11
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
index cf339cf8..a9de378f 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
@@ -1,11 +1,3 @@
-#include "DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_histos.def"
-
#include "DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def"
#include "DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def"
#include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"
@@ -19,3 +11,4 @@
#include "DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def"
#include "DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def"
#include "DEF-files/SHMS/PRODUCTION/REACT/preact_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def"
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production_all.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_all.def
new file mode 100644
index 00000000..fe1d795b
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production_all.def
@@ -0,0 +1,24 @@
+#include "DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def"
+
+#include "DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def"
+#include "DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def"
+#include "DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def"
+#include "DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_histos.def"
+#include "DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def"
+#include "DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def"
+#include "DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_histos.def"
+
+#include "DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def"
+#include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def"
+#include "DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/KIN/pkin_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/REACT/preact_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def"
\ No newline at end of file
diff --git a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def
index 5283fe23..93f2a9bf 100644
--- a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def
+++ b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def
@@ -1,6 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
block P.aero.*
block T.shms.*
#include "DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def"
\ No newline at end of file
diff --git a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
index eecf0f00..ee9a1fdb 100644
--- a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+COIN_event g.evtyp == 4
+
+TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+shms_trigs SHMS_event
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def
index 1cbaa7a1..d99ba96e 100644
--- a/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def
+++ b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def
@@ -1,35 +1,25 @@
-#SHMS AERO FPGA Error Flag
+
+#--------------------------
+# SHMS AERO FPGA Error Flag
+#--------------------------
+
TH2F paero_adcErrFlg2D_pos 'SHMS Aero+ FPGA Error Flag; PMT Number; Error Flag' P.aero.posAdcCounter P.aero.posAdcErrorFlag 7 0.5 7.5 2 -0.5 1.5
TH2F paero_adcErrFlg2D_neg 'SHMS Aero- FPGA Error Flag; PMT Number; Error Flag' P.aero.negAdcCounter P.aero.negAdcErrorFlag 7 0.5 7.5 2 -0.5 1.5
-#SHMS AERO RAW Occupancy and Multiplicity
+#-----------------------------------------
+# SHMS AERO RAW Occupancy and Multiplicity
+#-----------------------------------------
+
TH1F paero_raw_occ_pos 'SHMS Aero+ Raw Occupancy; PMT Number; Number of Raw +ADC Hits' P.aero.posAdcCounter 7 0.5 7.5
TH1F paero_raw_occ_neg 'SHMS Aero- Raw Occupancy; PMT Number; Number of Raw -ADC Hits' P.aero.negAdcCounter 7 0.5 7.5
TH1F paero_raw_mult_pos 'SHMS Aero+ Raw Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits' P.aero.totNumPosAdcHits 7 0.5 7.5
TH1F paero_raw_mult_neg 'SHMS Aero- Raw Multiplicity; Number of PMTs Hit; Total Number of Raw -ADC Hits' P.aero.totNumNegAdcHits 7 0.5 7.5
TH1F paero_raw_mult 'SHMS Aero Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.aero.totnumAdcHits 14 0.5 14.5
+#------------------------------------------------------------
+# SHMS AERO RAW Pulse Pedestal / Integral / Amplitude / Time
+#------------------------------------------------------------
-#SHMS GOOD Occupancy and Multiplicity
-TH1F paero_good_occ_pos 'SHMS Aero+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.aero.numGoodPosAdcHits 7 0.5 7.5
-TH1F paero_good_occ_neg 'SHMS Aero- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.aero.numGoodNegAdcHits 7 0.5 7.5
-TH1F paero_good_mult_pos 'SHMS Aero+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.aero.totNumGoodPosAdcHits 7 0.5 7.5
-TH1F paero_good_mult_neg 'SHMS Aero- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.aero.totNumGoodNegAdcHits 7 0.5 7.5
-TH1F paero_good_mult 'SHMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.aero.totnumGoodAdcHits 14 0.5 14.5
-
-
-#SHMS AERO TOTAL NUMBER OF P.E.
-TH1F paero_tot_npe_pos 'SHMS Aero+ Total Number of Photoelectrons; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.posNpeSum 100 0 50 P.aero.posNpeSum>0.0
-TH1F paero_tot_npe_neg 'SHMS Aero- Total Number of Photoelectrons; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.negNpeSum 100 0 50 P.aero.negNpeSum>0.0
-TH1F paero_tot_npe 'SHMS Aero Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.npeSum 100 0 50 P.aero.npeSum>0.0
-
-
-#SHMS AERO Number of P.E. / PMT
-TH2F paero_npe_pos 'SHMS Aero+ Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.aero.posNpe 7 0.5 7.5 100 0 50 P.aero.posNpe>0.0
-TH2F paero_npe_neg 'SHMS Aero- Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.aero.negNpe 7 0.5 7.5 100 0 50 P.aero.negNpe>0.0
-
-
-#SHMS AERO RAW Pulse Pedestal / Integral / Amplitude / Time
TH2F paero_raw_pped_vs_pmt_pos 'SHMS Aero+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPedRaw 7 0.5 7.5 410 0 4100
TH2F paero_raw_pi_vs_pmt_pos 'SHMS Aero+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseIntRaw 7 0.5 7.5 650 0 32500
TH2F paero_raw_pamp_vs_pmt_pos 'SHMS Aero+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseAmpRaw 7 0.5 7.5 410 0 4100
@@ -40,8 +30,10 @@ TH2F paero_raw_pi_vs_pmt_neg 'SHMS Aero- Raw Pulse Integral vs. PMT Number; PMT
TH2F paero_raw_pamp_vs_pmt_neg 'SHMS Aero- Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseAmpRaw 7 0.5 7.5 410 0 4100
TH2F paero_raw_ptime_vs_pmt_neg 'SHMS Aero- Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseTimeRaw 7 0.5 7.5 650 0 6500
+#-------------------------------------------------
+# SHMS AERO Pulse Pedestal / Integral / Amplitude
+#-------------------------------------------------
-#SHMS AERO Pulse Pedestal / Integral / Amplitude
TH2F paero_pped_vs_pmt_pos 'SHMS Aero+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.aero.posAdcCounter P.aero.posAdcPed 7 0.5 7.5 500 0 1000
TH2F paero_pi_vs_pmt_pos 'SHMS Aero+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.aero.posAdcCounter P.aero.posAdcPulseInt 7 0.5 7.5 320 0 80
TH2F paero_pamp_vs_pmt_pos 'SHMS Aero+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.aero.posAdcCounter P.aero.posAdcPulseAmp 7 0.5 7.5 500 0 1000
@@ -50,16 +42,16 @@ TH2F paero_pped_vs_pmt_neg 'SHMS Aero- Pulse Pedestal vs. PMT Number; PMT Number
TH2F paero_pi_vs_pmt_neg 'SHMS Aero- Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.aero.negAdcCounter P.aero.negAdcPulseInt 7 0.5 7.5 320 0 80
TH2F paero_pamp_vs_pmt_neg 'SHMS Aero- Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.aero.negAdcCounter P.aero.negAdcPulseAmp 7 0.5 7.5 500 0 1000
+#------------------------------------------------------------------------------------------------------------------------------------------------------------
+# SHMS AERO GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time :: GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
+#------------------------------------------------------------------------------------------------------------------------------------------------------------
-#SHMS AERO GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time :: GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-TH2F paero_good_pped_vs_pmt_pos 'SHMS Aero+ Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.aero.goodPosAdcPed 7 0.5 7.5 500 0 1000 P.aero.goodPosAdcPed>0.0
TH2F paero_good_pi_vs_pmt_pos 'SHMS Aero+ Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' [I+1] P.aero.goodPosAdcPulseInt 7 0.5 7.5 320 0 80 P.aero.goodPosAdcPulseInt>0.0
TH2F paero_good_raw_pi_vs_pmt_pos 'SHMS Aero+ Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I+1] P.aero.goodPosAdcPulseIntRaw 7 0.5 7.5 600 0 30000 P.aero.goodPosAdcPulseIntRaw>0.0
TH2F paero_good_pamp_vs_pmt_pos 'SHMS Aero+ Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' [I+1] P.aero.goodPosAdcPulseAmp 7 0.5 7.5 500 0 1000 P.aero.goodPosAdcPulseAmp>0.0
TH2F paero_good_ptime_vs_pmt_pos 'SHMS Aero+ Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 0.1 ns' [I+1] P.aero.goodPosAdcPulseTime 7 0.5 7.5 4000 0 400
TH2F paero_good_dtime_vs_pmt_pos 'SHMS Aero+ Good Hodo start - pulse Time vs. PMT Number; PMT Number; Good Hodo start - pulse Time / 0.1 ns' [I+1] P.aero.goodPosAdcPulseTime 7 0.5 7.5 4000 -200 200
-TH2F paero_good_pped_vs_pmt_neg 'SHMS Aero- Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.aero.goodNegAdcPed 7 0.5 7.5 500 0 1000 P.aero.goodNegAdcPed>0.0
TH2F paero_good_pi_vs_pmt_neg 'SHMS Aero- Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' [I+1] P.aero.goodNegAdcPulseInt 7 0.5 7.5 320 0 80 P.aero.goodNegAdcPulseInt>0.0
TH2F paero_good_raw_pi_vs_pmt_neg 'SHMS Aero- Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I+1] P.aero.goodNegAdcPulseIntRaw 7 0.5 7.5 600 0 30000 P.aero.goodNegAdcPulseIntRaw>0.0
TH2F paero_good_pamp_vs_pmt_neg 'SHMS Aero- Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' [I+1] P.aero.goodNegAdcPulseAmp 7 0.5 7.5 500 0 1000 P.aero.goodNegAdcPulseAmp>0.0
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
index 953aa5b8..47873291 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
@@ -1,6 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
block P.cal.*
block T.shms.*
#include "DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"
\ No newline at end of file
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
index eecf0f00..ee9a1fdb 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+COIN_event g.evtyp == 4
+
+TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+shms_trigs SHMS_event
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def
index b29c4a99..43179b99 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def
@@ -1,29 +1,31 @@
-#SHMS PRE-SHOWER HISTOGRAMS
+#***************************
+# SHMS PRE-SHOWER HISTOGRAMS
+#**************************
+
+#----------------------------
+# SHMS PreSH FPGA Error Flags
+#----------------------------
-#SHMS PreSH FPGA Error Flags
#TH1F pcal_prshwr_adcErrFlg_pos 'SHMS PreShower+ FPGA Error Flag; Error Flag; Number of Entries' P.cal.pr.posAdcErrorFlag 2 -0.5 1.5
#TH1F pcal_prshwr_adcErrFlg_neg 'SHMS PreShower- FPGA Error Flag; Error Flag; Number of Entries' P.cal.pr.negAdcErrorFlag 2 -0.5 1.5
TH2F pcal_prshwr_adcErrFlg2D_pos 'SHMS PreShower+ FPGA Error Flag; PMT Number; Error Flag' P.cal.pr.posAdcCounter P.cal.pr.posAdcErrorFlag 14 0.5 14.5 2 -0.5 1.5
TH2F pcal_prshwr_adcErrFlg2D_neg 'SHMS PreShower- FPGA Error Flag; PMT Number; Error Flag' P.cal.pr.negAdcCounter P.cal.pr.negAdcErrorFlag 14 0.5 14.5 2 -0.5 1.5
+#------------------------------------------
+# SHMS PreSH RAW Occupancy and Multiplicity
+#------------------------------------------
-#SHMS PreSH RAW Occupancy and Multiplicity
TH1F pcal_prshwr_raw_occ_pos 'SHMS PreShower+ Raw Occupancy; PMT Number; Number of Raw +ADC Hits' P.cal.pr.posAdcCounter 14 0.5 14.5
TH1F pcal_prshwr_raw_occ_neg 'SHMS PreShower- Raw Occupancy; PMT Number; Number of Raw -ADC Hits' P.cal.pr.negAdcCounter 14 0.5 14.5
TH1F pcal_prshwr_raw_mult_pos 'SHMS PreShower+ Raw Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits' P.cal.pr.totNumPosAdcHits 14 0.5 14.5
TH1F pcal_prshwr_raw_mult_neg 'SHMS PreShower- Raw Multiplicity; Number of PMTs Hit; Total Number of Raw -ADC Hits' P.cal.pr.totNumNegAdcHits 14 0.5 14.5
TH1F pcal_prshwr_raw_mult 'SHMS PreShower Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.cal.pr.totnumAdcHits 28 0.5 28.5
-#SHMS PreSH GOOD Occupancy and Multiplicity
-TH1F pcal_prshwr_good_occ_pos 'SHMS PreShower+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.cal.pr.numGoodPosAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_occ_neg 'SHMS PreShower- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.cal.pr.numGoodNegAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult_pos 'SHMS PreShower+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.cal.pr.totNumGoodPosAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult_neg 'SHMS PreShower- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.cal.pr.totNumGoodNegAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult 'SHMS PreShower Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.cal.pr.totnumGoodAdcHits 28 0.5 28.5
-
+#----------------------------------------------------------
+# SHMS PreSH RAW PULSE PEDESTALS/AMPLITUDES/INTEGRALS/TIMES
+#----------------------------------------------------------
-#SHMS PreSH RAW PULSE PEDESTALS/AMPLITUDES/INTEGRALS/TIMES
TH2F pcal_prshwr_raw_pped_vs_pmt_pos 'SHMS PreShower+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 10 ADC Unit' P.cal.pr.posAdcCounter P.cal.pr.posAdcPedRaw 14 0.5 14.5 410 0 4100
TH2F pcal_prshwr_raw_pi_vs_pmt_pos 'SHMS PreShower+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.cal.pr.posAdcCounter P.cal.pr.posAdcPulseIntRaw 14 0.5 14.5 650 0 32500
TH2F pcal_prshwr_raw_pamp_vs_pmt_pos 'SHMS PreShower+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 10 ADC Units' P.cal.pr.posAdcCounter P.cal.pr.posAdcPulseAmpRaw 14 0.5 14.5 410 0 4100
@@ -34,8 +36,10 @@ TH2F pcal_prshwr_raw_pi_vs_pmt_neg 'SHMS PreShower- Raw Pulse Integral vs. PMT N
TH2F pcal_prshwr_raw_pamp_vs_pmt_neg 'SHMS PreShower- Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 10 ADC Units' P.cal.pr.negAdcCounter P.cal.pr.negAdcPulseAmpRaw 14 0.5 14.5 410 0 4100
TH2F pcal_prshwr_raw_ptime_vs_pmt_neg 'SHMS PreShower- Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.cal.pr.negAdcCounter P.cal.pr.negAdcPulseTimeRaw 14 0.5 14.5 650 0 6500
+#------------------------------------------------
+# SHMS PreSH PULSE PEDESTALS/INTEGRALS/AMPLITUDES
+#------------------------------------------------
-#SHMS PreSH PULSE PEDESTALS/INTEGRALS/AMPLITUDES
TH2F pcal_prshwr_pped_vs_pmt_pos 'SHMS PreShower+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.cal.pr.posAdcCounter P.cal.pr.posAdcPed 14 0.5 14.5 500 0 1000
TH2F pcal_prshwr_pi_vs_pmt_pos 'SHMS PreShower+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.cal.pr.posAdcCounter P.cal.pr.posAdcPulseInt 14 0.5 14.5 320 0 80
TH2F pcal_prshwr_pamp_vs_pmt_pos 'SHMS PreShower+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.cal.pr.posAdcCounter P.cal.pr.posAdcPulseAmp 14 0.5 14.5 500 0 1000
@@ -44,49 +48,58 @@ TH2F pcal_prshwr_pped_vs_pmt_neg 'SHMS PreShower- Pulse Pedestal vs. PMT Number;
TH2F pcal_prshwr_pi_vs_pmt_neg 'SHMS PreShower- Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.cal.pr.negAdcCounter P.cal.pr.negAdcPulseInt 14 0.5 14.5 320 0 80
TH2F pcal_prshwr_pamp_vs_pmt_neg 'SHMS PreShower- Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.cal.pr.negAdcCounter P.cal.pr.negAdcPulseAmp 14 0.5 14.5 500 0 1000
+#------------------------------------------------------------------------------------------------------------------------------------------------------
+# GOOD PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES :: GOOD --> (passed errorFlag cut, pulsetime cuts oN Min/Max ADC Time Window, and ADC threshold cut)
+#------------------------------------------------------------------------------------------------------------------------------------------------------
-#GOOD PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES :: GOOD --> (passed errorFlag cut, pulsetime cuts oN Min/Max ADC Time Window, and ADC threshold cut)
-TH2F pcal_prshwr_good_pped_vs_pmt_pos 'SHMS PreShower+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.cal.pr.goodPosAdcPed 14 0.5 14.5 500 0 1000 P.cal.pr.goodPosAdcPed>0.0
TH2F pcal_prshwr_good_pi_vs_pmt_pos 'SHMS PreShower+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.cal.pr.goodPosAdcPulseInt 14 0.5 14.5 320 0 80 P.cal.pr.goodPosAdcPulseInt>0.0
TH2F pcal_prshwr_good_pamp_vs_pmt_pos 'SHMS PreShower+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] P.cal.pr.goodPosAdcPulseAmp 14 0.5 14.5 500 0 1000 P.cal.pr.goodPosAdcPulseAmp>0.0
TH2F pcal_prshwr_good_ptime_vs_pmt_pos 'SHMS PreShower+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodPosAdcPulseTime 14 0.5 14.5 4000 0 400
-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_pped_vs_pmt_neg 'SHMS PreShower- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.cal.pr.goodNegAdcPed 14 0.5 14.5 500 0 1000 P.cal.pr.goodNegAdcPed>0.0
TH2F pcal_prshwr_good_pi_vs_pmt_neg 'SHMS PreShower- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.cal.pr.goodNegAdcPulseInt 14 0.5 14.5 320 0 80 P.cal.pr.goodNegAdcPulseInt>0.0
TH2F pcal_prshwr_good_pamp_vs_pmt_neg 'SHMS PreShower- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude 2 mV/ ' [I+1] P.cal.pr.goodNegAdcPulseAmp 14 0.5 14.5 500 0 1000 P.cal.pr.goodNegAdcPulseAmp>0.0
TH2F pcal_prshwr_good_ptime_vs_pmt_neg 'SHMS PreShower- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodNegAdcPulseTime 14 0.5 14.5 4000 0 400 P.cal.pr.goodNegAdcPulseTime>0.0
-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
-#SHMS PreSH GOOD RAW PULSE INTEGRALS
+#------------------------------------
+# SHMS PreSH GOOD RAW PULSE INTEGRALS
+#------------------------------------
+
TH2F pcal_prshwr_good_raw_pi_vs_pmt_pos 'SHMS PreShower+ Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] P.cal.pr.goodPosAdcPulseIntRaw 14 0.5 14.5 650 0 32500 P.cal.pr.goodPosAdcPulseIntRaw>0.0
TH2F pcal_prshwr_good_raw_pi_vs_pmt_neg 'SHMS PreShower- Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseIntRaw 14 0.5 14.5 650 0 32500 P.cal.pr.goodNegAdcPulseIntRaw>0.0
-#SHMS PRE-SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS (calib consts (GAIN) are in GeV/ADC units )
+#-------------------------------------------------------------------------------------------------
+# SHMS PRE-SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS (calib consts (GAIN) are in GeV/ADC units )
+#-------------------------------------------------------------------------------------------------
+
TH2F pcal_prshwr_Epos_vs_pmt 'SHMS PreShower+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.pr.epos 14 0.5 14.5 200 0 2 P.cal.pr.epos>0.0
TH2F pcal_prshwr_Eneg_vs_pmt 'SHMS PreShower- Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.pr.eneg 14 0.5 14.5 200 0 2 P.cal.pr.eneg>0.0
TH2F pcal_prshwr_Emean_vs_pmt 'SHMS PreShower Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.pr.emean 14 0.5 14.5 300 0 3 P.cal.pr.emean>0.0
-#SHMS ENERGY DEPOSITION in PreShower PLANE
+#------------------------------------------
+# SHMS ENERGY DEPOSITION in PreShower PLANE
+#------------------------------------------
+
TH1F pcal_prshwr_Eplane_pos 'SHMS PreShower+ Energy Deposition; Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_pos 200 0 2 P.cal.pr.eplane_pos>0.0
TH1F pcal_prshwr_Eplane_neg 'SHMS PreShower- Energy Deposition; Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_neg 200 0 2 P.cal.pr.eplane_neg>0.0
TH1F pcal_prshwr_Eplane 'SHMS PreShower Total Energy Deposition; Total Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane 300 0 3 P.cal.pr.eplane>0.0
###########################################################################################
-#SHMS SHOWER HISTOGRAMS
+#***********************
+# SHMS SHOWER HISTOGRAMS
+#***********************
+
+#----------------------------
+# SHMS Shower FADC MONITORING
+#----------------------------
-#SHMS Shower FPGA Error Flags
+#SHMS Shower FADC error flags
TH2F pcal_shwr_adcErrFlg2D 'SHMS Shower FPGA Error Flag; PMT Number; Error Flag' P.cal.fly.adcCounter P.cal.fly.adcErrorFlag 224 0.5 224.5 2 -0.5 1.5
#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 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 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
TH2F pcal_shwr_raw_pi_vs_pmt 'SHMS Shower Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.cal.fly.adcCounter P.cal.fly.adcPulseIntRaw 224 0.5 224.5 650 0 32500
@@ -99,11 +112,9 @@ TH2F pcal_shwr_pi_vs_pmt 'SHMS Shower Pulse Integral vs. PMT Number; PMT Number;
TH2F pcal_shwr_pamp_vs_pmt 'SHMS Shower Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.cal.fly.adcCounter P.cal.fly.adcPulseAmp 224 0.5 224.5 500 0 1000
#SHMS Shower GOOD PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES
-TH2F pcal_shwr_good_pped_vs_pmt 'SHMS Shower Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.cal.fly.goodAdcPed 224 0.5 224.5 500 0 1000 P.cal.fly.goodAdcPed>0.0
TH2F pcal_shwr_good_pi_vs_pmt 'SHMS Shower Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.cal.fly.goodAdcPulseInt 224 0.5 224.5 320 0 80 P.cal.fly.goodAdcPulseInt>0.0
TH2F pcal_shwr_good_pamp_vs_pmt 'SHMS Shower Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] P.cal.fly.goodAdcPulseAmp 224 0.5 224.5 500 0 1000 P.cal.fly.goodAdcPulseAmp>0.0
TH2F pcal_shwr_good_ptime_vs_pmt 'SHMS Shower Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.cal.fly.goodAdcPulseTime 224 0.5 224.5 4000 0 400
-TH2F pcal_shwr_good_dtime_vs_pmt 'SHMS Shower Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.fly.goodAdcPulseTime 224 0.5 224.5 4000 -200 200
#Good Raw Pulse Integrals
TH2F pcal_shwr_good_raw_pi_vs_pmt 'SHMS Shower Good Raw Pulse Integral vs. PMT Number; PMT Number; Good Raw Pulse Integral / 50 ADC Units' [I+1] P.cal.fly.goodAdcPulseIntRaw 224 0.5 224.5 650 0 32500 P.cal.fly.goodAdcPulseIntRaw>0.0
diff --git a/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
index 4430c51b..4690b98d 100644
--- a/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
+++ b/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
@@ -1,5 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
block P.dc.*
+block T.shms.*
#include "DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def"
\ No newline at end of file
diff --git a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
index eecf0f00..ee9a1fdb 100644
--- a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+COIN_event g.evtyp == 4
+
+TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+shms_trigs SHMS_event
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def
index 5c80170f..9bb21f90 100644
--- a/DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def
+++ b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def
@@ -1,20 +1,3 @@
-#------------------
-# SHMS DC WIRE MAP
-#------------------
-
-TH1F pdc1u1_wirenum 'SHMS DC 1U1 Wiremap; Wire Number; Number of Entries' P.dc.1u1.wirenum 107 0.5 107.5
-TH1F pdc1u2_wirenum 'SHMS DC 1U2 Wiremap; Wire Number; Number of Entries' P.dc.1u2.wirenum 107 0.5 107.5
-TH1F pdc1x1_wirenum 'SHMS DC 1X1 Wiremap; Wire Number; Number of Entries' P.dc.1x1.wirenum 79 0.5 79.5
-TH1F pdc1x2_wirenum 'SHMS DC 1X2 Wiremap; Wire Number; Number of Entries' P.dc.1x2.wirenum 79 0.5 79.5
-TH1F pdc1v1_wirenum 'SHMS DC 1V1 Wiremap; Wire Number; Number of Entries' P.dc.1v1.wirenum 107 0.5 107.5
-TH1F pdc1v2_wirenum 'SHMS DC 1V2 Wiremap; Wire Number; Number of Entries' P.dc.1v2.wirenum 107 0.5 107.5
-
-TH1F pdc2v2_wirenum 'SHMS DC 2V2 Wiremap; Wire Number; Number of Entries' P.dc.2v2.wirenum 107 0.5 107.5
-TH1F pdc2v1_wirenum 'SHMS DC 2V1 Wiremap; Wire Number; Number of Entries' P.dc.2v1.wirenum 107 0.5 107.5
-TH1F pdc2x2_wirenum 'SHMS DC 2X2 Wiremap; Wire Number; Number of Entries' P.dc.2x2.wirenum 79 0.5 79.5
-TH1F pdc2x1_wirenum 'SHMS DC 2X1 Wiremap; Wire Number; Number of Entries' P.dc.2x1.wirenum 79 0.5 79.5
-TH1F pdc2u2_wirenum 'SHMS DC 2U2 Wiremap; Wire Number; Number of Entries' P.dc.2u2.wirenum 107 0.5 107.5
-TH1F pdc2u1_wirenum 'SHMS DC 2U1 Wiremap; Wire Number; Number of Entries' P.dc.2u1.wirenum 107 0.5 107.5
#------------------------------
# SHMS DC RAW TDC PER PLANE
@@ -52,23 +35,6 @@ TH2F pdc2x1_raw_tdc_vs_wirenum 'PDC 2X1 Raw TDC vs. Wire Number; Wire Number; Ra
TH2F pdc2u2_raw_tdc_vs_wirenum 'PDC 2U2 Raw TDC vs. Wire Number; Wire Number; Raw TDC Value / 10 TDC Units' P.dc.2u2.wirenum P.dc.2u2.rawtdc 107 0.5 107.5 5000 -25000 25000
TH2F pdc2u1_raw_tdc_vs_wirenum 'PDC 2U1 Raw TDC vs. Wire Number; Wire Number; Raw TDC Value / 10 TDC Units' P.dc.2u1.wirenum P.dc.2u1.rawtdc 107 0.5 107.5 5000 -25000 25000
-#------------------------------
-# SHMS DC DRIFT TIME PER PLANE
-#------------------------------
-TH1F pdc1u1_drifttime 'SHMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u1.time 400 -50 350
-TH1F pdc1u2_drifttime 'SHMS DC 1U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u2.time 400 -50 350
-TH1F pdc1x1_drifttime 'SHMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x1.time 400 -50 350
-TH1F pdc1x2_drifttime 'SHMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x2.time 400 -50 350
-TH1F pdc1v1_drifttime 'SHMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v1.time 400 -50 350
-TH1F pdc1v2_drifttime 'SHMS DC 1V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v2.time 400 -50 350
-
-TH1F pdc2v2_drifttime 'SHMS DC 2V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v2.time 400 -50 350
-TH1F pdc2v1_drifttime 'SHMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v1.time 400 -50 350
-TH1F pdc2x2_drifttime 'SHMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x2.time 400 -50 350
-TH1F pdc2x1_drifttime 'SHMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x1.time 400 -50 350
-TH1F pdc2u2_drifttime 'SHMS DC 2U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u2.time 400 -50 350
-TH1F pdc2u1_drifttime 'SHMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u1.time 400 -50 350
-
#----------------------------------
# SHMS DC DRIFT TIME VS. WIRENUMBER
#----------------------------------
@@ -87,24 +53,6 @@ TH2F pdc2x1_drifttime_vs_wirenum 'SHMS DC 2X1Drift Time vs. Wire Number; Wire Nu
TH2F pdc2u2_drifttime_vs_wirenum 'SHMS DC 2U2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2u2.wirenum P.dc.2u2.time 107 0.5 107.5 500 0 500
TH2F pdc2u1_drifttime_vs_wirenum 'SHMS DC 2U1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2u1.wirenum P.dc.2u1.time 107 0.5 107.5 500 0 500
-#----------------------------------
-# SHMS DC Drift Distance Per Plane
-#----------------------------------
-TH1F pdc1u1_ddist 'SHMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u1.dist 28 -0.1 0.6
-TH1F pdc1u2_ddist 'SHMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u2.dist 28 -0.1 0.6
-TH1F pdc1x1_ddist 'SHMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x1.dist 28 -0.1 0.6
-TH1F pdc1x2_ddist 'SHMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x2.dist 28 -0.1 0.6
-TH1F pdc1v1_ddist 'SHMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v1.dist 28 -0.1 0.6
-TH1F pdc1v2_ddist 'SHMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v2.dist 28 -0.1 0.6
-
-TH1F pdc2u2_ddist 'SHMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u2.dist 28 -0.1 0.6
-TH1F pdc2u1_ddist 'SHMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u1.dist 28 -0.1 0.6
-TH1F pdc2x2_ddist 'SHMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x2.dist 28 -0.1 0.6
-TH1F pdc2x1_ddist 'SHMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x1.dist 28 -0.1 0.6
-TH1F pdc2v2_ddist 'SHMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v2.dist 28 -0.1 0.6
-TH1F pdc2v1_ddist 'SHMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v1.dist 28 -0.1 0.6
-
-
#----------------------------------------
# SHMS DC Drift Distance vs. Wire number
#----------------------------------------
@@ -141,8 +89,6 @@ TH1F pdc2x1_residuals 'SHMS 2X1 DC Residuals; Residuals (cm); Number of Entries
TH1F pdc2u2_residuals 'SHMS 2U2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[10] 200 -1.0 1.0
TH1F pdc2u1_residuals 'SHMS 2U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[11] 200 -1.0 1.0
-
-
#-----------------------------------
# SHMS DC RESIDUALS vs. Wire Number
#-----------------------------------
@@ -159,17 +105,4 @@ TH2F pdc2v1_residuals_vs_wirenum 'SHMS 2V1 DC Residuals vs. Wire Number; Wire Nu
TH2F pdc2x2_residuals_vs_wirenum 'SHMS 2X2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2x2.wirenum P.dc.residual[8] 79 0.5 79.5 200 -1.0 1.0
TH2F pdc2x1_residuals_vs_wirenum 'SHMS 2X1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2x1.wirenum P.dc.residual[9] 79 0.5 79.5 200 -1.0 1.0
TH2F pdc2u2_residuals_vs_wirenum 'SHMS 2U2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2u2.wirenum P.dc.residual[10] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2u1_residuals_vs_wirenum 'SHMS 2U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2u1.wirenum P.dc.residual[11] 107 0.5 107.5 200 -1.0 1.0
-
-#-------------------------------------------
-# 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
-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
-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
+TH2F pdc2u1_residuals_vs_wirenum 'SHMS 2U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2u1.wirenum P.dc.residual[11] 107 0.5 107.5 200 -1.0 1.0
\ No newline at end of file
diff --git a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def
index 50663507..90a3dbc4 100644
--- a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def
+++ b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def
@@ -1,6 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
block P.hgcer.*
block T.shms.*
#include "DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def"
diff --git a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
index eecf0f00..ee9a1fdb 100644
--- a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+COIN_event g.evtyp == 4
+
+TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+shms_trigs SHMS_event
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_histos.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_histos.def
index d8ac4f97..b57b5811 100644
--- a/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_histos.def
+++ b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_histos.def
@@ -1,34 +1,22 @@
-#SHMS FPGA Error Flag
+# SHMS FPGA Error Flag
TH2F phgcer_adcErrFlg2D 'SHMS Heavy Gas Cherenkov FPGA Error Flag; PMT Number; Error Flag' P.hgcer.adcCounter P.hgcer.adcErrorFlag 4 0.5 4.5 2 -0.5 1.5
-#SHMS HGC RAW Occupancy and Multiplicity
+# SHMS HGC RAW Occupancy and Multiplicity
TH1F phgcer_raw_occ 'SHMS Heavy Gas Cherenkov Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.hgcer.adcCounter 4 0.5 4.5
TH1F phgcer_raw_mult 'SHMS Heavy Gas Cherenkov Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.hgcer.totNumAdcHits 4 0.5 4.5
-
-#SHMS HGC GOOD Occupancy and Multiplicity
-TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Number Good ADC Hits' P.hgcer.numGoodAdcHits 4 0.5 4.5
-TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
-
-#SHMS HGC TOTAL NUMBER OF P.E.
-TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 100 0 50 P.hgcer.npeSum>0.0
-
-#SHMS HGC Number of P.E. / PMT
-TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.hgcer.npe 4 0.5 4.5 100 0 50 P.hgcer.npe>0.0
-
-#SHMS HGC RAW Pulse Pedestal / Integral / Amplitude / Time
+# SHMS HGC RAW Pulse Pedestal / Integral / Amplitude / Time
TH2F phgcer_raw_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPedRaw 4 0.5 4.5 410 0 4100
TH2F phgcer_raw_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseIntRaw 4 0.5 4.5 650 0 32500
TH2F phgcer_raw_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseAmpRaw 4 0.5 4.5 410 0 4100
TH2F phgcer_raw_ptime_vs_pmt 'SHMS Heavy Gas Cherenkov Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseTimeRaw 4 0.5 4.5 650 0 6500
-#SHMS HGC Pulse Pedestal / Integral / Amplitude
+# SHMS HGC Pulse Pedestal / Integral / Amplitude
TH2F phgcer_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.hgcer.adcCounter P.hgcer.adcPed 4 0.5 4.5 500 0 1000
TH2F phgcer_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.04 pC' P.hgcer.adcCounter P.hgcer.adcPulseInt 4 0.5 4.5 2000 0 80
TH2F phgcer_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.hgcer.adcCounter P.hgcer.adcPulseAmp 4 0.5 4.5 500 0 1000
-#SHMS HGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time :: GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-TH2F phgcer_good_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.hgcer.goodAdcPed 4 0.5 4.5 500 0 1000
+# SHMS HGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time :: GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
TH2F phgcer_good_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.04 pC' [I+1] P.hgcer.goodAdcPulseInt 4 0.5 4.5 2000 0 80 P.hgcer.goodAdcPulseInt>0.0
TH2F phgcer_good_rawpi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I+1] P.hgcer.goodAdcPulseIntRaw 4 0.5 4.5 600 0 30000 P.hgcer.goodAdcPulseIntRaw>0.0
TH2F phgcer_good_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' [I+1] P.hgcer.goodAdcPulseAmp 4 0.5 4.5 500 0 1000 P.hgcer.goodAdcPulseAmp>0.0
diff --git a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def
index 4f04a537..7173f6e0 100644
--- a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def
+++ b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def
@@ -1,6 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
block P.hod.*
block T.shms.*
#include "DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def"
diff --git a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
index eecf0f00..ee9a1fdb 100644
--- a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+COIN_event g.evtyp == 4
+
+TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+shms_trigs SHMS_event
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def
index 3d19cbdd..8ed7bc90 100644
--- a/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def
+++ b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def
@@ -1,4 +1,4 @@
-#SHMS Hodo Error Flags
+# SHMS Hodo Error Flags
TH2F phodo_1x_pos_adcErrFlg2D 'SHMS 1X+ FPGA Error Flag; PMT Number; Error Flag' P.hod.1x.posAdcCounter P.hod.1x.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
TH2F phodo_1y_pos_adcErrFlg2D 'SHMS 1Y+ FPGA Error Flag; PMT Number; Error Flag' P.hod.1y.posAdcCounter P.hod.1y.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
TH2F phodo_2x_pos_adcErrFlg2D 'SHMS 2X+ FPGA Error Flag; PMT Number; Error Flag' P.hod.2x.posAdcCounter P.hod.2x.posAdcErrorFlag 14 0.5 14.5 2 -0.5 1.5
@@ -10,7 +10,7 @@ TH2F phodo_2x_neg_adcErrFlg2D 'SHMS 2X- FPGA Error Flag; PMT Number; Error Flag'
TH2F phodo_2y_neg_adcErrFlg2D 'SHMS 2Y- FPGA Error Flag; PMT Number; Error Flag' P.hod.2y.negAdcCounter P.hod.2y.negAdcErrorFlag 21 0.5 21.5 2 -0.5 1.5
-#SHMS Hodo Raw ADC Multiplicities
+# SHMS Hodo Raw ADC Multiplicities
TH1F phodo_1x_raw_adc_mult_pos 'SHMS 1X+ Raw ADC Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits' P.hod.1x.totNumPosAdcHits 13 0.5 13.5
TH1F phodo_1y_raw_adc_mult_pos 'SHMS 1Y+ Raw ADC Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits' P.hod.1y.totNumPosAdcHits 13 0.5 13.5
TH1F phodo_2x_raw_adc_mult_pos 'SHMS 2X+ Raw ADC Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits' P.hod.2x.totNumPosAdcHits 14 0.5 14.5
@@ -26,7 +26,7 @@ TH1F phodo_1y_raw_adc_mult 'SHMS 1Y Raw ADC Multiplicity; Number of PMTs Hit; To
TH1F phodo_2x_raw_adc_mult 'SHMS 2X Raw ADC Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.hod.2x.totNumAdcHits 14 0.5 14.5
TH1F phodo_2y_raw_adc_mult 'SHMS 2Y Raw ADC Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.hod.2y.totNumAdcHits 21 0.5 21.5
-#SHMS HODO Raw TDC Multiplicities
+# SHMS HODO Raw TDC Multiplicities
TH1F phodo_1x_raw_tdc_mult_pos 'SHMS 1X+ Raw TDC Multiplicity; Number of PMTs Hit; Total Number of Raw +TDC Hits' P.hod.1x.totNumPosTdcHits 13 0.5 13.5
TH1F phodo_1y_raw_tdc_mult_pos 'SHMS 1Y+ Raw TDC Multiplicity; Number of PMTs Hit; Total Number of Raw +TDC Hits' P.hod.1y.totNumPosTdcHits 13 0.5 13.5
TH1F phodo_2x_raw_tdc_mult_pos 'SHMS 2X+ Raw TDC Multiplicity; Number of PMTs Hit; Total Number of Raw +TDC Hits' P.hod.2x.totNumPosTdcHits 14 0.5 14.5
@@ -43,7 +43,7 @@ TH1F phodo_2x_raw_tdc_mult 'SHMS 2X Raw TDC Multiplicity; Number of PMTs Hit; To
TH1F phodo_2y_raw_tdc_mult 'SHMS 2Y Raw TDC Multiplicity; Number of PMTs Hit; Total Number of Raw TDC Hits' P.hod.2y.totNumTdcHits 21 0.5 21.5
-#SHMS HODO RAW ADC OCCUPANCIES
+# SHMS HODO RAW ADC OCCUPANCIES
TH1F phodo_1x_raw_adc_occ_pos 'SHMS 1X+ Raw ADC Occupancy; PMT Number; Number of Raw +ADC Hits' P.hod.1x.posAdcCounter 13 0.5 13.5
TH1F phodo_1y_raw_adc_occ_pos 'SHMS 1Y+ Raw ADC Occupancy; PMT Number; Number of Raw +ADC Hits' P.hod.1y.posAdcCounter 13 0.5 13.5
TH1F phodo_2x_raw_adc_occ_pos 'SHMS 2X+ Raw ADC Occupancy; PMT Number; Number of Raw +ADC Hits' P.hod.2x.posAdcCounter 14 0.5 14.5
@@ -54,7 +54,7 @@ TH1F phodo_1y_raw_adc_occ_neg 'SHMS 1Y- Raw ADC Occupancy; PMT Number; Number of
TH1F phodo_2x_raw_adc_occ_neg 'SHMS 2X- Raw ADC Occupancy; PMT Number; Number of Raw -ADC Hits' P.hod.2x.negAdcCounter 14 0.5 14.5
TH1F phodo_2y_raw_adc_occ_neg 'SHMS 2Y- Raw ADC Occupancy; PMT Number; Number of Raw -ADC Hits' P.hod.2y.negAdcCounter 21 0.5 21.5
-#SHMS HODO RAW TDC OCCUPANCIES
+# SHMS HODO RAW TDC OCCUPANCIES
TH1F phodo_1x_raw_tdc_occ_pos 'SHMS 1X+ Raw TDC Occupancy; PMT Number; Number of Raw +TDC Hits' P.hod.1x.posTdcCounter 13 0.5 13.5
TH1F phodo_1y_raw_tdc_occ_pos 'SHMS 1Y+ Raw TDC Occupancy; PMT Number; Number of Raw +TDC Hits' P.hod.1y.posTdcCounter 13 0.5 13.5
TH1F phodo_2x_raw_tdc_occ_pos 'SHMS 2X+ Raw TDC Occupancy; PMT Number; Number of Raw +TDC Hits' P.hod.2x.posTdcCounter 14 0.5 14.5
@@ -65,67 +65,9 @@ TH1F phodo_1y_raw_tdc_occ_neg 'SHMS 1Y- Raw TDC Occupancy; PMT Number; Number of
TH1F phodo_2x_raw_tdc_occ_neg 'SHMS 2X- Raw TDC Occupancy; PMT Number; Number of Raw -TDC Hits' P.hod.2x.negTdcCounter 14 0.5 14.5
TH1F phodo_2y_raw_tdc_occ_neg 'SHMS 2Y- Raw TDC Occupancy; PMT Number; Number of Raw -TDC Hits' P.hod.2y.negTdcCounter 21 0.5 21.5
-#######################
-
-#SHMS HODO GOOD ADC Multiplicities
-TH1F phodo_1x_good_adc_mult_pos 'SHMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1x.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult_pos 'SHMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1y.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult_pos 'SHMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2x.totNumGoodPosAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult_pos 'SHMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2y.totNumGoodPosAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_mult_neg 'SHMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1x.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult_neg 'SHMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1y.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult_neg 'SHMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2x.totNumGoodNegAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult_neg 'SHMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2y.totNumGoodNegAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_mult 'SHMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1x.totNumGoodAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult 'SHMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1y.totNumGoodAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult 'SHMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2x.totNumGoodAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult 'SHMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2y.totNumGoodAdcHits 21 0.5 21.5
-
-#SHMS HODO Good TDC Multiplicities
-TH1F phodo_1x_good_tdc_mult_pos 'SHMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1x.totNumGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult_pos 'SHMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1y.totNumGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult_pos 'SHMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2x.totNumGoodPosTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult_pos 'SHMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2y.totNumGoodPosTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_mult_neg 'SHMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1x.totNumGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult_neg 'SHMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1y.totNumGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult_neg 'SHMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2x.totNumGoodNegTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult_neg 'SHMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2y.totNumGoodNegTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_mult 'SHMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1x.totNumGoodTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult 'SHMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1y.totNumGoodTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult 'SHMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2x.totNumGoodTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult 'SHMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2y.totNumGoodTdcHits 21 0.5 21.5
-
-
-
-#SHMS HODO GOOD ADC OCCUPANCIES
-TH1F phodo_1x_good_adc_occ_pos 'SHMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1x.numGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_occ_pos 'SHMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1y.numGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_occ_pos 'SHMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2x.numGoodPosAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_occ_pos 'SHMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2y.numGoodPosAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_occ_neg 'SHMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1x.numGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_occ_neg 'SHMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1y.numGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_occ_neg 'SHMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2x.numGoodNegAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_occ_neg 'SHMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2y.numGoodNegAdcHits 21 0.5 21.5
-
-#SHMS HODO GOOD TDC OCCUPANCIES
-TH1F phodo_1x_good_tdc_occ_pos 'SHMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1x.numGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_occ_pos 'SHMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1y.numGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_occ_pos 'SHMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2x.numGoodPosTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_occ_pos 'SHMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2y.numGoodPosTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_occ_neg 'SHMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1x.numGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_occ_neg 'SHMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1y.numGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_occ_neg 'SHMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2x.numGoodNegTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_occ_neg 'SHMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2y.numGoodNegTdcHits 21 0.5 21.5
-
####### SHMS HODO RAW VARIABLES #########
-#SHMS HODO RAW PULSE PEDESTAL
+# SHMS HODO RAW PULSE PEDESTAL
TH2F phodo_1x_raw_pped_vs_pmt_pos 'SHMS 1X+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Unit' P.hod.1x.posAdcCounter P.hod.1x.posAdcPedRaw 13 0.5 13.5 4000 0 4000
TH2F phodo_1y_raw_pped_vs_pmt_pos 'SHMS 1Y+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Unit' P.hod.1y.posAdcCounter P.hod.1y.posAdcPedRaw 13 0.5 13.5 4000 0 4000
TH2F phodo_2x_raw_pped_vs_pmt_pos 'SHMS 2X+ Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Unit' P.hod.2x.posAdcCounter P.hod.2x.posAdcPedRaw 14 0.5 14.5 4000 0 4000
@@ -136,7 +78,7 @@ TH2F phodo_1y_raw_pped_vs_pmt_neg 'SHMS 1Y- Raw Pulse Pedestal vs. PMT Number; P
TH2F phodo_2x_raw_pped_vs_pmt_neg 'SHMS 2X- Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Unit' P.hod.2x.negAdcCounter P.hod.2x.negAdcPedRaw 14 0.5 14.5 4000 0 4000
TH2F phodo_2y_raw_pped_vs_pmt_neg 'SHMS 2Y- Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Unit' P.hod.2y.negAdcCounter P.hod.2y.negAdcPedRaw 21 0.5 21.5 4000 0 4000
-#SHMS HODO RAW PULSE INTEGRAL
+# SHMS HODO RAW PULSE INTEGRAL
TH2F phodo_1x_raw_pi_vs_pmt_pos 'SHMS 1X+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseIntRaw 13 0.5 13.5 800 0 40000
TH2F phodo_1y_raw_pi_vs_pmt_pos 'SHMS 1Y+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hod.1y.posAdcCounter P.hod.1y.posAdcPulseIntRaw 13 0.5 13.5 800 0 40000
TH2F phodo_2x_raw_pi_vs_pmt_pos 'SHMS 2X+ Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hod.2x.posAdcCounter P.hod.2x.posAdcPulseIntRaw 14 0.5 14.5 800 0 40000
@@ -147,7 +89,7 @@ TH2F phodo_1y_raw_pi_vs_pmt_neg 'SHMS 1Y- Raw Pulse Integral vs. PMT Number; PMT
TH2F phodo_2x_raw_pi_vs_pmt_neg 'SHMS 2X- Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hod.2x.negAdcCounter P.hod.2x.negAdcPulseIntRaw 14 0.5 14.5 800 0 40000
TH2F phodo_2y_raw_pi_vs_pmt_neg 'SHMS 2Y- Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.hod.2y.negAdcCounter P.hod.2y.negAdcPulseIntRaw 21 0.5 21.5 800 0 40000
-#SHMS HODO RAW PULSE AMPLITUDE
+# SHMS HODO RAW PULSE AMPLITUDE
TH2F phodo_1x_raw_pamp_vs_pmt_pos 'SHMS 1X+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseAmpRaw 13 0.5 13.5 205 0 4100
TH2F phodo_1y_raw_pamp_vs_pmt_pos 'SHMS 1Y+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.hod.1y.posAdcCounter P.hod.1y.posAdcPulseAmpRaw 13 0.5 13.5 205 0 4100
TH2F phodo_2x_raw_pamp_vs_pmt_pos 'SHMS 2X+ Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.hod.2x.posAdcCounter P.hod.2x.posAdcPulseAmpRaw 14 0.5 14.5 205 0 4100
@@ -158,7 +100,7 @@ TH2F phodo_1y_raw_pamp_vs_pmt_neg 'SHMS 1Y- Raw Pulse Amplitude vs. PMT Number;
TH2F phodo_2x_raw_pamp_vs_pmt_neg 'SHMS 2X- Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.hod.2x.negAdcCounter P.hod.2x.negAdcPulseAmpRaw 14 0.5 14.5 205 0 4100
TH2F phodo_2y_raw_pamp_vs_pmt_neg 'SHMS 2Y- Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.hod.2y.negAdcCounter P.hod.2y.negAdcPulseAmpRaw 21 0.5 21.5 205 0 4100
-#SHMS HODO RAW PULSE TIME
+# SHMS HODO RAW PULSE TIME
TH2F phodo_1x_raw_ptime_vs_pmt_pos 'SHMS 1X+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseTimeRaw 13 0.5 13.5 410 0 4100
TH2F phodo_1y_raw_ptime_vs_pmt_pos 'SHMS 1Y+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.hod.1y.posAdcCounter P.hod.1y.posAdcPulseTimeRaw 13 0.5 13.5 410 0 4100
TH2F phodo_2x_raw_ptime_vs_pmt_pos 'SHMS 2X+ Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.hod.2x.posAdcCounter P.hod.2x.posAdcPulseTimeRaw 14 0.5 14.5 410 0 4100
@@ -169,7 +111,7 @@ TH2F phodo_1y_raw_ptime_vs_pmt_neg 'SHMS 1Y- Raw Pulse Time vs. PMT Number; PMT
TH2F phodo_2x_raw_ptime_vs_pmt_neg 'SHMS 2X- Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.hod.2x.negAdcCounter P.hod.2x.negAdcPulseTimeRaw 14 0.5 14.5 410 0 4100
TH2F phodo_2y_raw_ptime_vs_pmt_neg 'SHMS 2Y- Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.hod.2y.negAdcCounter P.hod.2y.negAdcPulseTimeRaw 21 0.5 21.5 410 0 4100
-#SHMS HODO RAW TDC TIME
+# SHMS HODO RAW TDC TIME
TH2F phodo_1x_raw_tdctime_vs_pmt_pos 'SHMS 1X+ Raw TDC Time vs. PMT Number; PMT Number; Raw TDC Time / 10 TDC Units' P.hod.1x.posTdcCounter P.hod.1x.posTdcTimeRaw 13 0.5 13.5 200 0 2000
TH2F phodo_1y_raw_tdctime_vs_pmt_pos 'SHMS 1Y+ Raw TDC Time vs. PMT Number; PMT Number; Raw TDC Time / 10 TDC Units' P.hod.1y.posTdcCounter P.hod.1y.posTdcTimeRaw 13 0.5 13.5 200 0 2000
TH2F phodo_2x_raw_tdctime_vs_pmt_pos 'SHMS 2X+ Raw TDC Time vs. PMT Number; PMT Number; Raw TDC Time / 10 TDC Units' P.hod.2x.posTdcCounter P.hod.2x.posTdcTimeRaw 14 0.5 14.5 200 0 2000
@@ -182,7 +124,7 @@ TH2F phodo_2y_raw_tdctime_vs_pmt_neg 'SHMS 2Y- Raw TDC Time vs. PMT Number; PMT
####### SHMS HODO NON-RAW VARIABLES #########
-#SHMS HODO PULSE PEDESTAL
+# SHMS HODO PULSE PEDESTAL
TH2F phodo_1x_pped_vs_pmt_pos 'SHMS 1X+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.hod.1x.posAdcCounter P.hod.1x.posAdcPed 13 0.5 13.5 500 0 1000
TH2F phodo_1y_pped_vs_pmt_pos 'SHMS 1Y+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.hod.1y.posAdcCounter P.hod.1y.posAdcPed 13 0.5 13.5 500 0 1000
TH2F phodo_2x_pped_vs_pmt_pos 'SHMS 2X+ Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.hod.2x.posAdcCounter P.hod.2x.posAdcPed 14 0.5 14.5 500 0 1000
@@ -193,7 +135,7 @@ TH2F phodo_1y_pped_vs_pmt_neg 'SHMS 1Y- Pulse Pedestal vs. PMT Number; PMT Numbe
TH2F phodo_2x_pped_vs_pmt_neg 'SHMS 2X- Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.hod.2x.negAdcCounter P.hod.2x.negAdcPed 14 0.5 14.5 500 0 1000
TH2F phodo_2y_pped_vs_pmt_neg 'SHMS 2Y- Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.hod.2y.negAdcCounter P.hod.2y.negAdcPed 21 0.5 21.5 500 0 1000
-#SHMS HODO PULSE INTEGRAL
+# SHMS HODO PULSE INTEGRAL
TH2F phodo_1x_pi_vs_pmt_pos 'SHMS 1X+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseInt 13 0.5 13.5 320 0 80
TH2F phodo_1y_pi_vs_pmt_pos 'SHMS 1Y+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.hod.1y.posAdcCounter P.hod.1y.posAdcPulseInt 13 0.5 13.5 320 0 80
TH2F phodo_2x_pi_vs_pmt_pos 'SHMS 2X+ Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.hod.2x.posAdcCounter P.hod.2x.posAdcPulseInt 14 0.5 14.5 320 0 80
@@ -204,7 +146,7 @@ TH2F phodo_1y_pi_vs_pmt_neg 'SHMS 1Y- Pulse Integral vs. PMT Number; PMT Number;
TH2F phodo_2x_pi_vs_pmt_neg 'SHMS 2X- Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.hod.2x.negAdcCounter P.hod.2x.negAdcPulseInt 14 0.5 14.5 320 0 80
TH2F phodo_2y_pi_vs_pmt_neg 'SHMS 2Y- Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.25 pC' P.hod.2y.negAdcCounter P.hod.2y.negAdcPulseInt 21 0.5 21.5 320 0 80
-#SHMS HODO PULSE AMPLITUDE
+# SHMS HODO PULSE AMPLITUDE
TH2F phodo_1x_pamp_vs_pmt_pos 'SHMS 1X+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseAmp 13 0.5 13.5 500 0 1000
TH2F phodo_1y_pamp_vs_pmt_pos 'SHMS 1Y+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.hod.1y.posAdcCounter P.hod.1y.posAdcPulseAmp 13 0.5 13.5 500 0 1000
TH2F phodo_2x_pamp_vs_pmt_pos 'SHMS 2X+ Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.hod.2x.posAdcCounter P.hod.2x.posAdcPulseAmp 14 0.5 14.5 500 0 1000
@@ -215,7 +157,7 @@ TH2F phodo_1y_pamp_vs_pmt_neg 'SHMS 1Y- Pulse Amplitude vs. PMT Number; PMT Numb
TH2F phodo_2x_pamp_vs_pmt_neg 'SHMS 2X- Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.hod.2x.negAdcCounter P.hod.2x.negAdcPulseAmp 14 0.5 14.5 500 0 1000
TH2F phodo_2y_pamp_vs_pmt_neg 'SHMS 2Y- Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.hod.2y.negAdcCounter P.hod.2y.negAdcPulseAmp 21 0.5 21.5 500 0 1000
-#SHMS HODO TDC TIME
+# SHMS HODO TDC TIME
TH2F phodo_1x_tdctime_vs_pmt_pos 'SHMS 1X+ TDC Time vs. PMT Number; PMT Number; TDC Time / 10 TDC Units' P.hod.1x.posTdcCounter P.hod.1x.posTdcTime 13 0.5 13.5 200 -2000 0
TH2F phodo_1y_tdctime_vs_pmt_pos 'SHMS 1Y+ TDC Time vs. PMT Number; PMT Number; TDC Time / 10 TDC Units' P.hod.1y.posTdcCounter P.hod.1y.posTdcTime 13 0.5 13.5 200 -2000 0
TH2F phodo_2x_tdctime_vs_pmt_pos 'SHMS 2X+ TDC Time vs. PMT Number; PMT Number; TDC Time / 10 TDC Units' P.hod.2x.posTdcCounter P.hod.2x.posTdcTime 14 0.5 14.5 200 -2000 0
@@ -228,18 +170,7 @@ TH2F phodo_2y_tdctime_vs_pmt_neg 'SHMS 2Y- TDC Time vs. PMT Number; PMT Number;
####### SHMS HODO GOOD VARIABLES #########
-#GOOD PULSE PEDESTAL
-TH2F phodo_1x_good_pped_vs_pmt_pos 'SHMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1x.GoodPosAdcPed 13 0.5 13.5 500 0 1000 P.hod.1x.GoodPosAdcPed>0.0
-TH2F phodo_1y_good_pped_vs_pmt_pos 'SHMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1y.GoodPosAdcPed 13 0.5 13.5 500 0 1000 P.hod.1y.GoodPosAdcPed>0.0
-TH2F phodo_2x_good_pped_vs_pmt_pos 'SHMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2x.GoodPosAdcPed 14 0.5 14.5 500 0 1000 P.hod.2x.GoodPosAdcPed>0.0
-TH2F phodo_2y_good_pped_vs_pmt_pos 'SHMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2y.GoodPosAdcPed 21 0.5 21.5 500 0 1000 P.hod.2y.GoodPosAdcPed>0.0
-
-TH2F phodo_1x_good_pped_vs_pmt_neg 'SHMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1x.GoodNegAdcPed 13 0.5 13.5 500 0 1000 P.hod.1x.GoodNegAdcPed>0.0
-TH2F phodo_1y_good_pped_vs_pmt_neg 'SHMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.1y.GoodNegAdcPed 13 0.5 13.5 500 0 1000 P.hod.1y.GoodNegAdcPed>0.0
-TH2F phodo_2x_good_pped_vs_pmt_neg 'SHMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2x.GoodNegAdcPed 14 0.5 14.5 500 0 1000 P.hod.2x.GoodNegAdcPed>0.0
-TH2F phodo_2y_good_pped_vs_pmt_neg 'SHMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 2 mV' [I+1] P.hod.2y.GoodNegAdcPed 21 0.5 21.5 500 0 1000 P.hod.2y.GoodNegAdcPed>0.0
-
-#GOOD PULSE INTEGRAL
+# GOOD PULSE INTEGRAL
TH2F phodo_1x_good_pi_vs_pmt_pos 'SHMS 1X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.hod.1x.GoodPosAdcPulseInt 13 0.5 13.5 320 0 80 P.hod.1x.GoodPosAdcPulseInt>0.0
TH2F phodo_1y_good_pi_vs_pmt_pos 'SHMS 1Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.hod.1y.GoodPosAdcPulseInt 13 0.5 13.5 320 0 80 P.hod.1y.GoodPosAdcPulseInt>0.0
TH2F phodo_2x_good_pi_vs_pmt_pos 'SHMS 2X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.hod.2x.GoodPosAdcPulseInt 14 0.5 14.5 320 0 80 P.hod.2x.GoodPosAdcPulseInt>0.0
@@ -250,7 +181,7 @@ TH2F phodo_1y_good_pi_vs_pmt_neg 'SHMS 1Y- Good Pulse Integral vs. PMT Number; P
TH2F phodo_2x_good_pi_vs_pmt_neg 'SHMS 2X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.hod.2x.GoodNegAdcPulseInt 14 0.5 14.5 320 0 80 P.hod.2x.GoodNegAdcPulseInt>0.0
TH2F phodo_2y_good_pi_vs_pmt_neg 'SHMS 2Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 0.25 pC' [I+1] P.hod.2y.GoodNegAdcPulseInt 21 0.5 21.5 320 0 80 P.hod.2y.GoodNegAdcPulseInt>0.0
-#GOOD PULSE AMPLITUDE
+# GOOD PULSE AMPLITUDE
TH2F phodo_1x_good_pamp_vs_pmt_pos 'SHMS 1X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] P.hod.1x.GoodPosAdcPulseAmp 13 0.5 13.5 500 0 1000 P.hod.1x.GoodPosAdcPulseAmp>0.0
TH2F phodo_1y_good_pamp_vs_pmt_pos 'SHMS 1Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] P.hod.1y.GoodPosAdcPulseAmp 13 0.5 13.5 500 0 1000 P.hod.1y.GoodPosAdcPulseAmp>0.0
TH2F phodo_2x_good_pamp_vs_pmt_pos 'SHMS 2X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] P.hod.2x.GoodPosAdcPulseAmp 14 0.5 14.5 500 0 1000 P.hod.2x.GoodPosAdcPulseAmp>0.0
@@ -261,8 +192,7 @@ TH2F phodo_1y_good_pamp_vs_pmt_neg 'SHMS 1Y- Good Pulse Amplitude vs. PMT Number
TH2F phodo_2x_good_pamp_vs_pmt_neg 'SHMS 2X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] P.hod.2x.GoodNegAdcPulseAmp 14 0.5 14.5 500 0 1000 P.hod.2x.GoodNegAdcPulseAmp>0.0
TH2F phodo_2y_good_pamp_vs_pmt_neg 'SHMS 2Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 2 mV' [I+1] P.hod.2y.GoodNegAdcPulseAmp 21 0.5 21.5 500 0 1000 P.hod.2y.GoodNegAdcPulseAmp>0.0
-
-#GOOD ADC PULSE TIME
+# GOOD ADC PULSE TIME
TH2F phodo_1x_good_ptime_vs_pmt_pos 'SHMS 1X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.hod.1x.GoodPosAdcPulseTime 13 0.5 13.5 4000 0 400 P.hod.1x.GoodPosAdcPulseTime>0.0
TH2F phodo_1y_good_ptime_vs_pmt_pos 'SHMS 1Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.hod.1y.GoodPosAdcPulseTime 13 0.5 13.5 4000 0 400 P.hod.1y.GoodPosAdcPulseTime>0.0
TH2F phodo_2x_good_ptime_vs_pmt_pos 'SHMS 2X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.hod.2x.GoodPosAdcPulseTime 14 0.5 14.5 4000 0 400 P.hod.2x.GoodPosAdcPulseTime>0.0
@@ -273,7 +203,7 @@ TH2F phodo_1y_good_ptime_vs_pmt_neg 'SHMS 1Y- Good Pulse Time vs. PMT Number; PM
TH2F phodo_2x_good_ptime_vs_pmt_neg 'SHMS 2X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.hod.2x.GoodNegAdcPulseTime 14 0.5 14.5 4000 0 400 P.hod.2x.GoodNegAdcPulseTime>0.0
TH2F phodo_2y_good_ptime_vs_pmt_neg 'SHMS 2Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 0.1 ns' [I+1] P.hod.2y.GoodNegAdcPulseTime 21 0.5 21.5 4000 0 400 P.hod.2y.GoodNegAdcPulseTime>0.0
-#GOOD TDC-ADC TIME
+#GOOD TDC-ADC TIME
TH2F phodo_1x_good_dtime_vs_pmt_pos 'SHMS 1X+ Good TDC - ADC Time vs. PMT Number; PMT Number; Good TDC - ADC Time / 0.1 ns' [I+1] P.hod.1x.GoodPosAdcTdcDiffTime 13 0.5 13.5 4000 -200 200
TH2F phodo_1y_good_dtime_vs_pmt_pos 'SHMS 1Y+ Good TDC - ADC Time vs. PMT Number; PMT Number; Good TDC - ADC Time / 0.1 ns' [I+1] P.hod.1y.GoodPosAdcTdcDiffTime 13 0.5 13.5 4000 -200 200
TH2F phodo_2x_good_dtime_vs_pmt_pos 'SHMS 2X+ Good TDC - ADC Time vs. PMT Number; PMT Number; Good TDC - ADC Time / 0.1 ns' [I+1] P.hod.2x.GoodPosAdcTdcDiffTime 14 0.5 14.5 4000 -200 200
@@ -284,7 +214,7 @@ TH2F phodo_1y_good_dtime_vs_pmt_neg 'SHMS 1Y- Good TDC - ADC Time vs. PMT Number
TH2F phodo_2x_good_dtime_vs_pmt_neg 'SHMS 2X- Good TDC - ADC Time vs. PMT Number; PMT Number; Good TDC - ADC Time / 0.1 ns' [I+1] P.hod.2x.GoodNegAdcTdcDiffTime 14 0.5 14.5 4000 -200 200
TH2F phodo_2y_good_dtime_vs_pmt_neg 'SHMS 2Y- Good TDC - ADC Time vs. PMT Number; PMT Number; Good TDC - ADC Time / 0.1 ns' [I+1] P.hod.2y.GoodNegAdcTdcDiffTime 21 0.5 21.5 4000 -200 200
-#GOOD TDC TIME UNCORRECTED (uncorrected for time offsets)
+# GOOD TDC TIME UNCORRECTED (uncorrected for time offsets)
TH2F phodo_1x_good_tdctime_uncorr_vs_pmt_pos 'SHMS 1X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 0.1 ns' [I+1] P.hod.1x.GoodPosTdcTimeUnCorr 13 0.5 13.5 1200 0 120 P.hod.1x.GoodPosTdcTimeUnCorr>0.0
TH2F phodo_1y_good_tdctime_uncorr_vs_pmt_pos 'SHMS 1Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 0.1 ns' [I+1] P.hod.1y.GoodPosTdcTimeUnCorr 13 0.5 13.5 1200 0 120 P.hod.1y.GoodPosTdcTimeUnCorr>0.0
TH2F phodo_2x_good_tdctime_uncorr_vs_pmt_pos 'SHMS 2X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 0.1 ns' [I+1] P.hod.2x.GoodPosTdcTimeUnCorr 14 0.5 14.5 1200 0 120 P.hod.2x.GoodPosTdcTimeUnCorr>0.0
@@ -295,7 +225,7 @@ TH2F phodo_1y_good_tdctime_uncorr_vs_pmt_neg 'SHMS 1Y- Good Uncorrected TDC Time
TH2F phodo_2x_good_tdctime_uncorr_vs_pmt_neg 'SHMS 2X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 0.1 ns' [I+1] P.hod.2x.GoodNegTdcTimeUnCorr 14 0.5 14.5 1200 0 120 P.hod.2x.GoodNegTdcTimeUnCorr>0.0
TH2F phodo_2y_good_tdctime_uncorr_vs_pmt_neg 'SHMS 2Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 0.1 ns' [I+1] P.hod.2y.GoodNegTdcTimeUnCorr 21 0.5 21.5 1200 0 120 P.hod.2y.GoodNegTdcTimeUnCorr>0.0
-#GOOD TDC TIME CORRECTED (corrected for time offsets)
+# GOOD TDC TIME CORRECTED (corrected for time offsets)
TH2F phodo_1x_good_tdctime_corr_vs_pmt_pos 'SHMS 1X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 0.1 ns' [I+1] P.hod.1x.GoodPosTdcTimeCorr 13 0.5 13.5 1200 0 120 P.hod.1x.GoodPosTdcTimeCorr>0.0
TH2F phodo_1y_good_tdctime_corr_vs_pmt_pos 'SHMS 1Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 0.1 ns' [I+1] P.hod.1y.GoodPosTdcTimeCorr 13 0.5 13.5 1200 0 120 P.hod.1y.GoodPosTdcTimeCorr>0.0
TH2F phodo_2x_good_tdctime_corr_vs_pmt_pos 'SHMS 2X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 0.1 ns' [I+1] P.hod.2x.GoodPosTdcTimeCorr 14 0.5 14.5 1200 0 120 P.hod.2x.GoodPosTdcTimeCorr>0.0
@@ -306,7 +236,7 @@ TH2F phodo_1y_good_tdctime_corr_vs_pmt_neg 'SHMS 1Y- Good Corrected TDC Time vs.
TH2F phodo_2x_good_tdctime_corr_vs_pmt_neg 'SHMS 2X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 0.1 ns' [I+1] P.hod.2x.GoodNegTdcTimeCorr 14 0.5 14.5 1200 0 120 P.hod.2x.GoodNegTdcTimeCorr>0.0
TH2F phodo_2y_good_tdctime_corr_vs_pmt_neg 'SHMS 2Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 0.1 ns' [I+1] P.hod.2y.GoodNegTdcTimeCorr 21 0.5 21.5 1200 0 120 P.hod.2y.GoodNegTdcTimeCorr>0.0
-#GOOD TDC TIME TOF CORRECTED (corrected for time of flight)
+# GOOD TDC TIME TOF CORRECTED (corrected for time of flight)
TH2F phodo_1x_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 1X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] P.hod.1x.GoodPosTdcTimeTOFCorr 13 0.5 13.5 1200 0 120 P.hod.1x.GoodPosTdcTimeTOFCorr>0.0
TH2F phodo_1y_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 1Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] P.hod.1y.GoodPosTdcTimeTOFCorr 13 0.5 13.5 1200 0 120 P.hod.1y.GoodPosTdcTimeTOFCorr>0.0
TH2F phodo_2x_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 2X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] P.hod.2x.GoodPosTdcTimeTOFCorr 14 0.5 14.5 1200 0 120 P.hod.2x.GoodPosTdcTimeTOFCorr>0.0
@@ -316,6 +246,3 @@ TH2F phodo_1x_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 1X- Good TOF Corrected TDC T
TH2F phodo_1y_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 1Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] P.hod.1y.GoodNegTdcTimeTOFCorr 13 0.5 13.5 1200 0 120 P.hod.1y.GoodNegTdcTimeTOFCorr>0.0
TH2F phodo_2x_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 2X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] P.hod.2x.GoodNegTdcTimeTOFCorr 14 0.5 14.5 1200 0 120 P.hod.2x.GoodNegTdcTimeTOFCorr>0.0
TH2F phodo_2y_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 2Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 0.1 ns' [I+1] P.hod.2y.GoodNegTdcTimeTOFCorr 21 0.5 21.5 1200 0 120 P.hod.2y.GoodNegTdcTimeTOFCorr>0.0
-
-
-
diff --git a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def
index ecd642e9..8aca2cd0 100644
--- a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def
+++ b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def
@@ -1,6 +1,7 @@
# See $ANALYZER/examples/output_example.def for examples
-#
+
block P.ngcer.*
block T.shms.*
#include "DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def"
diff --git a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
index eecf0f00..ee9a1fdb 100644
--- a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
+++ b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
@@ -1,13 +1,18 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 1
+HMS_event g.evtyp == 2
+COIN_event g.evtyp == 4
+
+TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+SHMS_Pretrig TRIG1 || TRIG2 || TRIG3
+
+shms_trigs SHMS_event
+edtm_accepted T.shms.pEDTM_tdcTime != 0.0
+physics_accepted T.shms.pEDTM_tdcTime == 0.0
RawDecode_master 1
diff --git a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def
index 9b578975..fda86dd3 100644
--- a/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def
+++ b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def
@@ -1,35 +1,23 @@
-#SHMS FPGA Error Flag
+# SHMS FPGA Error Flag
#TH1F pngcer_adcErrFlg 'SHMS Noble Gas Cherenkov FPGA Error Flag; Error Flag; Number of Entries' P.ngcer.adcErrorFlag 2 -0.5 1.5
TH2F pngcer_adcErrFlg2D 'SHMS Noble Gas Cherenkov FPGA Error Flag; PMT Number; Error Flag' P.ngcer.adcCounter P.ngcer.adcErrorFlag 4 0.5 4.5 2 -0.5 1.5
-#SHMS NGC RAW Occupancy and Multiplicity
+# SHMS NGC RAW Occupancy and Multiplicity
TH1F pngcer_raw_occ 'SHMS Noble Gas Cherenkov Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.ngcer.adcCounter 4 0.5 4.5
TH1F pngcer_raw_mult 'SHMS Noble Gas Cherenkov Raw Multiplicity; Number of PMTs Hit; Total Number of Raw ADC Hits' P.ngcer.totNumAdcHits 4 0.5 4.5
-
-#SHMS NGC GOOD Occupancy and Multiplicity
-TH1F pngcer_good_occ 'SHMS Noble Gas Cherenkov Good Occupancy; PMT Number; Number of Good ADC Hits' P.ngcer.numGoodAdcHits 4 0.5 4.5
-TH1F pngcer_good_mult 'SHMS Noble Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.ngcer.totNumGoodAdcHits 4 0.5 4.5
-
-#SHMS NGC TOTAL NUMBER OF P.E.
-TH1F pngcer_tot_npe 'SHMS Noble Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.ngcer.npeSum 100 0 50 P.ngcer.npeSum>0.0
-
-#SHMS NGC Number of P.E. / PMT
-TH2F pngcer_npe 'SHMS Noble Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] P.ngcer.npe 4 0.5 4.5 100 0 50 P.ngcer.npe>0.0
-
-#SHMS NGC RAW Pulse Pedestal / Integral / Amplitude / Time
+# SHMS NGC RAW Pulse Pedestal / Integral / Amplitude / Time
TH2F pngcer_raw_pped_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Pedestal vs. PMT Number; PMT Number; Raw Pulse Pedestal / 1 ADC Units' P.ngcer.adcCounter P.ngcer.adcPedRaw 4 0.5 4.5 10000 0 10000
TH2F pngcer_raw_pi_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseIntRaw 4 0.5 4.5 650 0 32500
TH2F pngcer_raw_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Amplitude vs. PMT Number; PMT Number; Raw Pulse Amplitude / 20 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseAmpRaw 4 0.5 4.5 410 0 8200
TH2F pngcer_raw_ptime_vs_pmt 'SHMS Noble Gas Cherenkov Raw Pulse Time vs. PMT Number; PMT Number; Raw Pulse Time / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseTimeRaw 4 0.5 4.5 650 0 6500
-#SHMS NGC Pulse Pedestal / Integral / Amplitude
+# SHMS NGC Pulse Pedestal / Integral / Amplitude
TH2F pngcer_pped_vs_pmt 'SHMS Noble Gas Cherenkov Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' P.ngcer.adcCounter P.ngcer.adcPed 4 0.5 4.5 500 0 1000
TH2F pngcer_pi_vs_pmt 'SHMS Noble Gas Cherenkov Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.04 pC' P.ngcer.adcCounter P.ngcer.adcPulseInt 4 0.5 4.5 2000 0 80
TH2F pngcer_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' P.ngcer.adcCounter P.ngcer.adcPulseAmp 4 0.5 4.5 500 0 1000
-#SHMS NGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time :: GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-TH2F pngcer_good_pped_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 2 mV' [I+1] P.ngcer.goodAdcPed 4 0.5 4.5 500 0 1000
+# SHMS NGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time :: GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
TH2F pngcer_good_pi_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 0.04 pC' [I+1] P.ngcer.goodAdcPulseInt 4 0.5 4.5 2000 0 80 P.ngcer.goodAdcPulseInt>0.0
TH2F pngcer_good_rawpi_vs_pmt 'SHMS Noble Gas Cherenkov Good Raw Pulse Integral vs. PMT Number; PMT Number; Raw Pulse Integral / 50 ADC Units' [I+1] P.ngcer.goodAdcPulseIntRaw 4 0.5 4.5 600 0 30000 P.ngcer.goodAdcPulseIntRaw>0.0
TH2F pngcer_good_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 2 mV' [I+1] P.ngcer.goodAdcPulseAmp 4 0.5 4.5 500 0 1000 P.ngcer.goodAdcPulseAmp>0.0
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
new file mode 100644
index 00000000..e018003b
--- /dev/null
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
@@ -0,0 +1,159 @@
+void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
+
+ // Get RunNumber and MaxEvent if not provided.
+ if(RunNumber == 0) {
+ cout << "Enter a Run Number (-1 to exit): ";
+ cin >> RunNumber;
+ if( RunNumber<=0 ) return;
+ }
+ if(MaxEvent == 0) {
+ cout << "\nNumber of Events to analyze: ";
+ cin >> MaxEvent;
+ if(MaxEvent == 0) {
+ cerr << "...Invalid entry\n";
+ exit;
+ }
+ }
+
+ // Create file name patterns.
+ const char* RunFileNamePattern = "hms_all_%05d.dat";
+ vector<TString> pathList;
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
+
+ const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_production_%d_%d.root";
+
+ //Load Global parameters
+ // Add variables to global list.
+ gHcParms->Define("gen_run_number", "Run Number", RunNumber);
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
+ // Load varibles from files to global list.
+ gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
+ // g_ctp_parm_filename and g_decode_map_filename should now be defined.
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
+ // Load params for HMS trigger configuration
+ gHcParms->Load("PARAM/TRIG/thms.param");
+
+ // Load the Hall C detector map
+ gHcDetectorMap = new THcDetectorMap();
+ gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack.map");
+ gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
+
+ // Add trigger apparatus
+ THaApparatus* TRG = new THcTrigApp("T", "TRG");
+ gHaApps->Add(TRG);
+ // Add trigger detector to trigger apparatus
+ THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
+ TRG->AddDetector(hms);
+
+ // Set up the equipment to be analyzed.
+ THcHallCSpectrometer* HMS = new THcHallCSpectrometer("H", "HMS");
+ gHaApps->Add(HMS);
+ // Add drift chambers to HMS apparatus
+ THcDC* dc = new THcDC("dc", "Drift Chambers");
+ HMS->AddDetector(dc);
+ // Add hodoscope to HMS apparatus
+ THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
+ HMS->AddDetector(hod);
+ // Add Cherenkov to HMS apparatus
+ THcCherenkov* cer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
+ HMS->AddDetector(cer);
+ // Add Aerogel Cherenkov to HMS apparatus
+ //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
+ //HMS->AddDetector(aero);
+ // Add calorimeter to HMS apparatus
+ THcShower* cal = new THcShower("cal", "Calorimeter");
+ HMS->AddDetector(cal);
+
+ // Include golden track information
+ THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
+ gHaPhysics->Add(gtr);
+// Add Rastered Beam Apparatus
+ THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
+ gHaApps->Add(beam);
+ THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
+ gHaPhysics->Add(hrp);
+ THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
+ gHaPhysics->Add(hext);
+// 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", "H.rb");
+ gHaPhysics->Add(hkin);
+ THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
+ gHaPhysics->Add(heff);
+
+ // Add handler for prestart event 125.
+ THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
+ gHaEvtHandlers->Add(ev125);
+ // Add handler for EPICS events
+ THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
+ gHaEvtHandlers->Add(hcepics);
+ // Add handler for scaler events
+ THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 2");
+ hscaler->AddEvtType(2);
+ hscaler->AddEvtType(129);
+ hscaler->SetDelayedType(129);
+ hscaler->SetUseFirstEvent(kTRUE);
+ gHaEvtHandlers->Add(hscaler);
+ // Add event handler for DAQ configuration event
+ THcConfigEvtHandler *hconfig = new THcConfigEvtHandler("hconfig", "Hall C configuration event handler");
+ gHaEvtHandlers->Add(hconfig);
+
+ // Set up the analyzer - we use the standard one,
+ // but this could be an experiment-specific one as well.
+ // The Analyzer controls the reading of the data, executes
+ // tests/cuts, loops over Acpparatus's and PhysicsModules,
+ // and executes the output routines.
+ THcAnalyzer* analyzer = new THcAnalyzer;
+
+ // A simple event class to be output to the resulting tree.
+ // Creating your own descendant of THaEvent is one way of
+ // defining and controlling the output.
+ THaEvent* event = new THaEvent;
+
+ // Define the run(s) that we want to analyze.
+ // We just set up one, but this could be many.
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
+
+ // Eventually need to learn to skip over, or properly analyze
+ // the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not
+ // include scaler or control events.
+ run->SetNscan(1);
+ run->SetDataRequired(0x7);
+ run->Print();
+
+ // Define the analysis parameters
+ TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+ analyzer->SetEvent(event);
+ // Set EPICS event type
+ analyzer->SetEpicsEvtType(180);
+ // Define crate map
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ // Define output ROOT file
+ analyzer->SetOutFile(ROOTFileName.Data());
+ // Define output DEF-file
+ analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production_all.def");
+ // Define cuts file
+ analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def"); // optional
+ // File to record cuts accounting information for cuts
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ // Start the actual analysis.
+ analyzer->Process(run);
+ // Create report file from template.
+ analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
+ Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
+
+}
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
index d873bfaf..e5ebb594 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
@@ -33,10 +33,12 @@ void replay_hcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
+ // Load params for HMS trigger configuration
+ gHcParms->Load("PARAM/TRIG/thms.param");
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/HMS/DETEC/CAL/hcal.map");
+ gHcDetectorMap->Load("MAPS/HMS/DETEC/CAL/hcal_htrig.map");
gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
// Set up the equipment to be analyzed.
@@ -46,6 +48,13 @@ void replay_hcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcShower* cal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(cal);
+ // Add trigger apparatus
+ THaApparatus* TRG = new THcTrigApp("T", "TRG");
+ gHaApps->Add(TRG);
+ // Add trigger detector to trigger apparatus
+ THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
+ TRG->AddDetector(hms);
+
// Add handler for prestart event 125.
THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
gHaEvtHandlers->Add(ev125);
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
new file mode 100644
index 00000000..b078e434
--- /dev/null
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
@@ -0,0 +1,164 @@
+void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
+
+ // Get RunNumber and MaxEvent if not provided.
+ if(RunNumber == 0) {
+ cout << "Enter a Run Number (-1 to exit): ";
+ cin >> RunNumber;
+ if( RunNumber<=0 ) return;
+ }
+ if(MaxEvent == 0) {
+ cout << "\nNumber of Events to analyze: ";
+ cin >> MaxEvent;
+ if(MaxEvent == 0) {
+ cerr << "...Invalid entry\n";
+ exit;
+ }
+ }
+
+ // Create file name patterns.
+ const char* RunFileNamePattern = "shms_all_%05d.dat";
+ vector<TString> pathList;
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
+
+ const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_%d_%d.root";
+
+ // Load global parameters
+ // Add variables to global list.
+ gHcParms->Define("gen_run_number", "Run Number", RunNumber);
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
+ // Load varibles from files to global list.
+ gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
+ // g_ctp_parm_filename and g_decode_map_filename should now be defined.
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
+ // Load params for SHMS trigger configuration
+ gHcParms->Load("PARAM/TRIG/tshms.param");
+
+ // Load the Hall C detector map
+ gHcDetectorMap = new THcDetectorMap();
+ gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+
+ // Add trigger apparatus
+ THaApparatus* TRG = new THcTrigApp("T", "TRG");
+ gHaApps->Add(TRG);
+
+
+ // Add trigger detector to trigger apparatus
+ THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
+ TRG->AddDetector(shms);
+
+ // Set up the equipment to be analyzed.
+ THcHallCSpectrometer* SHMS = new THcHallCSpectrometer("P", "SHMS");
+ gHaApps->Add(SHMS);
+ // Add Noble Gas Cherenkov to SHMS apparatus
+ THcCherenkov* ngcer = new THcCherenkov("ngcer", "Noble Gas Cherenkov");
+ SHMS->AddDetector(ngcer);
+ // Add drift chambers to SHMS apparatus
+ THcDC* dc = new THcDC("dc", "Drift Chambers");
+ SHMS->AddDetector(dc);
+ // Add hodoscope to SHMS apparatus
+ THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
+ SHMS->AddDetector(hod);
+ // Add Heavy Gas Cherenkov to SHMS apparatus
+ THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
+ SHMS->AddDetector(hgcer);
+
+ // Add Aerogel Cherenkov to SHMS apparatus
+ THcAerogel* aero = new THcAerogel("aero", "Aerogel");
+ SHMS->AddDetector(aero);
+ // Add calorimeter to SHMS apparatus
+ THcShower* cal = new THcShower("cal", "Calorimeter");
+ SHMS->AddDetector(cal);
+
+ // Include golden track information
+ THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
+ gHaPhysics->Add(gtr);
+ // Add Rastered Beam Apparatus
+ THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
+ gHaApps->Add(beam);
+ THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
+ gHaPhysics->Add(prp);
+ THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
+ gHaPhysics->Add(pext);
+ // Add Physics Module to calculate primary (scattered beam - usually electrons) kinematics
+ THcPrimaryKine* kin = new THcPrimaryKine("P.kin", "SHMS Single Arm Kinematics", "P", "P.rb");
+ gHaPhysics->Add(kin);
+ THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
+ gHaPhysics->Add(peff);
+
+
+
+ // Add event handler for prestart event 125.
+ THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
+ gHaEvtHandlers->Add(ev125);
+ // Add event handler for EPICS events
+ THaEpicsEvtHandler* hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
+ gHaEvtHandlers->Add(hcepics);
+ // Add event handler for scaler events
+ THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event type 1");
+ pscaler->AddEvtType(1);
+ pscaler->AddEvtType(129);
+ pscaler->SetDelayedType(129);
+ pscaler->SetUseFirstEvent(kTRUE);
+ gHaEvtHandlers->Add(pscaler);
+ // Add event handler for DAQ configuration event
+ THcConfigEvtHandler *pconfig = new THcConfigEvtHandler("pconfig", "Hall C configuration event handler");
+ gHaEvtHandlers->Add(pconfig);
+
+ // Set up the analyzer - we use the standard one,
+ // but this could be an experiment-specific one as well.
+ // The Analyzer controls the reading of the data, executes
+ // tests/cuts, loops over Acpparatus's and PhysicsModules,
+ // and executes the output routines.
+ THcAnalyzer* analyzer = new THcAnalyzer;
+
+ // A simple event class to be output to the resulting tree.
+ // Creating your own descendant of THaEvent is one way of
+ // defining and controlling the output.
+ THaEvent* event = new THaEvent;
+
+ // Define the run(s) that we want to analyze.
+ // We just set up one, but this could be many.
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
+
+ // Eventually need to learn to skip over, or properly analyze
+ // the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not
+ // include scaler or control events.
+ run->SetNscan(1);
+ run->SetDataRequired(0x7);
+ run->Print();
+
+ // Define the analysis parameters
+ TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+ analyzer->SetEvent(event);
+ // Set EPICS event type
+ analyzer->SetEpicsEvtType(180);
+ // Define crate map
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ // Define output ROOT file
+ analyzer->SetOutFile(ROOTFileName.Data());
+ // Define DEF-file
+ analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production_all.def");
+ // Define cuts file
+ analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def"); // optional
+ // File to record accounting information for cuts
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ // Start the actual analysis.
+ analyzer->Process(run);
+ // Create report file from template
+ analyzer->PrintReport("TEMPLATES/SHMS/PRODUCTION/pstackana_production.template",
+ Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+
+}
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
index cf9d1ef9..752365a3 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
@@ -35,9 +35,11 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
+ // Load params for SHMS trigger configuration
+ gHcParms->Load("PARAM/TRIG/tshms.param");
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/SHMS/DETEC/CAL/pcal.map");
+ gHcDetectorMap->Load("MAPS/SHMS/DETEC/CAL/pcal_ptrig.map");
gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Set up the equipment to be analyzed.
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
index 87aba8f9..aeb16591 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
@@ -35,14 +35,13 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-
- // Load params for SHMS DC test stand configuration
- //gHcParms->Load("PARAM/SHMS/DC/pdc_test_stand.param");
+ // Load params for the trigger apparatus
+ gHcParms->Load("PARAM/TRIG/tshms.param");
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
//gHcDetectorMap->Load(gHcParms->GetString("g_decode_map_filename"));
- gHcDetectorMap->Load("MAPS/SHMS/DETEC/DC/pdc.map");
+ gHcDetectorMap->Load("MAPS/SHMS/DETEC/DC/pdc_ptrig.map");
// Set up the equipment to be analyzed.
THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
@@ -50,6 +49,13 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Add SHMS drift chambers
SHMS->AddDetector(new THcDC("dc", "Drift Chambers"));
+ // Add trigger apparatus
+ THaApparatus* TRG = new THcTrigApp("T", "TRG");
+ gHaApps->Add(TRG);
+ // Add trigger detector to trigger apparatus
+ THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
+ TRG->AddDetector(shms);
+
// Add handler for prestart event 125.
THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
gHaEvtHandlers->Add(ev125);
--
GitLab