From 5afa8fc99acf2fc1b020e40d727b554a36211f7a Mon Sep 17 00:00:00 2001
From: John Matter <matter@virginia.edu>
Date: Sun, 3 Dec 2017 16:02:10 -0500
Subject: [PATCH] Update single arm production DEF-files, monitoring (#294)

* Fix title in production golden track histos

* Fix typos in trigger DEFs; add EPICS to production monitoring cfg; reorganize to be consistent with HMS

* Move gtr target variables own DEF-file

* Fix HMS hT1/hT2 slot/channel typo in histogram titles
---
 DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def  |  9 +++++
 .../HMS/PRODUCTION/TRIG/htrig_histos.def      | 32 ++++++++--------
 .../HMS/PRODUCTION/hstackana_production.def   | 10 +----
 DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def   |  4 +-
 DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def |  9 +++++
 .../SHMS/PRODUCTION/TRIG/ptrig_histos.def     | 38 +++++++++----------
 .../SHMS/PRODUCTION/pstackana_production.def  | 33 ++++++----------
 .../CAL/{pcalo_stand.cfg => pcal_stand.cfg}   |  0
 .../{GEN => PRODUCTION}/shms_production.cfg   |  9 ++++-
 9 files changed, 76 insertions(+), 68 deletions(-)
 create mode 100644 DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def
 create mode 100644 DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def
 rename onlineGUI/CONFIG/SHMS/CAL/{pcalo_stand.cfg => pcal_stand.cfg} (100%)
 rename onlineGUI/CONFIG/SHMS/{GEN => PRODUCTION}/shms_production.cfg (98%)

diff --git a/DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def b/DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def
new file mode 100644
index 00000000..b05b1907
--- /dev/null
+++ b/DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def
@@ -0,0 +1,9 @@
+####################
+# TARGET VARIABLES
+####################
+TH2F hgtr_xtar_vs_ytar   'HMS Golden Track X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' H.gtr.y H.gtr.x 40 -20 20 40 -20 20 hCleanTrack
+TH2F hgtr_xptar_vs_yptar 'HMS Golden Track X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' H.gtr.ph H.gtr.th 100 -.1 .1 100 -.1 .1 hCleanTrack
+TH2F hgtr_xtar_vs_yptar  'HMS Golden Track X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm'  H.gtr.ph H.gtr.x 100 -.1 .1 40 -20 20 hCleanTrack
+TH2F hgtr_xtar_vs_xptar  'HMS Golden Track X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' H.gtr.th H.gtr.x 100 -.1 .1 40 -20 20 hCleanTrack
+TH2F hgtr_ytar_vs_yptar  'HMS Golden Track Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm'  H.gtr.ph H.gtr.y 100 -.1 .1 40 -20 20 hCleanTrack
+TH2F hgtr_ytar_vs_xptar  'HMS Golden Track Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' H.gtr.th H.gtr.y 100 -.1 .1 40 -20 20 hCleanTrack
diff --git a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
index 2c343ff3..15bdb453 100644
--- a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
@@ -1,27 +1,27 @@
 #********************
 # Trigger Apparatus *
 #********************
-TH1F htrig_h1x_tdc_mult 'HMS h1x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h1X_tdcMultiplicity 11 0 11
-TH1F htrig_h1y_tdc_mult 'HMS h1y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h1Y_tdcMultiplicity 11 0 11
-TH1F htrig_h2x_tdc_mult 'HMS h2x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h2X_tdcMultiplicity 11 0 11
-TH1F htrig_h2y_tdc_mult 'HMS h2y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h2Y_tdcMultiplicity 11 0 11
+TH1F htrig_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
+TH1F htrig_h2y_tdc_mult 'HMS h2y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2Y_tdcMultiplicity 11 0 11
 
-TH1F htrig_h1T_tdc_mult 'HMS h1x/h1y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h1T_tdcMultiplicity 11 0 11
-TH1F htrig_h2T_tdc_mult 'HMS h2x/h2y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.hms.h2T_tdcMultiplicity 11 0 11
+TH1F htrig_h1T_tdc_mult 'HMS h1x/h1y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1T_tdcMultiplicity 11 0 11
+TH1F htrig_h2T_tdc_mult 'HMS h2x/h2y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2T_tdcMultiplicity 11 0 11
 
-TH1F htrig_hT1_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 20, Channel 15); Raw TDC Multiplicity; Counts / 10' T.hms.hT1_tdcMultiplicity 11 0 11
-TH1F htrig_hT2_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.hms.hT2_tdcMultiplicity 11 0 11
+TH1F htrig_hT1_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 2, Channel 6); TDC Multiplicity; Counts / 1' T.hms.hT1_tdcMultiplicity 11 0 11
+TH1F htrig_hT2_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 20, Channel 127); TDC Multiplicity; Counts / 1' T.hms.hT2_tdcMultiplicity 11 0 11
 
-TH1F htrig_h1x_good_tdc 'HMS h1x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h1X_tdcTime 800 0 800 T.hms.h1X_tdcMultiplicity==1
-TH1F htrig_h1y_good_tdc 'HMS h1y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h1Y_tdcTime 800 0 800 T.hms.h1Y_tdcMultiplicity==1
-TH1F htrig_h2x_good_tdc 'HMS h2x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h2X_tdcTime 800 0 800 T.hms.h2X_tdcMultiplicity==1
-TH1F htrig_h2y_good_tdc 'HMS h2y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h2Y_tdcTime 800 0 800 T.hms.h2Y_tdcMultiplicity==1
+TH1F htrig_h1x_good_tdc 'HMS h1x Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h1X_tdcTime 800 0 800 T.hms.h1X_tdcMultiplicity==1
+TH1F htrig_h1y_good_tdc 'HMS h1y Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h1Y_tdcTime 800 0 800 T.hms.h1Y_tdcMultiplicity==1
+TH1F htrig_h2x_good_tdc 'HMS h2x Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h2X_tdcTime 800 0 800 T.hms.h2X_tdcMultiplicity==1
+TH1F htrig_h2y_good_tdc 'HMS h2y Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h2Y_tdcTime 800 0 800 T.hms.h2Y_tdcMultiplicity==1
 
-TH1F htrig_h1T_good_tdc 'HMS h1x/h1y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h1T_tdcTime 350 0 3500 T.hms.h1T_tdcMultiplicity==1
-TH1F htrig_h2T_good_tdc 'HMS h2x/h2y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.hms.h2T_tdcTime 350 0 3500 T.hms.h2T_tdcMultiplicity==1
+TH1F htrig_h1T_good_tdc 'HMS h1x/h1y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h1T_tdcTime 350 0 3500 T.hms.h1T_tdcMultiplicity==1
+TH1F htrig_h2T_good_tdc 'HMS h2x/h2y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h2T_tdcTime 350 0 3500 T.hms.h2T_tdcMultiplicity==1
 
-TH1F htrig_hT1_good_tdc 'HMS T1 Coincidence Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (ns); Counts / 1 ns' T.hms.hT1_tdcTime 350 0 3500 T.hms.hT1_tdcMultiplicity==1
-TH1F htrig_hT2_good_tdc 'HMS T2 Coincidence Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (ns); Counts / 1 ns' T.hms.hT2_tdcTime 350 0 3500 T.hms.hT2_tdcMultiplicity==1
+TH1F htrig_hT1_good_tdc 'HMS hT1 Good TDC Time (Slot 2, Channel 6); Good Time (ns); Counts / 1 ns'  T.hms.hT1_tdcTime 350 0 3500 T.hms.hT1_tdcMultiplicity==1
+TH1F htrig_hT2_good_tdc 'HMS hT2 Good TDC Time (Slot 20, Channel 127); Good Time (ns); Counts / 1 ns' T.hms.hT2_tdcTime 350 0 3500 T.hms.hT2_tdcMultiplicity==1
 
 TH2F htrig_ch1xy_ch2x 'HMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.hms.h1T_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300 T.hms.h2X_tdcMultiplicity==1&&T.hms.h1T_tdcMultiplicity==1
 TH2F htrig_ch1x_ch2x 'HMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.hms.h1X_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300 T.hms.h2X_tdcMultiplicity==1&&T.hms.h1X_tdcMultiplicity==1
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def b/DEF-files/HMS/PRODUCTION/hstackana_production.def
index 8e0f9ccf..9301c0d6 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def
@@ -11,17 +11,9 @@
 #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"
 
 
-####################
-# TARGET VARIABLES
-####################
-TH2F hgtr_xtar_vs_ytar   'HMS DC X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' H.gtr.y H.gtr.x 40 -20 20 40 -20 20 hCleanTrack
-TH2F hgtr_xptar_vs_yptar 'HMS DC X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' H.gtr.ph H.gtr.th 100 -.1 .1 100 -.1 .1 hCleanTrack
-TH2F hgtr_xtar_vs_yptar  'HMS DC X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm'  H.gtr.ph H.gtr.x 100 -.1 .1 40 -20 20 hCleanTrack
-TH2F hgtr_xtar_vs_xptar  'HMS DC X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' H.gtr.th H.gtr.x 100 -.1 .1 40 -20 20 hCleanTrack
-TH2F hgtr_ytar_vs_yptar  'HMS DC Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm'  H.gtr.ph H.gtr.y 100 -.1 .1 40 -20 20 hCleanTrack
-TH2F hgtr_ytar_vs_xptar  'HMS DC Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' H.gtr.th H.gtr.y 100 -.1 .1 40 -20 20 hCleanTrack
diff --git a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
index b52304ee..3cc6a41e 100644
--- a/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
+++ b/DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def
@@ -21,8 +21,8 @@ TH1F htrig_h2y_tdc 'HMS h2y TDC Time; TDC Time (ns); Counts / 0.1 ns;' T.hms.h2Y
 TH1F htrig_h1T_tdc 'HMS h1X/h1Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.h1T_tdcTimeRaw 4000 0 4000
 TH1F htrig_h2T_tdc 'HMS h2X/h2Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.h2T_tdcTimeRaw 4000 0 4000
 
-TH1F htrig_hT1_tdc 'HMS T1 Coincidence TDC Time (Slot 2); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT1_tdcTimeRaw 4000 0 4000
-TH1F htrig_hT2_tdc 'HMS T2 Coincidence TDC Time (Slot 20); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT2_tdcTimeRaw 4000 0 4000
+TH1F htrig_hT1_tdc 'HMS T1 Coincidence TDC Time (Slot 2, Channel 6); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT1_tdcTimeRaw 4000 0 4000
+TH1F htrig_hT2_tdc 'HMS T2 Coincidence TDC Time (Slot 20, Channel 127); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.hms.hT2_tdcTimeRaw 4000 0 4000
 
 #----------------------------
 # HMS Raw DC TRIG Reference Time
diff --git a/DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def b/DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def
new file mode 100644
index 00000000..d6244eab
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def
@@ -0,0 +1,9 @@
+####################
+# TARGET VARIABLES
+####################
+TH2F pgtr_xtar_vs_ytar   'SHMS Golden Track X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' P.gtr.y P.gtr.x 40 -20 20 40 -20 20 pCleanTrack
+TH2F pgtr_xptar_vs_yptar 'SHMS Golden Track X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' P.gtr.ph P.gtr.th 100 -.1 .1 100 -.1 .1 pCleanTrack
+TH2F pgtr_xtar_vs_yptar  'SHMS Golden Track X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm'  P.gtr.ph P.gtr.x 100 -.1 .1 40 -20 20 pCleanTrack
+TH2F pgtr_xtar_vs_xptar  'SHMS Golden Track X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' P.gtr.th P.gtr.x 100 -.1 .1 40 -20 20 pCleanTrack
+TH2F pgtr_ytar_vs_yptar  'SHMS Golden Track Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm'  P.gtr.ph P.gtr.y 100 -.1 .1 40 -20 20 pCleanTrack
+TH2F pgtr_ytar_vs_xptar  'SHMS Golden Track Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' P.gtr.th P.gtr.y 100 -.1 .1 40 -20 20 pCleanTrack
diff --git a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
index 0cbf099d..0756f3d6 100644
--- a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
@@ -2,31 +2,31 @@
 # Trigger Apparatus *
 #********************
 
-TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1X_tdcMultiplicity 11 0 11
-TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1Y_tdcMultiplicity 11 0 11
-TH1F ptrig_p2x_tdc_mult 'SHMS p2x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2X_tdcMultiplicity 11 0 11
-TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2Y_tdcMultiplicity 11 0 11
+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; Raw TDC Multiplicity; Counts / 10' T.shms.p1T_tdcMultiplicity 11 0 11
-TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2T_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); Raw TDC Multiplicity; Counts / 10' T.shms.pT1_tdcMultiplicity 11 0 11
-TH1F ptrig_pT2_tdc_mult 'SHMS pT2 TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.shms.pT2_tdcMultiplicity 11 0 11
-TH1F ptrig_pT3_tdc_mult 'SHMS pT3 TDC Multiplicity (Slot 19, Channel 38); Raw TDC Multiplicity; Counts / 10' T.shms.pT3_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 / 10' T.shms.pFADC_TREF_ROC2_adcMultiplicity 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
 
-TH1F ptrig_p1x_good_tdc 'SHMS p1x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1X_tdcTime 800 0 800 T.shms.p1X_tdcMultiplicity==1
-TH1F ptrig_p1y_good_tdc 'SHMS p1y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1Y_tdcTime 800 0 800 T.shms.p1Y_tdcMultiplicity==1
-TH1F ptrig_p2x_good_tdc 'SHMS p2x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p2X_tdcTime 800 0 800 T.shms.p2X_tdcMultiplicity==1
-TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p2Y_tdcTime 800 0 800 T.shms.p2Y_tdcMultiplicity==1
+TH1F ptrig_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
+TH1F ptrig_p2x_good_tdc 'SHMS p2x Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p2X_tdcTime 800 0 800 T.shms.p2X_tdcMultiplicity==1
+TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p2Y_tdcTime 800 0 800 T.shms.p2Y_tdcMultiplicity==1
 
-TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1T_tdcTime 800 0 800 T.shms.p1T_tdcMultiplicity==1
-TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p2T_tdcTime 800 0 800 T.shms.p2T_tdcMultiplicity==1
+TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p1T_tdcTime 800 0 800 T.shms.p1T_tdcMultiplicity==1
+TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p2T_tdcTime 800 0 800 T.shms.p2T_tdcMultiplicity==1
 
-TH1F ptrig_pT1_good_tdc 'SHMS pT1 Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT1_tdcTime 800 0 800 T.shms.pT1_tdcMultiplicity==1
-TH1F ptrig_pT2_good_tdc 'SHMS pT2 Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT2_tdcTime 800 0 800 T.shms.pT2_tdcMultiplicity==1
-TH1F ptrig_pT3_good_tdc 'SHMS pT3 Good TDC Time (Slot 19, Channel 38); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT3_tdcTime 800 0 800 T.shms.pT3_tdcMultiplicity==1
+TH1F ptrig_pT1_good_tdc 'SHMS pT1 Good TDC Time (Slot 20, Channel 15); Good TDC Time (ns); Counts / 1 ns' T.shms.pT1_tdcTime 800 0 800 T.shms.pT1_tdcMultiplicity==1
+TH1F ptrig_pT2_good_tdc 'SHMS pT2 Good TDC Time (Slot 19, Channel 31); Good TDC Time (ns); Counts / 1 ns' T.shms.pT2_tdcTime 800 0 800 T.shms.pT2_tdcMultiplicity==1
+TH1F ptrig_pT3_good_tdc 'SHMS pT3 Good TDC Time (Slot 19, Channel 38); Good TDC Time (ns); Counts / 1 ns' T.shms.pT3_tdcTime 800 0 800 T.shms.pT3_tdcMultiplicity==1
 
 TH1F ptrig_pFADC_TREF_ROC2_good_tdc 'SHMS pFADC_TREF_ROC2 Good Pulse Time; Good Pulse Time (ns); Counts / 1 ns' T.shms.pFADC_TREF_ROC2_adcPulseTime 800 0 800 T.shms.pFADC_TREF_ROC2_adcMultiplicity==1
 
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
index ed338b86..a0e4095a 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
@@ -1,14 +1,3 @@
-#include "DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def"
-#include "DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/KIN/pkin_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def"
 #include "DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def"
 #include "DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def"
 #include "DEF-files/SHMS/TEST_STANDS/DC/pdcana.def"
@@ -17,14 +6,16 @@
 #include "DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def"
 #include "DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.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"
 
-
-####################
-# TARGET VARIABLES
-####################
-TH2F pgtr_xtar_vs_ytar   'SHMS DC X_{tar} vs Y_{tar}; Y_{tar} (cm) / 1 cm; X_{tar} (cm) / 1 cm' P.gtr.y P.gtr.x 40 -20 20 40 -20 20 pCleanTrack
-TH2F pgtr_xptar_vs_yptar 'SHMS DC X'_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X'_{tar} / 0.002 rad' P.gtr.ph P.gtr.th 100 -.1 .1 100 -.1 .1 pCleanTrack
-TH2F pgtr_xtar_vs_yptar  'SHMS DC X_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; X_{tar} / 1 cm'  P.gtr.ph P.gtr.x 100 -.1 .1 40 -20 20 pCleanTrack
-TH2F pgtr_xtar_vs_xptar  'SHMS DC X_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; X_{tar} / 1 cm' P.gtr.th P.gtr.x 100 -.1 .1 40 -20 20 pCleanTrack
-TH2F pgtr_ytar_vs_yptar  'SHMS DC Y_{tar} vs Y'_{tar}; Y'_{tar} / 0.002 rad; Y_{tar} / 1 cm'  P.gtr.ph P.gtr.y 100 -.1 .1 40 -20 20 pCleanTrack
-TH2F pgtr_ytar_vs_xptar  'SHMS DC Y_{tar} vs X'_{tar}; X'_{tar} / 0.002 rad; Y_{tar} / 1 cm' P.gtr.th P.gtr.y 100 -.1 .1 40 -20 20 pCleanTrack
diff --git a/onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg b/onlineGUI/CONFIG/SHMS/CAL/pcal_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg
rename to onlineGUI/CONFIG/SHMS/CAL/pcal_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
similarity index 98%
rename from onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
rename to onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
index f7e26dad..fa369a3c 100644
--- a/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
+++ b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
@@ -36,7 +36,7 @@ phodo_2x_good_pped_vs_pmt_neg -nostat
 phodo_2y_good_pped_vs_pmt_neg -nostat
 
 newpage 2 3
-title SHMS DC Wire Hits
+title SHMS DC Wire Maps 
 macro UTIL/GEN/overlay2.C("pdc1u1_wirenum","pdc2v1_wirenum","1U1","2V1")
 macro UTIL/GEN/overlay2.C("pdc1u2_wirenum","pdc2v2_wirenum","1U2","2V2")
 macro UTIL/GEN/overlay2.C("pdc1x1_wirenum","pdc2x1_wirenum","1X1","2X1")
@@ -207,3 +207,10 @@ pdc_trk_beta_pi -nostat
 pdc_trk_mom_pi -nostat
 pcal_xtrack_vs_etrack_pi -nostat
 pcal_ytrack_vs_etrack_pi -nostat
+
+newpage 2 2
+title EPICS
+hac_bcm_average -nostat
+ibcm1 -nostat
+ibcm2 -nostat
+iunser -nostat
-- 
GitLab