diff --git a/onlineGUI/CONFIG/GEN/kpp.cfg b/onlineGUI/CONFIG/GEN/kpp.cfg
index 3ba6650a5a7559572616275b4d67227aac2b1327..dcda4bd8acbf995d62e0185521bc7a5975c8b1d2 100755
--- a/onlineGUI/CONFIG/GEN/kpp.cfg
+++ b/onlineGUI/CONFIG/GEN/kpp.cfg
@@ -4,116 +4,116 @@ canvassize 1600 800
 #canvassize 800 800
 newpage 3 3
 title Trigger Times
-macro Macros/kpp_analysis.C("h_p1X_tdc")
-macro Macros/kpp_analysis.C("h_p1Y_tdc")
-macro Macros/kpp_analysis.C("h_p2X_tdc")
-macro Macros/kpp_analysis.C("h_p2Y_tdc")
-macro Macros/kpp_analysis.C("h_p1T_tdc")
-macro Macros/kpp_analysis.C("h_p2T_tdc")
-macro Macros/kpp_analysis.C("h_pT1_tdc")
-macro Macros/kpp_analysis.C("h_pT2_tdc")
-macro Macros/kpp_analysis.C("h_pT3_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1X_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1Y_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2X_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2Y_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1T_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2T_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_pT1_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_pT2_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_pT3_tdc")
 newpage 4 3
 title Hodoscope Plane Reference Times
-macro Macros/kpp_analysis.C("h_p1XmpT2_tdc")
-macro Macros/kpp_analysis.C("h_p1YmpT2_tdc")
-macro Macros/kpp_analysis.C("h_p2XmpT2_tdc")
-macro Macros/kpp_analysis.C("h_p2YmpT2_tdc")
-macro Macros/kpp_analysis.C("h_p1XmpT3_tdc")
-macro Macros/kpp_analysis.C("h_p1YmpT3_tdc")
-macro Macros/kpp_analysis.C("h_p2XmpT3_tdc")
-macro Macros/kpp_analysis.C("h_p2YmpT3_tdc")
-macro Macros/kpp_analysis.C("h_p1TmpT2_tdc")
-macro Macros/kpp_analysis.C("h_p1TmpT3_tdc")
-macro Macros/kpp_analysis.C("h_p2TmpT2_tdc")
-macro Macros/kpp_analysis.C("h_p2TmpT3_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1XmpT2_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1YmpT2_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2XmpT2_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2YmpT2_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1XmpT3_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1YmpT3_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2XmpT3_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2YmpT3_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1TmpT2_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p1TmpT3_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2TmpT2_tdc")
+macro UTIL/GEN/kpp_analysis.C("h_p2TmpT3_tdc")
 newpage 2 2 logz
 title Negative Hodoscope Corrected TDC Times
-macro Macros/kpp_analysis.C("h2_p1X_negTdcCorr")
-macro Macros/kpp_analysis.C("h2_p1Y_negTdcCorr")
-macro Macros/kpp_analysis.C("h2_p2X_negTdcCorr")
-macro Macros/kpp_analysis.C("h2_p2Y_negTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p1X_negTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p1Y_negTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p2X_negTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p2Y_negTdcCorr")
 newpage 2 2 logz
 title Positive Hodoscope Corrected TDC Times
-macro Macros/kpp_analysis.C("h2_p1X_posTdcCorr")
-macro Macros/kpp_analysis.C("h2_p1Y_posTdcCorr")
-macro Macros/kpp_analysis.C("h2_p2X_posTdcCorr")
-macro Macros/kpp_analysis.C("h2_p2Y_posTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p1X_posTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p1Y_posTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p2X_posTdcCorr")
+macro UTIL/GEN/kpp_analysis.C("h2_p2Y_posTdcCorr")
 newpage 2 2 logz
 title Negative Hodoscope Pulse Time - TDC Time
-macro Macros/kpp_analysis.C("h2_p1Xneg_pt_tt_diff")
-macro Macros/kpp_analysis.C("h2_p1Yneg_pt_tt_diff")
-macro Macros/kpp_analysis.C("h2_p2Xneg_pt_tt_diff")
-macro Macros/kpp_analysis.C("h2_p2Yneg_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p1Xneg_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p1Yneg_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p2Xneg_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p2Yneg_pt_tt_diff")
 newpage 2 2 logz
 title Positive Hodoscope Pulse Time - TDC Time
-macro Macros/kpp_analysis.C("h2_p1Xpos_pt_tt_diff")
-macro Macros/kpp_analysis.C("h2_p1Ypos_pt_tt_diff")
-macro Macros/kpp_analysis.C("h2_p2Xpos_pt_tt_diff")
-macro Macros/kpp_analysis.C("h2_p2Ypos_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p1Xpos_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p1Ypos_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p2Xpos_pt_tt_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_p2Ypos_pt_tt_diff")
 newpage 2 2 logz
 title Hodoscope Corrected TDC Time Differences
-macro Macros/kpp_analysis.C("h2_p1X_tdcCorrDiff")
-macro Macros/kpp_analysis.C("h2_p1Y_tdcCorrDiff")
-macro Macros/kpp_analysis.C("h2_p2X_tdcCorrDiff")
-macro Macros/kpp_analysis.C("h2_p2Y_tdcCorrDiff")
+macro UTIL/GEN/kpp_analysis.C("h2_p1X_tdcCorrDiff")
+macro UTIL/GEN/kpp_analysis.C("h2_p1Y_tdcCorrDiff")
+macro UTIL/GEN/kpp_analysis.C("h2_p2X_tdcCorrDiff")
+macro UTIL/GEN/kpp_analysis.C("h2_p2Y_tdcCorrDiff")
 newpage 2 2 
 title Plane Times
-macro Macros/kpp_analysis.C("h_p1X_plTime")
-macro Macros/kpp_analysis.C("h_p1Y_plTime")
-macro Macros/kpp_analysis.C("h_p2X_plTime")
-macro Macros/kpp_analysis.C("h_p2Y_plTime")
+macro UTIL/GEN/kpp_analysis.C("h_p1X_plTime")
+macro UTIL/GEN/kpp_analysis.C("h_p1Y_plTime")
+macro UTIL/GEN/kpp_analysis.C("h_p2X_plTime")
+macro UTIL/GEN/kpp_analysis.C("h_p2Y_plTime")
 newpage 2 2
 title Focal Plane Times
-macro Macros/kpp_analysis.C("h_p1X_fpTime")
-macro Macros/kpp_analysis.C("h_p1Y_fpTime")
-macro Macros/kpp_analysis.C("h_p2X_fpTime")
-macro Macros/kpp_analysis.C("h_p2Y_fpTime")
+macro UTIL/GEN/kpp_analysis.C("h_p1X_fpTime")
+macro UTIL/GEN/kpp_analysis.C("h_p1Y_fpTime")
+macro UTIL/GEN/kpp_analysis.C("h_p2X_fpTime")
+macro UTIL/GEN/kpp_analysis.C("h_p2Y_fpTime")
 newpage 2 3 logz
 title Aerogel ADC Pulse Times
-macro Macros/kpp_analysis.C("h2_paero_posPulseTime_pT1_diff")
-macro Macros/kpp_analysis.C("h2_paero_negPulseTime_pT1_diff")
-macro Macros/kpp_analysis.C("h2_paero_posPulseTime_pT2_diff")
-macro Macros/kpp_analysis.C("h2_paero_negPulseTime_pT2_diff")
-macro Macros/kpp_analysis.C("h2_paero_posPulseTime_pT3_diff")
-macro Macros/kpp_analysis.C("h2_paero_negPulseTime_pT3_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_paero_posPulseTime_pT1_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_paero_negPulseTime_pT1_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_paero_posPulseTime_pT2_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_paero_negPulseTime_pT2_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_paero_posPulseTime_pT3_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_paero_negPulseTime_pT3_diff")
 newpage 2 3 logz
 title Pre-Shower ADC Pulse Times
-macro Macros/kpp_analysis.C("h2_ppshwr_posPulseTime_pT1_diff")
-macro Macros/kpp_analysis.C("h2_ppshwr_negPulseTime_pT1_diff")
-macro Macros/kpp_analysis.C("h2_ppshwr_posPulseTime_pT2_diff")
-macro Macros/kpp_analysis.C("h2_ppshwr_negPulseTime_pT2_diff")
-macro Macros/kpp_analysis.C("h2_ppshwr_posPulseTime_pT3_diff")
-macro Macros/kpp_analysis.C("h2_ppshwr_negPulseTime_pT3_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_ppshwr_posPulseTime_pT1_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_ppshwr_negPulseTime_pT1_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_ppshwr_posPulseTime_pT2_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_ppshwr_negPulseTime_pT2_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_ppshwr_posPulseTime_pT3_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_ppshwr_negPulseTime_pT3_diff")
 newpage 3 1 logz
 title Shower ADC Pulse Times
-macro Macros/kpp_analysis.C("h2_pshwr_pulseTime_pT1_diff")
-macro Macros/kpp_analysis.C("h2_pshwr_pulseTime_pT2_diff")
-macro Macros/kpp_analysis.C("h2_pshwr_pulseTime_pT3_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_pshwr_pulseTime_pT1_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_pshwr_pulseTime_pT2_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_pshwr_pulseTime_pT3_diff")
 newpage 3 1 logz
 title Heavy Gas ADC Pulse Times
-macro Macros/kpp_analysis.C("h2_phgc_pulseTime_pT1_diff")
-macro Macros/kpp_analysis.C("h2_phgc_pulseTime_pT2_diff")
-macro Macros/kpp_analysis.C("h2_phgc_pulseTime_pT3_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_phgc_pulseTime_pT1_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_phgc_pulseTime_pT2_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_phgc_pulseTime_pT3_diff")
 newpage 3 1 logz
 title Noble Gas ADC Pulse Times
-macro Macros/kpp_analysis.C("h2_pngc_pulseTime_pT1_diff")
-macro Macros/kpp_analysis.C("h2_pngc_pulseTime_pT2_diff")
-macro Macros/kpp_analysis.C("h2_pngc_pulseTime_pT3_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_pngc_pulseTime_pT1_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_pngc_pulseTime_pT2_diff")
+macro UTIL/GEN/kpp_analysis.C("h2_pngc_pulseTime_pT3_diff")
 newpage 3 2
 title Detector ADC Sums
-macro Macros/kpp_analysis.C("h_paero_sum")
-macro Macros/kpp_analysis.C("h_phgc_sum")
-macro Macros/kpp_analysis.C("h_pngc_sum")
-macro Macros/kpp_analysis.C("h_ppshwr_sum")
-macro Macros/kpp_analysis.C("h_pshwr_sum")
-macro Macros/kpp_analysis.C("h_ptotshwr_sum")
+macro UTIL/GEN/kpp_analysis.C("h_paero_sum")
+macro UTIL/GEN/kpp_analysis.C("h_phgc_sum")
+macro UTIL/GEN/kpp_analysis.C("h_pngc_sum")
+macro UTIL/GEN/kpp_analysis.C("h_ppshwr_sum")
+macro UTIL/GEN/kpp_analysis.C("h_pshwr_sum")
+macro UTIL/GEN/kpp_analysis.C("h_ptotshwr_sum")
 newpage 2 2 logz
 title SHMS Particle Identification
-macro Macros/kpp_analysis.C("h2_pshwr_vs_phgcer")
-macro Macros/kpp_analysis.C("h2_pshwr_vs_pngcer")
-macro Macros/kpp_analysis.C("h2_pshwr_vs_ppshwr")
-macro Macros/kpp_analysis.C("h2_EdivP_vs_P")
+macro UTIL/GEN/kpp_analysis.C("h2_pshwr_vs_phgcer")
+macro UTIL/GEN/kpp_analysis.C("h2_pshwr_vs_pngcer")
+macro UTIL/GEN/kpp_analysis.C("h2_pshwr_vs_ppshwr")
+macro UTIL/GEN/kpp_analysis.C("h2_EdivP_vs_P")
 
 
 
diff --git a/onlineGUI/CONFIG/GEN/standard.cfg b/onlineGUI/CONFIG/GEN/standard.cfg
index 5057a8d9e28267bbdfc1196729b6b57fad8fdfbf..a52d148c7cfe06b2ff1e921fbf1a6c8e5dfeb363 100755
--- a/onlineGUI/CONFIG/GEN/standard.cfg
+++ b/onlineGUI/CONFIG/GEN/standard.cfg
@@ -1,5 +1,5 @@
 protorootfile ../../engine_comparison/hcana_replay/Rootfiles/replay_baryon_XXXXX.root
-guicolor lightblue
+guicolor orange 
 canvassize 500 800
 
 definecut thtarcut abs(H.tr.tg_th)<0.01
@@ -16,42 +16,42 @@ H.tr.tg_ph:H.tr.tg_th phtarcut&&thtarcut -type colz -title "Target Xp vs Yp"
 
 newpage 2 3
 title HMS DC Wire Maps (Red=DC2)
-macro    Macros/overlay.C("hdc1x1_wm","hdc2x1_wm")
-macro    Macros/overlay.C("hdc1y1_wm","hdc2y1_wm")
-macro    Macros/overlay.C("hdc1u1_wm","hdc2u1_wm")
-macro    Macros/overlay.C("hdc1v1_wm","hdc2v1_wm")
-macro    Macros/overlay.C("hdc1y2_wm","hdc2y2_wm")
-macro    Macros/overlay.C("hdc1x2_wm","hdc2x2_wm")
+macro    UTIL/GEN/overlay2.C("hdc1x1_wm","hdc2x1_wm")
+macro    UTIL/GEN/overlay2.C("hdc1y1_wm","hdc2y1_wm")
+macro    UTIL/GEN/overlay2.C("hdc1u1_wm","hdc2u1_wm")
+macro    UTIL/GEN/overlay2.C("hdc1v1_wm","hdc2v1_wm")
+macro    UTIL/GEN/overlay2.C("hdc1y2_wm","hdc2y2_wm")
+macro    UTIL/GEN/overlay2.C("hdc1x2_wm","hdc2x2_wm")
 
 newpage 2 3
 title HDC1&2 drift distance (Red=DC2)
-macro    Macros/overlay.C("hdc1x1_dd","hdc2x1_dd")
-macro    Macros/overlay.C("hdc1y1_dd","hdc2y1_dd")
-macro    Macros/overlay.C("hdc1u1_dd","hdc2u1_dd")
-macro    Macros/overlay.C("hdc1v1_dd","hdc2v1_dd")
-macro    Macros/overlay.C("hdc1y2_dd","hdc2y2_dd")
-macro    Macros/overlay.C("hdc1x2_dd","hdc2x2_dd")
+macro    UTIL/GEN/overlay2.C("hdc1x1_dd","hdc2x1_dd")
+macro    UTIL/GEN/overlay2.C("hdc1y1_dd","hdc2y1_dd")
+macro    UTIL/GEN/overlay2.C("hdc1u1_dd","hdc2u1_dd")
+macro    UTIL/GEN/overlay2.C("hdc1v1_dd","hdc2v1_dd")
+macro    UTIL/GEN/overlay2.C("hdc1y2_dd","hdc2y2_dd")
+macro    UTIL/GEN/overlay2.C("hdc1x2_dd","hdc2x2_dd")
 
 
 newpage 2 3
 title HDC1&2 drift time (Red=DC2)
-macro    Macros/overlay.C("hdc1x1_dt","hdc2x1_dt")
-macro    Macros/overlay.C("hdc1y1_dt","hdc2y1_dt")
-macro    Macros/overlay.C("hdc1u1_dt","hdc2u1_dt")
-macro    Macros/overlay.C("hdc1v1_dt","hdc2v1_dt")
-macro    Macros/overlay.C("hdc1y2_dt","hdc2y2_dt")
-macro    Macros/overlay.C("hdc1x2_dt","hdc2x2_dt")
+macro    UTIL/GEN/overlay2.C("hdc1x1_dt","hdc2x1_dt")
+macro    UTIL/GEN/overlay2.C("hdc1y1_dt","hdc2y1_dt")
+macro    UTIL/GEN/overlay2.C("hdc1u1_dt","hdc2u1_dt")
+macro    UTIL/GEN/overlay2.C("hdc1v1_dt","hdc2v1_dt")
+macro    UTIL/GEN/overlay2.C("hdc1y2_dt","hdc2y2_dt")
+macro    UTIL/GEN/overlay2.C("hdc1x2_dt","hdc2x2_dt")
 
 newpage 2 4
 title HMS Hodo Hits
-macro Macros/overlay.C("hpostdc1","hnegtdc1")
-macro Macros/overlay.C("hposadc1","hnegadc1")
-macro Macros/overlay.C("hpostdc2","hnegtdc2")
-macro Macros/overlay.C("hposadc2","hnegadc2")
-macro Macros/overlay.C("hpostdc3","hnegtdc3")
-macro Macros/overlay.C("hposadc3","hnegadc3")
-macro Macros/overlay.C("hpostdc4","hnegtdc4")
-macro Macros/overlay.C("hposadc4","hnegadc4")
+macro UTIL/GEN/overlay2.C("hpostdc1","hnegtdc1")
+macro UTIL/GEN/overlay2.C("hposadc1","hnegadc1")
+macro UTIL/GEN/overlay2.C("hpostdc2","hnegtdc2")
+macro UTIL/GEN/overlay2.C("hposadc2","hnegadc2")
+macro UTIL/GEN/overlay2.C("hpostdc3","hnegtdc3")
+macro UTIL/GEN/overlay2.C("hposadc3","hnegadc3")
+macro UTIL/GEN/overlay2.C("hpostdc4","hnegtdc4")
+macro UTIL/GEN/overlay2.C("hposadc4","hnegadc4")
 
 
 
diff --git a/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg b/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg
index 868887304d00eb75c9c21a87cf75b28da323f809..ee635a7c106d2f08675c66effaf6970f7ccf05d7 100644
--- a/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg
@@ -3,361 +3,361 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title X1 Neg ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1x16")
 newpage 4 4
 title X1 Pos ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1x16")
 newpage 3 4
 title Y1 Neg ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg1y10")
 newpage 3 4
 title Y1 Pos ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos1y10")
 newpage 4 4
 title X2 Neg ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2x16")
 newpage 4 4
 title X2 Pos ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2x16")
 newpage 3 4
 title Y2 Neg ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcneg2y10")
 newpage 3 4
 title Y2 Pos ADc v TDC
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvtdcpos2y10")
 newpage 4 4
 title X1 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg1x1","uhshouldneg1x1")
-macro Macros/hodo_efficiency.C("uhdidneg1x2","uhshouldneg1x2")
-macro Macros/hodo_efficiency.C("uhdidneg1x3","uhshouldneg1x3")
-macro Macros/hodo_efficiency.C("uhdidneg1x4","uhshouldneg1x4")
-macro Macros/hodo_efficiency.C("uhdidneg1x5","uhshouldneg1x5")
-macro Macros/hodo_efficiency.C("uhdidneg1x6","uhshouldneg1x6")
-macro Macros/hodo_efficiency.C("uhdidneg1x7","uhshouldneg1x7")
-macro Macros/hodo_efficiency.C("uhdidneg1x8","uhshouldneg1x8")
-macro Macros/hodo_efficiency.C("uhdidneg1x9","uhshouldneg1x9")
-macro Macros/hodo_efficiency.C("uhdidneg1x10","uhshouldneg1x10")
-macro Macros/hodo_efficiency.C("uhdidneg1x11","uhshouldneg1x11")
-macro Macros/hodo_efficiency.C("uhdidneg1x12","uhshouldneg1x12")
-macro Macros/hodo_efficiency.C("uhdidneg1x13","uhshouldneg1x13")
-macro Macros/hodo_efficiency.C("uhdidneg1x14","uhshouldneg1x14")
-macro Macros/hodo_efficiency.C("uhdidneg1x15","uhshouldneg1x15")
-macro Macros/hodo_efficiency.C("uhdidneg1x16","uhshouldneg1x16")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x1","uhshouldneg1x1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x2","uhshouldneg1x2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x3","uhshouldneg1x3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x4","uhshouldneg1x4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x5","uhshouldneg1x5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x6","uhshouldneg1x6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x7","uhshouldneg1x7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x8","uhshouldneg1x8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x9","uhshouldneg1x9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x10","uhshouldneg1x10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x11","uhshouldneg1x11")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x12","uhshouldneg1x12")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x13","uhshouldneg1x13")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x14","uhshouldneg1x14")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x15","uhshouldneg1x15")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1x16","uhshouldneg1x16")
 newpage 4 4
 title X1 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos1x1","uhshouldpos1x1")
-macro Macros/hodo_efficiency.C("uhdidpos1x2","uhshouldpos1x2")
-macro Macros/hodo_efficiency.C("uhdidpos1x3","uhshouldpos1x3")
-macro Macros/hodo_efficiency.C("uhdidpos1x4","uhshouldpos1x4")
-macro Macros/hodo_efficiency.C("uhdidpos1x5","uhshouldpos1x5")
-macro Macros/hodo_efficiency.C("uhdidpos1x6","uhshouldpos1x6")
-macro Macros/hodo_efficiency.C("uhdidpos1x7","uhshouldpos1x7")
-macro Macros/hodo_efficiency.C("uhdidpos1x8","uhshouldpos1x8")
-macro Macros/hodo_efficiency.C("uhdidpos1x9","uhshouldpos1x9")
-macro Macros/hodo_efficiency.C("uhdidpos1x10","uhshouldpos1x10")
-macro Macros/hodo_efficiency.C("uhdidpos1x11","uhshouldpos1x11")
-macro Macros/hodo_efficiency.C("uhdidpos1x12","uhshouldpos1x12")
-macro Macros/hodo_efficiency.C("uhdidpos1x13","uhshouldpos1x13")
-macro Macros/hodo_efficiency.C("uhdidpos1x14","uhshouldpos1x14")
-macro Macros/hodo_efficiency.C("uhdidpos1x15","uhshouldpos1x15")
-macro Macros/hodo_efficiency.C("uhdidpos1x16","uhshouldpos1x16")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x1","uhshouldpos1x1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x2","uhshouldpos1x2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x3","uhshouldpos1x3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x4","uhshouldpos1x4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x5","uhshouldpos1x5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x6","uhshouldpos1x6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x7","uhshouldpos1x7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x8","uhshouldpos1x8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x9","uhshouldpos1x9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x10","uhshouldpos1x10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x11","uhshouldpos1x11")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x12","uhshouldpos1x12")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x13","uhshouldpos1x13")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x14","uhshouldpos1x14")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x15","uhshouldpos1x15")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1x16","uhshouldpos1x16")
 newpage 3 4
 title Y1 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg1y1","uhshouldneg1y1")
-macro Macros/hodo_efficiency.C("uhdidneg1y2","uhshouldneg1y2")
-macro Macros/hodo_efficiency.C("uhdidneg1y3","uhshouldneg1y3")
-macro Macros/hodo_efficiency.C("uhdidneg1y4","uhshouldneg1y4")
-macro Macros/hodo_efficiency.C("uhdidneg1y5","uhshouldneg1y5")
-macro Macros/hodo_efficiency.C("uhdidneg1y6","uhshouldneg1y6")
-macro Macros/hodo_efficiency.C("uhdidneg1y7","uhshouldneg1y7")
-macro Macros/hodo_efficiency.C("uhdidneg1y8","uhshouldneg1y8")
-macro Macros/hodo_efficiency.C("uhdidneg1y9","uhshouldneg1y9")
-macro Macros/hodo_efficiency.C("uhdidneg1y10","uhshouldneg1y10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y1","uhshouldneg1y1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y2","uhshouldneg1y2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y3","uhshouldneg1y3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y4","uhshouldneg1y4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y5","uhshouldneg1y5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y6","uhshouldneg1y6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y7","uhshouldneg1y7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y8","uhshouldneg1y8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y9","uhshouldneg1y9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg1y10","uhshouldneg1y10")
 newpage 3 4
 title Y1 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos1y1","uhshouldpos1y1")
-macro Macros/hodo_efficiency.C("uhdidpos1y2","uhshouldpos1y2")
-macro Macros/hodo_efficiency.C("uhdidpos1y3","uhshouldpos1y3")
-macro Macros/hodo_efficiency.C("uhdidpos1y4","uhshouldpos1y4")
-macro Macros/hodo_efficiency.C("uhdidpos1y5","uhshouldpos1y5")
-macro Macros/hodo_efficiency.C("uhdidpos1y6","uhshouldpos1y6")
-macro Macros/hodo_efficiency.C("uhdidpos1y7","uhshouldpos1y7")
-macro Macros/hodo_efficiency.C("uhdidpos1y8","uhshouldpos1y8")
-macro Macros/hodo_efficiency.C("uhdidpos1y9","uhshouldpos1y9")
-macro Macros/hodo_efficiency.C("uhdidpos1y10","uhshouldpos1y10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y1","uhshouldpos1y1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y2","uhshouldpos1y2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y3","uhshouldpos1y3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y4","uhshouldpos1y4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y5","uhshouldpos1y5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y6","uhshouldpos1y6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y7","uhshouldpos1y7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y8","uhshouldpos1y8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y9","uhshouldpos1y9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos1y10","uhshouldpos1y10")
 newpage 4 4
 title X2 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg2x1","uhshouldneg2x1")
-macro Macros/hodo_efficiency.C("uhdidneg2x2","uhshouldneg2x2")
-macro Macros/hodo_efficiency.C("uhdidneg2x3","uhshouldneg2x3")
-macro Macros/hodo_efficiency.C("uhdidneg2x4","uhshouldneg2x4")
-macro Macros/hodo_efficiency.C("uhdidneg2x5","uhshouldneg2x5")
-macro Macros/hodo_efficiency.C("uhdidneg2x6","uhshouldneg2x6")
-macro Macros/hodo_efficiency.C("uhdidneg2x7","uhshouldneg2x7")
-macro Macros/hodo_efficiency.C("uhdidneg2x8","uhshouldneg2x8")
-macro Macros/hodo_efficiency.C("uhdidneg2x9","uhshouldneg2x9")
-macro Macros/hodo_efficiency.C("uhdidneg2x10","uhshouldneg2x10")
-macro Macros/hodo_efficiency.C("uhdidneg2x11","uhshouldneg2x11")
-macro Macros/hodo_efficiency.C("uhdidneg2x12","uhshouldneg2x12")
-macro Macros/hodo_efficiency.C("uhdidneg2x13","uhshouldneg2x13")
-macro Macros/hodo_efficiency.C("uhdidneg2x14","uhshouldneg2x14")
-macro Macros/hodo_efficiency.C("uhdidneg2x15","uhshouldneg2x15")
-macro Macros/hodo_efficiency.C("uhdidneg2x16","uhshouldneg2x16")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x1","uhshouldneg2x1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x2","uhshouldneg2x2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x3","uhshouldneg2x3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x4","uhshouldneg2x4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x5","uhshouldneg2x5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x6","uhshouldneg2x6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x7","uhshouldneg2x7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x8","uhshouldneg2x8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x9","uhshouldneg2x9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x10","uhshouldneg2x10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x11","uhshouldneg2x11")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x12","uhshouldneg2x12")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x13","uhshouldneg2x13")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x14","uhshouldneg2x14")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x15","uhshouldneg2x15")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2x16","uhshouldneg2x16")
 newpage 4 4
 title X2 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos2x1","uhshouldpos2x1")
-macro Macros/hodo_efficiency.C("uhdidpos2x2","uhshouldpos2x2")
-macro Macros/hodo_efficiency.C("uhdidpos2x3","uhshouldpos2x3")
-macro Macros/hodo_efficiency.C("uhdidpos2x4","uhshouldpos2x4")
-macro Macros/hodo_efficiency.C("uhdidpos2x5","uhshouldpos2x5")
-macro Macros/hodo_efficiency.C("uhdidpos2x6","uhshouldpos2x6")
-macro Macros/hodo_efficiency.C("uhdidpos2x7","uhshouldpos2x7")
-macro Macros/hodo_efficiency.C("uhdidpos2x8","uhshouldpos2x8")
-macro Macros/hodo_efficiency.C("uhdidpos2x9","uhshouldpos2x9")
-macro Macros/hodo_efficiency.C("uhdidpos2x10","uhshouldpos2x10")
-macro Macros/hodo_efficiency.C("uhdidpos2x11","uhshouldpos2x11")
-macro Macros/hodo_efficiency.C("uhdidpos2x12","uhshouldpos2x12")
-macro Macros/hodo_efficiency.C("uhdidpos2x13","uhshouldpos2x13")
-macro Macros/hodo_efficiency.C("uhdidpos2x14","uhshouldpos2x14")
-macro Macros/hodo_efficiency.C("uhdidpos2x15","uhshouldpos2x15")
-macro Macros/hodo_efficiency.C("uhdidpos2x16","uhshouldpos2x16")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x1","uhshouldpos2x1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x2","uhshouldpos2x2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x3","uhshouldpos2x3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x4","uhshouldpos2x4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x5","uhshouldpos2x5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x6","uhshouldpos2x6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x7","uhshouldpos2x7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x8","uhshouldpos2x8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x9","uhshouldpos2x9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x10","uhshouldpos2x10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x11","uhshouldpos2x11")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x12","uhshouldpos2x12")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x13","uhshouldpos2x13")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x14","uhshouldpos2x14")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x15","uhshouldpos2x15")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2x16","uhshouldpos2x16")
 newpage 3 4
 title Y2 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg2y1","uhshouldneg2y1")
-macro Macros/hodo_efficiency.C("uhdidneg2y2","uhshouldneg2y2")
-macro Macros/hodo_efficiency.C("uhdidneg2y3","uhshouldneg2y3")
-macro Macros/hodo_efficiency.C("uhdidneg2y4","uhshouldneg2y4")
-macro Macros/hodo_efficiency.C("uhdidneg2y5","uhshouldneg2y5")
-macro Macros/hodo_efficiency.C("uhdidneg2y6","uhshouldneg2y6")
-macro Macros/hodo_efficiency.C("uhdidneg2y7","uhshouldneg2y7")
-macro Macros/hodo_efficiency.C("uhdidneg2y8","uhshouldneg2y8")
-macro Macros/hodo_efficiency.C("uhdidneg2y9","uhshouldneg2y9")
-macro Macros/hodo_efficiency.C("uhdidneg2y10","uhshouldneg2y10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y1","uhshouldneg2y1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y2","uhshouldneg2y2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y3","uhshouldneg2y3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y4","uhshouldneg2y4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y5","uhshouldneg2y5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y6","uhshouldneg2y6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y7","uhshouldneg2y7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y8","uhshouldneg2y8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y9","uhshouldneg2y9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidneg2y10","uhshouldneg2y10")
 newpage 3 4
 title Y2 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos2y1","uhshouldpos2y1")
-macro Macros/hodo_efficiency.C("uhdidpos2y2","uhshouldpos2y2")
-macro Macros/hodo_efficiency.C("uhdidpos2y3","uhshouldpos2y3")
-macro Macros/hodo_efficiency.C("uhdidpos2y4","uhshouldpos2y4")
-macro Macros/hodo_efficiency.C("uhdidpos2y5","uhshouldpos2y5")
-macro Macros/hodo_efficiency.C("uhdidpos2y6","uhshouldpos2y6")
-macro Macros/hodo_efficiency.C("uhdidpos2y7","uhshouldpos2y7")
-macro Macros/hodo_efficiency.C("uhdidpos2y8","uhshouldpos2y8")
-macro Macros/hodo_efficiency.C("uhdidpos2y9","uhshouldpos2y9")
-macro Macros/hodo_efficiency.C("uhdidpos2y10","uhshouldpos2y10")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y1","uhshouldpos2y1")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y2","uhshouldpos2y2")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y3","uhshouldpos2y3")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y4","uhshouldpos2y4")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y5","uhshouldpos2y5")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y6","uhshouldpos2y6")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y7","uhshouldpos2y7")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y8","uhshouldpos2y8")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y9","uhshouldpos2y9")
+macro UTIL/GEN/hodo_efficiency.C("uhdidpos2y10","uhshouldpos2y10")
 newpage 4 4
 title X1 ADC int Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1x16")
 newpage 3 4
 title Y1  ADC int Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc1y10")
 newpage 4 4
 title X2  ADC int Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2x16")
 newpage 3 4
 title Y2  ADC int Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcintgtdc2y10")
 newpage 4 4
 title X1 TDC Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1x16")
 newpage 3 4
 title Y1 TDC Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc1y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc1y10")
 newpage 4 4
 title X2 TDC Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2x16")
 newpage 3 4
 title Y2 TDC Pos vs Neg
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dtdc2y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dtdc2y10")
diff --git a/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg b/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg
index 1958e0010d670c9503de42be7d0e97f1ac886dc6..871c4a25d7beb5c977db7998ab71eea89f65e218 100644
--- a/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg
@@ -3,121 +3,121 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title X1+ ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1x16")
 newpage 4 4
 title X1- ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1x16")
 newpage 3 4
 title Y1+ ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos1y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos1y10")
 newpage 3 4
 title Y1- ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg1y10")
 newpage 4 4
 title X2+ ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2x16")
 newpage 4 4
 title X2- ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x10")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x11")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x12")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x13")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x14")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x15")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x16")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x11")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x12")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x13")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x14")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x15")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2x16")
 newpage 3 4
 title Y2+ ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdispos2y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdispos2y10")
 newpage 3 4
 title Y2- ADC vs Dis
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y1")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y2")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y3")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y4")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y5")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y6")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y7")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y8")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y9")
-macro Macros/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y10")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y1")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y2")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y3")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y4")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y5")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y6")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y7")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y8")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y9")
+macro UTIL/HMS/HODO/gooddraw_2d_hhodo.C("uh2dadcvdisneg2y10")
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg
index 05cbd32cfed8593a2b82eea9edf43dd01e089f81..aca129d66f7b709ab73697d45147b80c00692844 100644
--- a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg
@@ -3,325 +3,325 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title HMS X1+ Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1x1posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x2posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x3posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x4posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x5posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x6posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x7posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x8posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x9posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x10posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x11posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x12posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x13posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x14posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x15posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x16posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x1posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x2posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x3posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x4posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x5posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x6posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x7posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x8posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x9posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x10posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x11posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x12posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x13posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x14posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x15posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x16posTimeRaw")
 newpage 4 4
 title HMS X1- Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1x1negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x2negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x3negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x4negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x5negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x6negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x7negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x8negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x9negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x10negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x11negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x12negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x13negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x14negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x15negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1x16negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x1negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x2negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x3negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x4negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x5negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x6negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x7negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x8negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x9negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x10negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x11negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x12negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x13negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x14negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x15negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x16negTimeRaw")
 newpage 4 4
 title HMS X1+ TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1x1posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x2posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x3posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x4posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x5posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x6posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x7posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x8posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x9posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x10posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x11posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x12posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x13posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x14posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x15posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x16posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x1posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x2posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x3posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x4posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x5posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x6posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x7posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x8posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x9posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x10posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x11posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x12posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x13posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x14posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x15posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x16posTime")
 newpage 4 4
 title HMS X1- TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1x1negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x2negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x3negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x4negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x5negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x6negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x7negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x8negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x9negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x10negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x11negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x12negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x13negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x14negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x15negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1x16negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x1negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x2negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x3negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x4negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x5negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x6negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x7negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x8negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x9negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x10negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x11negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x12negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x13negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x14negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x15negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1x16negTime")
 newpage 4 4
 title HMS X1+ FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1x1posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16posPedRaw")
 newpage 4 4
 title HMS X1- FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1x1negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16negPedRaw")
 newpage 4 4
 title HMS X1+ FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1x1posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x2posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x3posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x4posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x5posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x6posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x7posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x8posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x9posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x10posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x11posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x12posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x13posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x14posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x15posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x16posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16posPed")
 newpage 4 4
 title HMS X1- FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1x1negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x2negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x3negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x4negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x5negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x6negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x7negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x8negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x9negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x10negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x11negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x12negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x13negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x14negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x15negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1x16negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16negPed")
 newpage 4 4
 title HMS X1+ FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1x1posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16posPulseIntRaw")
 newpage 4 4
 title HMS X1- FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1x1negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16negPulseIntRaw")
 newpage 4 4
 title HMS X1+ FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1x1posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x2posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x3posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x4posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x5posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x6posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x7posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x8posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x9posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x10posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x11posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x12posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x13posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x14posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x15posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x16posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16posPulseInt")
 newpage 4 4
 title HMS X1- FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1x1negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x2negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x3negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x4negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x5negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x6negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x7negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x8negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x9negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x10negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x11negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x12negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x13negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x14negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x15negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1x16negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16negPulseInt")
 newpage 4 4
 title HMS X1+ FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc1x1posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16posPulseAmpRaw")
 newpage 4 4
 title HMS X1- FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc1x1negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16negPulseAmpRaw")
 newpage 4 4
 title HMS X1+ FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc1x1posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x2posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x3posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x4posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x5posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x6posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x7posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x8posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x9posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x10posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x11posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x12posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x13posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x14posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x15posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x16posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16posPulseAmp")
 newpage 4 4
 title HMS X1- FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc1x1negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x2negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x3negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x4negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x5negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x6negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x7negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x8negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x9negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x10negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x11negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x12negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x13negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x14negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x15negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1x16negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16negPulseAmp")
 newpage 4 4
 title HMS X1+ FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc1x1posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16posPulseTimeRaw")
 newpage 4 4
 title HMS X1- FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc1x1negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x2negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x3negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x4negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x5negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x6negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x7negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x8negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x9negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x10negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x11negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x12negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x13negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x14negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x15negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1x16negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x1negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x2negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x3negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x4negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x5negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x6negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x7negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x8negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x9negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x10negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x11negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x12negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x13negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x14negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x15negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1x16negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg
index 80fc9beac961fd28614a2ce4b8eeb2604f381d69..06383919303b45caac09f7eada7e0c4d1b0db228 100644
--- a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg
@@ -3,217 +3,217 @@ guicolor orange
 canvassize 1600 800
 newpage 3 4
 title HMS Y1+ Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1y1posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y2posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y3posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y4posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y5posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y6posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y7posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y8posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y9posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y10posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y1posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y2posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y3posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y4posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y5posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y6posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y7posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y8posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y9posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y10posTimeRaw")
 newpage 3 4
 title HMS Y1- Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1y1negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y2negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y3negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y4negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y5negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y6negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y7negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y8negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y9negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc1y10negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y1negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y2negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y3negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y4negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y5negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y6negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y7negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y8negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y9negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y10negTimeRaw")
 newpage 3 4
 title HMS Y1+ TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1y1posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y2posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y3posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y4posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y5posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y6posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y7posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y8posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y9posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y10posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y1posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y2posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y3posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y4posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y5posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y6posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y7posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y8posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y9posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y10posTime")
 newpage 3 4
 title HMS Y1- TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc1y1negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y2negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y3negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y4negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y5negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y6negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y7negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y8negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y9negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc1y10negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y1negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y2negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y3negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y4negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y5negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y6negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y7negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y8negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y9negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc1y10negTime")
 newpage 3 4
 title HMS Y1+ FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1y1posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10posPedRaw")
 newpage 3 4
 title HMS Y1- FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1y1negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10negPedRaw")
 newpage 3 4
 title HMS Y1+ FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1y1posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y2posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y3posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y4posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y5posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y6posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y7posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y8posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y9posPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y10posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10posPed")
 newpage 3 4
 title HMS Y1- FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc1y1negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y2negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y3negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y4negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y5negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y6negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y7negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y8negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y9negPed")
-macro Macros/rawdraw_hhodo.C("uhadc1y10negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10negPed")
 newpage 3 4
 title HMS Y1+ FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1y1posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10posPulseIntRaw")
 newpage 3 4
 title HMS Y1- FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1y1negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10negPulseIntRaw")
 newpage 3 4
 title HMS Y1+ FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1y1posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y2posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y3posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y4posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y5posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y6posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y7posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y8posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y9posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y10posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10posPulseInt")
 newpage 3 4
 title HMS Y1- FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc1y1negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y2negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y3negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y4negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y5negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y6negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y7negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y8negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y9negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc1y10negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10negPulseInt")
 newpage 3 4
 title HMS Y1+ FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc1y1posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10posPulseAmpRaw")
 newpage 3 4
 title HMS Y1- FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc1y1negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10negPulseAmpRaw")
 newpage 3 4
 title HMS Y1+ FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc1y1posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y2posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y3posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y4posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y5posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y6posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y7posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y8posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y9posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y10posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10posPulseAmp")
 newpage 3 4
 title HMS Y1- FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc1y1negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y2negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y3negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y4negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y5negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y6negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y7negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y8negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y9negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc1y10negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10negPulseAmp")
 newpage 3 4
 title HMS Y1+ FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc1y1posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10posPulseTimeRaw")
 newpage 3 4
 title HMS Y1- FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc1y1negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y2negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y3negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y4negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y5negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y6negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y7negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y8negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y9negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc1y10negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y1negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y2negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y3negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y4negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y5negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y6negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y7negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y8negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y9negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc1y10negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg
index 5b2a0bb6afd1314ec0f7e1575b3ad919cf99b879..34bd5bb175a97e863db9c59b88273821fc238292 100644
--- a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg
@@ -4,301 +4,301 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title X1 ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x10")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x11")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x12")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x13")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x14")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x15")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1x16")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x11")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x12")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x13")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x14")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x15")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1x16")
 newpage 3 4
 title Y1  ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak1y10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak1y10")
 newpage 4 4
 title X2  ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x10")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x11")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x12")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x13")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x14")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x15")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2x16")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x11")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x12")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x13")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x14")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x15")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2x16")
 newpage 3 4
 title Y2  ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcpeak2y10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcpeak2y10")
 newpage 4 4
 title X1 ADC int Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x10")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x11")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x12")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x13")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x14")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x15")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1x16")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x11")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x12")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x13")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x14")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x15")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1x16")
 newpage 3 4
 title Y1  ADC int Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint1y10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint1y10")
 newpage 4 4
 title X2  ADC int Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x10")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x11")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x12")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x13")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x14")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x15")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2x16")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x11")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x12")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x13")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x14")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x15")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2x16")
 newpage 3 4
 title Y2  ADC int Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dadcint2y10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dadcint2y10")
 newpage 4 4
 title X1 TDC Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x10")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x11")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x12")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x13")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x14")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x15")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1x16")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x11")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x12")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x13")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x14")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x15")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1x16")
 newpage 3 4
 title Y1 TDC Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc1y10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc1y10")
 newpage 4 4
 title X2 TDC Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x10")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x11")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x12")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x13")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x14")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x15")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2x16")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x11")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x12")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x13")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x14")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x15")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2x16")
 newpage 3 4
 title Y2 TDC Pos vs Neg
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y1")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y2")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y3")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y4")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y5")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y6")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y7")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y8")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y9")
-macro Macros/rawdraw_2d_hhodo.C("uh2dtdc2y10")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y1")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y2")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y3")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y4")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y5")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y6")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y7")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y8")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y9")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2dtdc2y10")
 newpage 4 4
 title X1- ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x1neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x2neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x3neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x4neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x5neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x6neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x7neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x8neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x9neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x10neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x11neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x12neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x13neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x14neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x15neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x16neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x1neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x2neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x3neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x4neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x5neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x6neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x7neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x8neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x9neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x10neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x11neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x12neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x13neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x14neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x15neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x16neg")
 newpage 4 4
 title X1+  ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x1pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x2pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x3pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x4pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x5pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x6pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x7pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x8pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x9pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x10pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x11pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x12pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x13pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x14pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x15pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1x16pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x1pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x2pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x3pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x4pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x5pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x6pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x7pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x8pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x9pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x10pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x11pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x12pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x13pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x14pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x15pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1x16pos")
 newpage 3 4
 title Y1- ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y1neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y2neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y3neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y4neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y5neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y6neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y7neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y8neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y9neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y10neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y1neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y2neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y3neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y4neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y5neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y6neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y7neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y8neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y9neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y10neg")
 newpage 3 4
 title Y1+  ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y1pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y2pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y3pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y4pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y5pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y6pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y7pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y8pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y9pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d1y10pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y1pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y2pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y3pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y4pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y5pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y6pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y7pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y8pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y9pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d1y10pos")
 newpage 4 4
 title X2- ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x1neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x2neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x3neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x4neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x5neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x6neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x7neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x8neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x9neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x10neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x11neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x12neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x13neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x14neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x15neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x16neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x1neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x2neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x3neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x4neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x5neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x6neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x7neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x8neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x9neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x10neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x11neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x12neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x13neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x14neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x15neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x16neg")
 newpage 4 4
 title X2+  ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x1pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x2pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x3pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x4pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x5pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x6pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x7pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x8pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x9pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x10pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x11pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x12pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x13pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x14pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x15pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2x16pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x1pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x2pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x3pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x4pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x5pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x6pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x7pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x8pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x9pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x10pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x11pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x12pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x13pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x14pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x15pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2x16pos")
 newpage 3 4
 title Y2- ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y1neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y2neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y3neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y4neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y5neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y6neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y7neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y8neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y9neg")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y10neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y1neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y2neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y3neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y4neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y5neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y6neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y7neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y8neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y9neg")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y10neg")
 newpage 3 4
 title Y2+  ADC (pC) vs TDC
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y1pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y2pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y3pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y4pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y5pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y6pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y7pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y8pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y9pos")
-macro Macros/rawdraw_2d_hhodo.C("uh2d2y10pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y1pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y2pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y3pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y4pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y5pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y6pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y7pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y8pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y9pos")
+macro UTIL/HMS/HODO/rawdraw_2d_hhodo.C("uh2d2y10pos")
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg
index 05f67bb65173f4fa418f23f7430274414746d07a..5cd695ca97c716d39aeb943d8aad46a942a8b048 100644
--- a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg
@@ -3,325 +3,325 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title HMS X2+ Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2x1posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x2posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x3posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x4posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x5posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x6posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x7posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x8posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x9posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x10posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x11posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x12posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x13posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x14posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x15posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x16posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x1posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x2posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x3posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x4posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x5posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x6posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x7posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x8posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x9posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x10posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x11posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x12posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x13posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x14posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x15posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x16posTimeRaw")
 newpage 4 4
 title HMS X2- Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2x1negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x2negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x3negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x4negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x5negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x6negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x7negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x8negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x9negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x10negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x11negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x12negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x13negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x14negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x15negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2x16negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x1negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x2negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x3negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x4negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x5negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x6negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x7negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x8negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x9negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x10negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x11negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x12negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x13negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x14negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x15negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x16negTimeRaw")
 newpage 4 4
 title HMS X2+ TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2x1posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x2posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x3posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x4posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x5posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x6posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x7posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x8posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x9posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x10posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x11posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x12posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x13posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x14posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x15posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x16posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x1posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x2posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x3posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x4posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x5posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x6posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x7posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x8posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x9posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x10posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x11posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x12posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x13posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x14posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x15posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x16posTime")
 newpage 4 4
 title HMS X2- TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2x1negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x2negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x3negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x4negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x5negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x6negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x7negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x8negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x9negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x10negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x11negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x12negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x13negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x14negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x15negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2x16negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x1negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x2negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x3negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x4negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x5negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x6negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x7negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x8negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x9negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x10negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x11negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x12negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x13negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x14negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x15negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2x16negTime")
 newpage 4 4
 title HMS X2+ FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2x1posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16posPedRaw")
 newpage 4 4
 title HMS X2- FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2x1negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16negPedRaw")
 newpage 4 4
 title HMS X2+ FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2x1posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x2posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x3posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x4posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x5posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x6posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x7posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x8posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x9posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x10posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x11posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x12posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x13posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x14posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x15posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x16posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16posPed")
 newpage 4 4
 title HMS X2- FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2x1negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x2negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x3negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x4negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x5negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x6negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x7negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x8negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x9negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x10negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x11negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x12negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x13negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x14negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x15negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2x16negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16negPed")
 newpage 4 4
 title HMS X2+ FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2x1posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16posPulseIntRaw")
 newpage 4 4
 title HMS X2- FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2x1negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16negPulseIntRaw")
 newpage 4 4
 title HMS X2+ FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2x1posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x2posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x3posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x4posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x5posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x6posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x7posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x8posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x9posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x10posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x11posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x12posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x13posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x14posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x15posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x16posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16posPulseInt")
 newpage 4 4
 title HMS X2- FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2x1negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x2negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x3negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x4negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x5negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x6negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x7negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x8negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x9negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x10negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x11negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x12negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x13negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x14negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x15negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2x16negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16negPulseInt")
 newpage 4 4
 title HMS X2+ FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc2x1posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16posPulseAmpRaw")
 newpage 4 4
 title HMS X2- FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc2x1negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16negPulseAmpRaw")
 newpage 4 4
 title HMS X2+ FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc2x1posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x2posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x3posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x4posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x5posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x6posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x7posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x8posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x9posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x10posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x11posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x12posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x13posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x14posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x15posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x16posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16posPulseAmp")
 newpage 4 4
 title HMS X2- FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc2x1negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x2negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x3negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x4negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x5negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x6negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x7negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x8negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x9negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x10negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x11negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x12negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x13negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x14negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x15negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2x16negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16negPulseAmp")
 newpage 4 4
 title HMS X2+ FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc2x1posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16posPulseTimeRaw")
 newpage 4 4
 title HMS X2- FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc2x1negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x2negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x3negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x4negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x5negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x6negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x7negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x8negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x9negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x10negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x11negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x12negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x13negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x14negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x15negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2x16negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x1negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x2negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x3negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x4negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x5negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x6negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x7negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x8negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x9negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x10negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x11negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x12negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x13negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x14negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x15negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2x16negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg
index 2d4bc1f14b7aebb28bc41712daa0c8ab2d4c8ec0..4ce2145a2ff97d094544c783028290d5f210c221 100644
--- a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg
@@ -3,217 +3,217 @@ guicolor orange
 canvassize 1600 800
 newpage 3 4
 title HMS Y2+ Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2y1posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y2posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y3posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y4posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y5posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y6posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y7posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y8posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y9posTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y10posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y1posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y2posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y3posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y4posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y5posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y6posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y7posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y8posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y9posTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y10posTimeRaw")
 newpage 3 4
 title HMS Y2- Raw TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2y1negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y2negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y3negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y4negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y5negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y6negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y7negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y8negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y9negTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhtdc2y10negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y1negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y2negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y3negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y4negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y5negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y6negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y7negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y8negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y9negTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y10negTimeRaw")
 newpage 3 4
 title HMS Y2+ TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2y1posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y2posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y3posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y4posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y5posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y6posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y7posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y8posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y9posTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y10posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y1posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y2posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y3posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y4posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y5posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y6posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y7posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y8posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y9posTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y10posTime")
 newpage 3 4
 title HMS Y2- TDCs
-macro Macros/rawdraw_hhodo.C("uhtdc2y1negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y2negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y3negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y4negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y5negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y6negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y7negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y8negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y9negTime")
-macro Macros/rawdraw_hhodo.C("uhtdc2y10negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y1negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y2negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y3negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y4negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y5negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y6negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y7negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y8negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y9negTime")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhtdc2y10negTime")
 newpage 3 4
 title HMS Y2+ FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2y1posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9posPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9posPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10posPedRaw")
 newpage 3 4
 title HMS Y2- FADC Raw Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2y1negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9negPedRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9negPedRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10negPedRaw")
 newpage 3 4
 title HMS Y2+ FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2y1posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y2posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y3posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y4posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y5posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y6posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y7posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y8posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y9posPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y10posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9posPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10posPed")
 newpage 3 4
 title HMS Y2- FADC Pedestals
-macro Macros/rawdraw_hhodo.C("uhadc2y1negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y2negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y3negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y4negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y5negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y6negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y7negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y8negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y9negPed")
-macro Macros/rawdraw_hhodo.C("uhadc2y10negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9negPed")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10negPed")
 newpage 3 4
 title HMS Y2+ FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2y1posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9posPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9posPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10posPulseIntRaw")
 newpage 3 4
 title HMS Y2- FADC Raw Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2y1negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9negPulseIntRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9negPulseIntRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10negPulseIntRaw")
 newpage 3 4
 title HMS Y2+ FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2y1posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y2posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y3posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y4posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y5posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y6posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y7posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y8posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y9posPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y10posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9posPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10posPulseInt")
 newpage 3 4
 title HMS Y2- FADC Integrals
-macro Macros/rawdraw_hhodo.C("uhadc2y1negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y2negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y3negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y4negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y5negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y6negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y7negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y8negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y9negPulseInt")
-macro Macros/rawdraw_hhodo.C("uhadc2y10negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9negPulseInt")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10negPulseInt")
 newpage 3 4
 title HMS Y2+ FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc2y1posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9posPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9posPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10posPulseAmpRaw")
 newpage 3 4
 title HMS Y2- FADC Amplitudes Raw
-macro Macros/rawdraw_hhodo.C("uhadc2y1negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9negPulseAmpRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9negPulseAmpRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10negPulseAmpRaw")
 newpage 3 4
 title HMS Y2+ FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc2y1posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y2posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y3posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y4posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y5posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y6posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y7posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y8posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y9posPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y10posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9posPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10posPulseAmp")
 newpage 3 4
 title HMS Y2- FADC Amplitudes
-macro Macros/rawdraw_hhodo.C("uhadc2y1negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y2negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y3negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y4negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y5negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y6negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y7negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y8negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y9negPulseAmp")
-macro Macros/rawdraw_hhodo.C("uhadc2y10negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9negPulseAmp")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10negPulseAmp")
 newpage 3 4
 title HMS Y2+ FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc2y1posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9posPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9posPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10posPulseTimeRaw")
 newpage 3 4
 title HMS Y2- FADC Times Raw
-macro Macros/rawdraw_hhodo.C("uhadc2y1negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y2negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y3negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y4negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y5negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y6negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y7negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y8negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y9negPulseTimeRaw")
-macro Macros/rawdraw_hhodo.C("uhadc2y10negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y1negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y2negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y3negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y4negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y5negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y6negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y7negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y8negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y9negPulseTimeRaw")
+macro UTIL/HMS/HODO/rawdraw_hhodo.C("uhadc2y10negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg
index 69e68c783bdbf1c796daba32e148acdb2b9b0473..590e8e7cfefc5c657f849183c87417596cce461c 100644
--- a/onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg
+++ b/onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg
@@ -10,16 +10,16 @@ hhodo_2x_multi
 hhodo_2y_multi
 newpage 2 2
 title HMS Hodo Raw ADC Occupancy
-macro Macros/overlay.C("hhodo_1x_pos_adc_occu","hhodo_1x_neg_adc_occu")
-macro Macros/overlay.C("hhodo_1y_pos_adc_occu","hhodo_1y_neg_adc_occu")
-macro Macros/overlay.C("hhodo_2x_pos_adc_occu","hhodo_2x_neg_adc_occu")
-macro Macros/overlay.C("hhodo_2y_pos_adc_occu","hhodo_2y_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_1x_pos_adc_occu","hhodo_1x_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_1y_pos_adc_occu","hhodo_1y_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_2x_pos_adc_occu","hhodo_2x_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_2y_pos_adc_occu","hhodo_2y_neg_adc_occu")
 newpage 2 2
 title HMS Hodo Raw TDC Occupancy
-macro Macros/overlay.C("hhodo_1x_pos_tdc_occu","hhodo_1x_neg_tdc_occu")
-macro Macros/overlay.C("hhodo_1y_pos_tdc_occu","hhodo_1y_neg_tdc_occu")
-macro Macros/overlay.C("hhodo_2x_pos_tdc_occu","hhodo_2x_neg_tdc_occu")
-macro Macros/overlay.C("hhodo_2y_pos_tdc_occu","hhodo_2y_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_1x_pos_tdc_occu","hhodo_1x_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_1y_pos_tdc_occu","hhodo_1y_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_2x_pos_tdc_occu","hhodo_2x_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("hhodo_2y_pos_tdc_occu","hhodo_2y_neg_tdc_occu")
 newpage 2 2
 title HMS Hodo Raw Ped PMT+
 hhodo_1x_pos_rawped_vs_pad -type colz
diff --git a/onlineGUI/CONFIG/HMS/SCALERS/hms_scaler.cfg b/onlineGUI/CONFIG/HMS/SCALERS/hms_scaler.cfg
index d1bee7c88f7390aa4e43d5c00f5f2bb02ec48682..9e2defce68491bc71a0b38fad0b1302a5cfe09d0 100644
--- a/onlineGUI/CONFIG/HMS/SCALERS/hms_scaler.cfg
+++ b/onlineGUI/CONFIG/HMS/SCALERS/hms_scaler.cfg
@@ -3,87 +3,87 @@ guicolor orange
 canvassize 1600 800
 newpage 2 3
 title Trig rates
-macro Macros/plot_hms_scalers.C("uhScalTrigS1X","none")
-macro Macros/plot_hms_scalers.C("uhScalTrigS1Y","none")
-macro Macros/plot_hms_scalers.C("uhScalTrigS2X","none")
-macro Macros/plot_hms_scalers.C("uhScalTrigS2Y","none")
-macro Macros/plot_hms_scalers.C("uhScalTrigS1XS1Y","none")
-macro Macros/plot_hms_scalers.C("uhScalTrigTrig","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalTrigS1X","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalTrigS1Y","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalTrigS2X","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalTrigS2Y","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalTrigS1XS1Y","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalTrigTrig","none")
 newpage 2 2
 title Hod ave rates
-macro Macros/plot_hms_scalers.C("uhScalHodNeg1x","uhScalHodPos1x")
-macro Macros/plot_hms_scalers.C("uhScalHodNeg1y","uhScalHodPos1y")
-macro Macros/plot_hms_scalers.C("uhScalHodNeg2x","uhScalHodPos2x")
-macro Macros/plot_hms_scalers.C("uhScalHodNeg2y","uhScalHodPos2y")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalHodNeg1x","uhScalHodPos1x")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalHodNeg1y","uhScalHodPos1y")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalHodNeg2x","uhScalHodPos2x")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalHodNeg2y","uhScalHodPos2y")
 newpage 2 2
 title BCM rates
-macro Macros/plot_hms_scalers.C("uhScalBCM1","none")
-macro Macros/plot_hms_scalers.C("uhScalBCM2","none")
-macro Macros/plot_hms_scalers.C("uhScalBCM1","uhScalBCM2")
-macro Macros/plot_hms_scalers.C("uhScalUnser","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalBCM1","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalBCM2","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalBCM1","uhScalBCM2")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalUnser","none")
 newpage 2 2
 title BCM current
-macro Macros/plot_hms_scalers.C("uhCurBCM1","none")
-macro Macros/plot_hms_scalers.C("uhCurBCM2","none")
-macro Macros/plot_hms_scalers.C("uhCurBCM1","uhCurBCM2")
-macro Macros/plot_hms_scalers.C("uhCurUnser","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhCurBCM1","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhCurBCM2","none")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhCurBCM1","uhCurBCM2")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhCurUnser","none")
 newpage 4 4
 title X1 Scalers
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad01","uhScalEvHodPos1xPad01")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad02","uhScalEvHodPos1xPad02")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad03","uhScalEvHodPos1xPad03")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad04","uhScalEvHodPos1xPad04")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad05","uhScalEvHodPos1xPad05")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad06","uhScalEvHodPos1xPad06")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad07","uhScalEvHodPos1xPad07")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad08","uhScalEvHodPos1xPad08")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad09","uhScalEvHodPos1xPad09")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad10","uhScalEvHodPos1xPad10")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad11","uhScalEvHodPos1xPad11")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad12","uhScalEvHodPos1xPad12")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad13","uhScalEvHodPos1xPad13")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad14","uhScalEvHodPos1xPad14")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad15","uhScalEvHodPos1xPad15")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1xPad16","uhScalEvHodPos1xPad16")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad01","uhScalEvHodPos1xPad01")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad02","uhScalEvHodPos1xPad02")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad03","uhScalEvHodPos1xPad03")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad04","uhScalEvHodPos1xPad04")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad05","uhScalEvHodPos1xPad05")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad06","uhScalEvHodPos1xPad06")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad07","uhScalEvHodPos1xPad07")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad08","uhScalEvHodPos1xPad08")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad09","uhScalEvHodPos1xPad09")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad10","uhScalEvHodPos1xPad10")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad11","uhScalEvHodPos1xPad11")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad12","uhScalEvHodPos1xPad12")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad13","uhScalEvHodPos1xPad13")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad14","uhScalEvHodPos1xPad14")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad15","uhScalEvHodPos1xPad15")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1xPad16","uhScalEvHodPos1xPad16")
 newpage 3 4
 title Y1 Scalers
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad01","uhScalEvHodPos1yPad01")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad02","uhScalEvHodPos1yPad02")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad03","uhScalEvHodPos1yPad03")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad04","uhScalEvHodPos1yPad04")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad05","uhScalEvHodPos1yPad05")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad06","uhScalEvHodPos1yPad06")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad07","uhScalEvHodPos1yPad07")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad08","uhScalEvHodPos1yPad08")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad09","uhScalEvHodPos1yPad09")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg1yPad10","uhScalEvHodPos1yPad10")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad01","uhScalEvHodPos1yPad01")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad02","uhScalEvHodPos1yPad02")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad03","uhScalEvHodPos1yPad03")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad04","uhScalEvHodPos1yPad04")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad05","uhScalEvHodPos1yPad05")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad06","uhScalEvHodPos1yPad06")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad07","uhScalEvHodPos1yPad07")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad08","uhScalEvHodPos1yPad08")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad09","uhScalEvHodPos1yPad09")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg1yPad10","uhScalEvHodPos1yPad10")
 newpage 4 4
 title X2 Scalers
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad01","uhScalEvHodPos2xPad01")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad02","uhScalEvHodPos2xPad02")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad03","uhScalEvHodPos2xPad03")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad04","uhScalEvHodPos2xPad04")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad05","uhScalEvHodPos2xPad05")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad06","uhScalEvHodPos2xPad06")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad07","uhScalEvHodPos2xPad07")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad08","uhScalEvHodPos2xPad08")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad09","uhScalEvHodPos2xPad09")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad10","uhScalEvHodPos2xPad10")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad11","uhScalEvHodPos2xPad11")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad12","uhScalEvHodPos2xPad12")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad13","uhScalEvHodPos2xPad13")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad14","uhScalEvHodPos2xPad14")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad15","uhScalEvHodPos2xPad15")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2xPad16","uhScalEvHodPos2xPad16")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad01","uhScalEvHodPos2xPad01")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad02","uhScalEvHodPos2xPad02")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad03","uhScalEvHodPos2xPad03")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad04","uhScalEvHodPos2xPad04")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad05","uhScalEvHodPos2xPad05")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad06","uhScalEvHodPos2xPad06")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad07","uhScalEvHodPos2xPad07")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad08","uhScalEvHodPos2xPad08")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad09","uhScalEvHodPos2xPad09")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad10","uhScalEvHodPos2xPad10")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad11","uhScalEvHodPos2xPad11")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad12","uhScalEvHodPos2xPad12")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad13","uhScalEvHodPos2xPad13")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad14","uhScalEvHodPos2xPad14")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad15","uhScalEvHodPos2xPad15")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2xPad16","uhScalEvHodPos2xPad16")
 newpage 3 4
 title Y2 Scalers
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad01","uhScalEvHodPos2yPad01")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad02","uhScalEvHodPos2yPad02")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad03","uhScalEvHodPos2yPad03")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad04","uhScalEvHodPos2yPad04")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad05","uhScalEvHodPos2yPad05")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad06","uhScalEvHodPos2yPad06")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad07","uhScalEvHodPos2yPad07")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad08","uhScalEvHodPos2yPad08")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad09","uhScalEvHodPos2yPad09")
-macro Macros/plot_hms_scalers.C("uhScalEvHodNeg2yPad10","uhScalEvHodPos2yPad10")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad01","uhScalEvHodPos2yPad01")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad02","uhScalEvHodPos2yPad02")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad03","uhScalEvHodPos2yPad03")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad04","uhScalEvHodPos2yPad04")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad05","uhScalEvHodPos2yPad05")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad06","uhScalEvHodPos2yPad06")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad07","uhScalEvHodPos2yPad07")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad08","uhScalEvHodPos2yPad08")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad09","uhScalEvHodPos2yPad09")
+macro UTIL/HMS/SCALERS/plot_hms_scalers.C("uhScalEvHodNeg2yPad10","uhScalEvHodPos2yPad10")
diff --git a/onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg b/onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg
index 0473d30897df3be43e7c854ba655d33ae0fb1212..8ddb4075e4a5bc84fbd135a374e7ab8b99ba4dbe 100644
--- a/onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg
+++ b/onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg
@@ -1,16 +1,16 @@
 protorootfile ../ROOTfiles/shms_replay_production_XXXXX_400000.root
-guicolor lightblue
+guicolor orange 
 canvassize 1600 800
 #canvassize 800 800
 newpage 1 1
 title NG Sum 2d xy
-macro Macros/cer_2d_ratio.C("hng_xy_sumphe")
+macro UTIL/SHMS/CER/cer_2d_ratio.C("hng_xy_sumphe")
 newpage 1 1
 title HG Sum 2d xy
-macro Macros/cer_2d_ratio.C("hhg_xy_sumphe")
+macro UTIL/SHMS/CER/cer_2d_ratio.C("hhg_xy_sumphe")
 newpage 1 1
 title NG Sum 2d xy
-macro Macros/cer_2d_ratio.C("hng_xy_elec_eff")
+macro UTIL/SHMS/CER/cer_2d_ratio.C("hng_xy_elec_eff")
 newpage 1 1
 title HG Sum 2d xy
-macro Macros/cer_2d_ratio.C("hhg_xy_elec_eff")
+macro UTIL/SHMS/CER/cer_2d_ratio.C("hhg_xy_elec_eff")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg b/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg
index 201945ef8f142e062125e4a033f23f0d61d93a62..71549354a41e3489842e543292c9faa7d37ee8a9 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg
@@ -4,364 +4,364 @@ guicolor orange
 canvassize 1600 800
 newpage 1 1
 title Beta notrack
-macro Macros/gooddraw_2d_phodo.C("hbeta")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("hbeta")
 newpage 2 2
 title fptime
-macro Macros/gooddraw_2d_phodo.C("fptime1x")
-macro Macros/gooddraw_2d_phodo.C("fptime1y")
-macro Macros/gooddraw_2d_phodo.C("fptime2x")
-macro Macros/gooddraw_2d_phodo.C("fptime2y")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime1x")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime1y")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime2x")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime2y")
 newpage 2 2
 title fptime
-macro Macros/gooddraw_2d_phodo.C("fptime1x_pad")
-macro Macros/gooddraw_2d_phodo.C("fptime1y_pad")
-macro Macros/gooddraw_2d_phodo.C("fptime2x_pad")
-macro Macros/gooddraw_2d_phodo.C("fptime2y_pad")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime1x_pad")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime1y_pad")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime2x_pad")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("fptime2y_pad")
 newpage 4 4
 title X1 Neg ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1x13")
 newpage 4 4
 title X1 Pos ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1x13")
 newpage 4 4
 title Y1 Neg ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg1y13")
 newpage 4 4
 title Y1 Pos ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos1y13")
 newpage 4 4
 title X2 Neg ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2x14")
 newpage 4 4
 title X2 Pos ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2x14")
 newpage 3 4
 title Y2 Neg ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcneg2y16")
 newpage 3 4
 title Y2 Pos ADc v TDC
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvtdcpos2y16")
 newpage 4 4
 title X1 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg1x1","uhshouldneg1x1")
-macro Macros/hodo_efficiency.C("uhdidneg1x2","uhshouldneg1x2")
-macro Macros/hodo_efficiency.C("uhdidneg1x3","uhshouldneg1x3")
-macro Macros/hodo_efficiency.C("uhdidneg1x4","uhshouldneg1x4")
-macro Macros/hodo_efficiency.C("uhdidneg1x5","uhshouldneg1x5")
-macro Macros/hodo_efficiency.C("uhdidneg1x6","uhshouldneg1x6")
-macro Macros/hodo_efficiency.C("uhdidneg1x7","uhshouldneg1x7")
-macro Macros/hodo_efficiency.C("uhdidneg1x8","uhshouldneg1x8")
-macro Macros/hodo_efficiency.C("uhdidneg1x9","uhshouldneg1x9")
-macro Macros/hodo_efficiency.C("uhdidneg1x10","uhshouldneg1x10")
-macro Macros/hodo_efficiency.C("uhdidneg1x11","uhshouldneg1x11")
-macro Macros/hodo_efficiency.C("uhdidneg1x12","uhshouldneg1x12")
-macro Macros/hodo_efficiency.C("uhdidneg1x13","uhshouldneg1x13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x1","uhshouldneg1x1")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x2","uhshouldneg1x2")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x3","uhshouldneg1x3")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x4","uhshouldneg1x4")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x5","uhshouldneg1x5")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x6","uhshouldneg1x6")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x7","uhshouldneg1x7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x8","uhshouldneg1x8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x9","uhshouldneg1x9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x10","uhshouldneg1x10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x11","uhshouldneg1x11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x12","uhshouldneg1x12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1x13","uhshouldneg1x13")
 newpage 4 4
 title X1 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos1x1","uhshouldpos1x1")
-macro Macros/hodo_efficiency.C("uhdidpos1x2","uhshouldpos1x2")
-macro Macros/hodo_efficiency.C("uhdidpos1x3","uhshouldpos1x3")
-macro Macros/hodo_efficiency.C("uhdidpos1x4","uhshouldpos1x4")
-macro Macros/hodo_efficiency.C("uhdidpos1x5","uhshouldpos1x5")
-macro Macros/hodo_efficiency.C("uhdidpos1x6","uhshouldpos1x6")
-macro Macros/hodo_efficiency.C("uhdidpos1x7","uhshouldpos1x7")
-macro Macros/hodo_efficiency.C("uhdidpos1x8","uhshouldpos1x8")
-macro Macros/hodo_efficiency.C("uhdidpos1x9","uhshouldpos1x9")
-macro Macros/hodo_efficiency.C("uhdidpos1x10","uhshouldpos1x10")
-macro Macros/hodo_efficiency.C("uhdidpos1x11","uhshouldpos1x11")
-macro Macros/hodo_efficiency.C("uhdidpos1x12","uhshouldpos1x12")
-macro Macros/hodo_efficiency.C("uhdidpos1x13","uhshouldpos1x13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x1","uhshouldpos1x1")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x2","uhshouldpos1x2")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x3","uhshouldpos1x3")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x4","uhshouldpos1x4")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x5","uhshouldpos1x5")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x6","uhshouldpos1x6")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x7","uhshouldpos1x7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x8","uhshouldpos1x8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x9","uhshouldpos1x9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x10","uhshouldpos1x10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x11","uhshouldpos1x11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x12","uhshouldpos1x12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1x13","uhshouldpos1x13")
 newpage 3 4
 title Y1 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg1y1","uhshouldneg1y1")
-macro Macros/hodo_efficiency.C("uhdidneg1y2","uhshouldneg1y2")
-macro Macros/hodo_efficiency.C("uhdidneg1y3","uhshouldneg1y3")
-macro Macros/hodo_efficiency.C("uhdidneg1y4","uhshouldneg1y4")
-macro Macros/hodo_efficiency.C("uhdidneg1y5","uhshouldneg1y5")
-macro Macros/hodo_efficiency.C("uhdidneg1y6","uhshouldneg1y6")
-macro Macros/hodo_efficiency.C("uhdidneg1y7","uhshouldneg1y7")
-macro Macros/hodo_efficiency.C("uhdidneg1y8","uhshouldneg1y8")
-macro Macros/hodo_efficiency.C("uhdidneg1y9","uhshouldneg1y9")
-macro Macros/hodo_efficiency.C("uhdidneg1y10","uhshouldneg1y10")
-macro Macros/hodo_efficiency.C("uhdidneg1y11","uhshouldneg1y11")
-macro Macros/hodo_efficiency.C("uhdidneg1y12","uhshouldneg1y12")
-macro Macros/hodo_efficiency.C("uhdidneg1y13","uhshouldneg1y13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y1","uhshouldneg1y1")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y2","uhshouldneg1y2")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y3","uhshouldneg1y3")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y4","uhshouldneg1y4")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y5","uhshouldneg1y5")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y6","uhshouldneg1y6")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y7","uhshouldneg1y7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y8","uhshouldneg1y8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y9","uhshouldneg1y9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y10","uhshouldneg1y10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y11","uhshouldneg1y11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y12","uhshouldneg1y12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg1y13","uhshouldneg1y13")
 newpage 3 4
 title Y1 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos1y1","uhshouldpos1y1")
-macro Macros/hodo_efficiency.C("uhdidpos1y2","uhshouldpos1y2")
-macro Macros/hodo_efficiency.C("uhdidpos1y3","uhshouldpos1y3")
-macro Macros/hodo_efficiency.C("uhdidpos1y4","uhshouldpos1y4")
-macro Macros/hodo_efficiency.C("uhdidpos1y5","uhshouldpos1y5")
-macro Macros/hodo_efficiency.C("uhdidpos1y6","uhshouldpos1y6")
-macro Macros/hodo_efficiency.C("uhdidpos1y7","uhshouldpos1y7")
-macro Macros/hodo_efficiency.C("uhdidpos1y8","uhshouldpos1y8")
-macro Macros/hodo_efficiency.C("uhdidpos1y9","uhshouldpos1y9")
-macro Macros/hodo_efficiency.C("uhdidpos1y10","uhshouldpos1y10")
-macro Macros/hodo_efficiency.C("uhdidpos1y11","uhshouldpos1y11")
-macro Macros/hodo_efficiency.C("uhdidpos1y12","uhshouldpos1y12")
-macro Macros/hodo_efficiency.C("uhdidpos1y13","uhshouldpos1y13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y1","uhshouldpos1y1")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y2","uhshouldpos1y2")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y3","uhshouldpos1y3")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y4","uhshouldpos1y4")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y5","uhshouldpos1y5")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y6","uhshouldpos1y6")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y7","uhshouldpos1y7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y8","uhshouldpos1y8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y9","uhshouldpos1y9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y10","uhshouldpos1y10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y11","uhshouldpos1y11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y12","uhshouldpos1y12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos1y13","uhshouldpos1y13")
 newpage 4 4
 title X2 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg2x1","uhshouldneg2x1")
-macro Macros/hodo_efficiency.C("uhdidneg2x2","uhshouldneg2x2")
-macro Macros/hodo_efficiency.C("uhdidneg2x3","uhshouldneg2x3")
-macro Macros/hodo_efficiency.C("uhdidneg2x4","uhshouldneg2x4")
-macro Macros/hodo_efficiency.C("uhdidneg2x5","uhshouldneg2x5")
-macro Macros/hodo_efficiency.C("uhdidneg2x6","uhshouldneg2x6")
-macro Macros/hodo_efficiency.C("uhdidneg2x7","uhshouldneg2x7")
-macro Macros/hodo_efficiency.C("uhdidneg2x8","uhshouldneg2x8")
-macro Macros/hodo_efficiency.C("uhdidneg2x9","uhshouldneg2x9")
-macro Macros/hodo_efficiency.C("uhdidneg2x10","uhshouldneg2x10")
-macro Macros/hodo_efficiency.C("uhdidneg2x11","uhshouldneg2x11")
-macro Macros/hodo_efficiency.C("uhdidneg2x12","uhshouldneg2x12")
-macro Macros/hodo_efficiency.C("uhdidneg2x13","uhshouldneg2x13")
-macro Macros/hodo_efficiency.C("uhdidneg2x14","uhshouldneg2x14")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x1","uhshouldneg2x1")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x2","uhshouldneg2x2")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x3","uhshouldneg2x3")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x4","uhshouldneg2x4")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x5","uhshouldneg2x5")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x6","uhshouldneg2x6")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x7","uhshouldneg2x7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x8","uhshouldneg2x8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x9","uhshouldneg2x9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x10","uhshouldneg2x10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x11","uhshouldneg2x11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x12","uhshouldneg2x12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x13","uhshouldneg2x13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2x14","uhshouldneg2x14")
 newpage 4 4
 title X2 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos2x1","uhshouldpos2x1")
-macro Macros/hodo_efficiency.C("uhdidpos2x2","uhshouldpos2x2")
-macro Macros/hodo_efficiency.C("uhdidpos2x3","uhshouldpos2x3")
-macro Macros/hodo_efficiency.C("uhdidpos2x4","uhshouldpos2x4")
-macro Macros/hodo_efficiency.C("uhdidpos2x5","uhshouldpos2x5")
-macro Macros/hodo_efficiency.C("uhdidpos2x6","uhshouldpos2x6")
-macro Macros/hodo_efficiency.C("uhdidpos2x7","uhshouldpos2x7")
-macro Macros/hodo_efficiency.C("uhdidpos2x8","uhshouldpos2x8")
-macro Macros/hodo_efficiency.C("uhdidpos2x9","uhshouldpos2x9")
-macro Macros/hodo_efficiency.C("uhdidpos2x10","uhshouldpos2x10")
-macro Macros/hodo_efficiency.C("uhdidpos2x11","uhshouldpos2x11")
-macro Macros/hodo_efficiency.C("uhdidpos2x12","uhshouldpos2x12")
-macro Macros/hodo_efficiency.C("uhdidpos2x13","uhshouldpos2x13")
-macro Macros/hodo_efficiency.C("uhdidpos2x14","uhshouldpos2x14")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x1","uhshouldpos2x1")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x2","uhshouldpos2x2")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x3","uhshouldpos2x3")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x4","uhshouldpos2x4")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x5","uhshouldpos2x5")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x6","uhshouldpos2x6")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x7","uhshouldpos2x7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x8","uhshouldpos2x8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x9","uhshouldpos2x9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x10","uhshouldpos2x10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x11","uhshouldpos2x11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x12","uhshouldpos2x12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x13","uhshouldpos2x13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2x14","uhshouldpos2x14")
 newpage 3 4
 title Y2 Eff Neg PMT
-macro Macros/hodo_efficiency.C("uhdidneg2y7","uhshouldneg2y7")
-macro Macros/hodo_efficiency.C("uhdidneg2y8","uhshouldneg2y8")
-macro Macros/hodo_efficiency.C("uhdidneg2y9","uhshouldneg2y9")
-macro Macros/hodo_efficiency.C("uhdidneg2y10","uhshouldneg2y10")
-macro Macros/hodo_efficiency.C("uhdidneg2y11","uhshouldneg2y11")
-macro Macros/hodo_efficiency.C("uhdidneg2y12","uhshouldneg2y12")
-macro Macros/hodo_efficiency.C("uhdidneg2y13","uhshouldneg2y13")
-macro Macros/hodo_efficiency.C("uhdidneg2y14","uhshouldneg2y14")
-macro Macros/hodo_efficiency.C("uhdidneg2y15","uhshouldneg2y15")
-macro Macros/hodo_efficiency.C("uhdidneg2y16","uhshouldneg2y16")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y7","uhshouldneg2y7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y8","uhshouldneg2y8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y9","uhshouldneg2y9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y10","uhshouldneg2y10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y11","uhshouldneg2y11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y12","uhshouldneg2y12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y13","uhshouldneg2y13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y14","uhshouldneg2y14")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y15","uhshouldneg2y15")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidneg2y16","uhshouldneg2y16")
 newpage 3 4
 title Y2 Eff Pos PMT
-macro Macros/hodo_efficiency.C("uhdidpos2y7","uhshouldpos2y7")
-macro Macros/hodo_efficiency.C("uhdidpos2y8","uhshouldpos2y8")
-macro Macros/hodo_efficiency.C("uhdidpos2y9","uhshouldpos2y9")
-macro Macros/hodo_efficiency.C("uhdidpos2y10","uhshouldpos2y10")
-macro Macros/hodo_efficiency.C("uhdidpos2y11","uhshouldpos2y11")
-macro Macros/hodo_efficiency.C("uhdidpos2y12","uhshouldpos2y12")
-macro Macros/hodo_efficiency.C("uhdidpos2y13","uhshouldpos2y13")
-macro Macros/hodo_efficiency.C("uhdidpos2y14","uhshouldpos2y14")
-macro Macros/hodo_efficiency.C("uhdidpos2y15","uhshouldpos2y15")
-macro Macros/hodo_efficiency.C("uhdidpos2y16","uhshouldpos2y16")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y7","uhshouldpos2y7")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y8","uhshouldpos2y8")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y9","uhshouldpos2y9")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y10","uhshouldpos2y10")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y11","uhshouldpos2y11")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y12","uhshouldpos2y12")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y13","uhshouldpos2y13")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y14","uhshouldpos2y14")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y15","uhshouldpos2y15")
+macro UTIL/SHMS/HODO/hodo_efficiency.C("uhdidpos2y16","uhshouldpos2y16")
 newpage 4 4
 title X1 ADC int Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1x13")
 newpage 3 4
 title Y1  ADC int Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc1y13")
 newpage 4 4
 title X2  ADC int Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2x14")
 newpage 3 4
 title Y2  ADC int Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcintgtdc2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcintgtdc2y16")
 newpage 4 4
 title X1 TDC Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1x13")
 newpage 3 4
 title Y1 TDC Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc1y13")
 newpage 4 4
 title X2 TDC Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2x14")
 newpage 3 4
 title Y2 TDC Pos vs Neg
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdc2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdc2y16")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg b/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg
index 70143290a37b599f80cf25c23dce32bcf4328430..6d5af8e7521fdb60a0de70443c73da774089f9ae 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg
@@ -3,291 +3,291 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title X1+ ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1x13")
 newpage 4 4
 title X1- ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1x13")
 newpage 4 4
 title Y1+ ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos1y13")
 newpage 4 4
 title Y1- ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg1y13")
 newpage 4 4
 title X2+ ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2x14")
 newpage 4 4
 title X2- ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2x14")
 newpage 3 3
 title Y2+ ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdispos2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdispos2y16")
 newpage 3 3
 title Y2- ADC vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dadcvdisneg2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dadcvdisneg2y16")
 newpage 4 4
 title X1+ tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1x13")
 newpage 4 4
 title X1- tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1x13")
 newpage 4 4
 title Y1+ tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos1y13")
 newpage 4 4
 title Y1- tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg1y13")
 newpage 4 4
 title X2+ tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2x14")
 newpage 4 4
 title X2- tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2x14")
 newpage 3 4
 title Y2+ tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdispos2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdispos2y16")
 newpage 3 4
 title Y2- tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcvdisneg2y16")
 newpage 4 4
 title X1+ tdc diff vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1x13")
 newpage 4 4
 title Y1+ tdc diff vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis1y13")
 newpage 4 4
 title X2+ tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x1")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x2")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x3")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x4")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x5")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x6")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x1")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x2")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x3")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x4")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x5")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x6")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2x14")
 newpage 3 4
 title Y2+ tdc vs Dis
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y7")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y8")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y9")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y10")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y11")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y12")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y13")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y14")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y15")
-macro Macros/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y16")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y7")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y8")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y9")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y10")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y11")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y12")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y13")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y14")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y15")
+macro UTIL/SHMS/HODO/gooddraw_2d_phodo.C("uh2dtdcdiffvdis2y16")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg
index f6f0c0dcfcab233f6737e28eacd80f573899726f..326473e472c2246253b04fead61cc9f2ef6422ce 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg
@@ -3,271 +3,271 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title HMS X1+ Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1x1posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x2posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x3posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x4posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x5posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x6posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x7posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x8posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x9posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x10posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x11posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x12posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x13posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x1posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x2posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x3posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x4posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x5posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x6posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x7posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x8posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x9posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x10posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x11posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x12posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x13posTimeRaw")
 newpage 4 4
 title HMS X1- Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1x1negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x2negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x3negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x4negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x5negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x6negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x7negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x8negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x9negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x10negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x11negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x12negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1x13negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x1negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x2negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x3negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x4negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x5negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x6negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x7negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x8negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x9negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x10negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x11negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x12negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x13negTimeRaw")
 newpage 4 4
 title HMS X1+ TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1x1posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x2posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x3posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x4posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x5posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x6posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x7posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x8posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x9posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x10posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x11posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x12posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x13posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x1posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x2posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x3posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x4posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x5posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x6posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x7posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x8posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x9posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x10posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x11posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x12posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x13posTime")
 newpage 4 4
 title HMS X1- TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1x1negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x2negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x3negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x4negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x5negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x6negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x7negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x8negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x9negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x10negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x11negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x12negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1x13negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x1negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x2negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x3negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x4negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x5negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x6negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x7negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x8negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x9negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x10negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x11negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x12negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1x13negTime")
 newpage 4 4
 title HMS X1+ FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1x1posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13posPedRaw")
 newpage 4 4
 title HMS X1- FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1x1negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13negPedRaw")
 newpage 4 4
 title HMS X1+ FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1x1posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x2posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x3posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x4posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x5posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x6posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x7posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x8posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x9posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x10posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x11posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x12posPed")
-macro Macros/rawdraw_phodo.C("uhadc1x13posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13posPed")
 newpage 4 4
 title HMS X1- FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1x1negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x2negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x3negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x4negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x5negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x6negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x7negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x8negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x9negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x10negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x11negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x12negPed")
-macro Macros/rawdraw_phodo.C("uhadc1x13negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13negPed")
 newpage 4 4
 title HMS X1+ FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc1x1posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13posPulseIntRaw")
 newpage 4 4
 title HMS X1- FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc1x1negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13negPulseIntRaw")
 newpage 4 4
 title HMS X1+ FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc1x1posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x2posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x3posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x4posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x5posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x6posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x7posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x8posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x9posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x10posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x11posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x12posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x13posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13posPulseInt")
 newpage 4 4
 title HMS X1- FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc1x1negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x2negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x3negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x4negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x5negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x6negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x7negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x8negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x9negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x10negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x11negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x12negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1x13negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13negPulseInt")
 newpage 4 4
 title HMS X1+ FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc1x1posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13posPulseAmpRaw")
 newpage 4 4
 title HMS X1- FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc1x1negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13negPulseAmpRaw")
 newpage 4 4
 title HMS X1+ FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc1x1posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x2posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x3posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x4posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x5posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x6posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x7posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x8posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x9posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x10posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x11posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x12posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x13posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13posPulseAmp")
 newpage 4 4
 title HMS X1- FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc1x1negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x2negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x3negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x4negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x5negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x6negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x7negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x8negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x9negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x10negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x11negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x12negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1x13negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13negPulseAmp")
 newpage 4 4
 title HMS X1+ FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc1x1posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13posPulseTimeRaw")
 newpage 4 4
 title HMS X1- FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc1x1negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x2negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x3negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x4negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x5negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x6negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x7negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x8negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x9negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x10negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x11negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x12negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1x13negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x1negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x2negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x3negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x4negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x5negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x6negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x7negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x8negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x9negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x10negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x11negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x12negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1x13negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg
index a825bb3eb5595be8dc815c6b3bda7c78a2695f33..5dc51c46c6722319490f8af9d6cd8ac3663ebb01 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg
@@ -3,268 +3,268 @@ guicolor orange
 canvassize 1600 800
 newpage 3 4
 title HMS Y1+ Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1y1posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y2posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y3posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y4posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y5posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y6posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y7posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y8posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y9posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y10posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y11posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y12posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y13posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y1posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y2posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y3posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y4posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y5posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y6posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y7posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y8posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y9posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y10posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y11posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y12posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y13posTimeRaw")
 newpage 3 4
 title HMS Y1- Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1y1negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y2negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y3negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y4negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y5negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y6negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y7negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y8negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y9negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y10negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y11negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y12negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc1y13negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y1negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y2negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y3negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y4negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y5negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y6negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y7negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y8negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y9negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y10negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y11negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y12negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y13negTimeRaw")
 newpage 3 4
 title HMS Y1+ TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1y1posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y2posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y3posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y4posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y5posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y6posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y7posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y8posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y9posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y10posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y11posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y12posTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y13posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y1posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y2posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y3posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y4posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y5posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y6posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y7posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y8posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y9posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y10posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y11posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y12posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y13posTime")
 newpage 3 4
 title HMS Y1- TDCs
-macro Macros/rawdraw_phodo.C("uhtdc1y1negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y2negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y3negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y4negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y5negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y6negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y7negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y8negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y9negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y10negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y11negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y12negTime")
-macro Macros/rawdraw_phodo.C("uhtdc1y13negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y1negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y2negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y3negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y4negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y5negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y6negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y7negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y8negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y9negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y10negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y11negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y12negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc1y13negTime")
 newpage 3 4
 title HMS Y1+ FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1y1posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y11posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y12posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y13posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13posPedRaw")
 newpage 3 4
 title HMS Y1- FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1y1negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y11negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y12negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y13negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13negPedRaw")
 newpage 3 4
 title HMS Y1+ FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1y1posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y2posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y3posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y4posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y5posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y6posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y7posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y8posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y9posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y10posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y11posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y12posPed")
-macro Macros/rawdraw_phodo.C("uhadc1y13posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13posPed")
 newpage 3 4
 title HMS Y1- FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc1y1negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y2negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y3negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y4negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y5negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y6negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y7negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y8negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y9negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y10negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y11negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y12negPed")
-macro Macros/rawdraw_phodo.C("uhadc1y13negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13negPed")
 newpage 3 4
 title HMS Y1+ FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc1y1posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y11posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y12posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y13posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13posPulseIntRaw")
 newpage 3 4
 title HMS Y1- FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc1y1negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y11negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y12negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y13negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13negPulseIntRaw")
 newpage 3 4
 title HMS Y1+ FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc1y1posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y2posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y3posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y4posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y5posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y6posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y7posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y8posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y9posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y10posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y11posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y12posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y13posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13posPulseInt")
 newpage 3 4
 title HMS Y1- FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc1y1negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y2negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y3negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y4negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y5negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y6negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y7negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y8negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y9negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y10negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y11negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y12negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc1y13negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13negPulseInt")
 newpage 3 4
 title HMS Y1+ FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc1y1posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10posPulseAmpRaw")
 newpage 3 4
 title HMS Y1- FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc1y1negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y11negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y12negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y13negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13negPulseAmpRaw")
 newpage 3 4
 title HMS Y1+ FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc1y1posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y2posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y3posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y4posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y5posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y6posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y7posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y8posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y9posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y10posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y11posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y12posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y13posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13posPulseAmp")
 newpage 3 4
 title HMS Y1- FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc1y1negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y2negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y3negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y4negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y5negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y6negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y7negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y8negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y9negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y10negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y11negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y12negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc1y13negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13negPulseAmp")
 newpage 3 4
 title HMS Y1+ FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc1y1posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y11posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y12posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y13posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13posPulseTimeRaw")
 newpage 3 4
 title HMS Y1- FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc1y1negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y2negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y3negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y4negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y5negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y6negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y7negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y8negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y9negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y10negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y11negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y12negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc1y13negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y1negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y2negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y3negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y4negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y5negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y6negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y7negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y8negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y9negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y10negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y11negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y12negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc1y13negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg
index 2571a191a84f2490e03bd7538486407e0944c2b7..83568fdc924eada31faa5df391d53faac020cfc5 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg
@@ -4,303 +4,303 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title X1 ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1x13")
 newpage 4 4
 title Y1  ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y1")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y2")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y3")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y4")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y5")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y6")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak1y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak1y13")
 newpage 4 4
 title X2  ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x13")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2x14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2x14")
 newpage 3 4
 title Y2  ADC peak Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y13")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y14")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y15")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcpeak2y16")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y15")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcpeak2y16")
 newpage 4 4
 title X1 ADC int Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1x13")
 newpage 4 4
 title Y1  ADC int Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y1")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y2")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y3")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y4")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y5")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y6")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint1y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint1y13")
 newpage 4 4
 title X2  ADC int Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x13")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2x14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2x14")
 newpage 3 4
 title Y2  ADC int Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y13")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y14")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y15")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcint2y16")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y15")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcint2y16")
 newpage 3 4
 title Y2  ADC int cut Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y13")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y14")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y15")
-macro Macros/rawdraw_2d_phodo.C("uh2dadcintcut2y16")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y15")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dadcintcut2y16")
 newpage 4 4
 title X1 TDC Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1x13")
 newpage 4 4
 title Y1  TDC Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc1y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc1y13")
 newpage 4 4
 title X2  TDC Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x13")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2x14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2x14")
 newpage 3 4
 title Y2  TDC Pos vs Neg
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y13")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y14")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y15")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdc2y16")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y15")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdc2y16")
 newpage 4 4
 title X1-  ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d1x1neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x2neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x3neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x4neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x5neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x6neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x7neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x8neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x9neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x10neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x11neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x12neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x13neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x1neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x2neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x3neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x4neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x5neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x6neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x7neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x8neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x9neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x10neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x11neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x12neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x13neg")
 newpage 4 4
 title X1+  ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d1x1pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x2pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x3pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x4pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x5pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x6pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x7pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x8pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x9pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x10pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x11pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x12pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1x13pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x1pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x2pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x3pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x4pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x5pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x6pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x7pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x8pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x9pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x10pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x11pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x12pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1x13pos")
 newpage 4 4
 title Y1-   ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d1y1neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y2neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y3neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y4neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y5neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y6neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y7neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y8neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y9neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y10neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y11neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y12neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y13neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y1neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y2neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y3neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y4neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y5neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y6neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y7neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y8neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y9neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y10neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y11neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y12neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y13neg")
 newpage 4 4
 title Y1+   ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d1y1pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y2pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y3pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y4pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y5pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y6pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y7pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y8pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y9pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y10pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y11pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y12pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d1y13pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y1pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y2pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y3pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y4pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y5pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y6pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y7pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y8pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y9pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y10pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y11pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y12pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d1y13pos")
 newpage 4 4
 title X2-   ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d2x1neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x2neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x3neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x4neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x5neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x6neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x7neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x8neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x9neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x10neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x11neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x12neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x13neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x14neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x1neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x2neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x3neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x4neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x5neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x6neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x7neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x8neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x9neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x10neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x11neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x12neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x13neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x14neg")
 newpage 4 4
 title X2-   ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d2x1pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x2pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x3pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x4pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x5pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x6pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x7pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x8pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x9pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x10pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x11pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x12pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x13pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2x14pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x1pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x2pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x3pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x4pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x5pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x6pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x7pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x8pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x9pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x10pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x11pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x12pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x13pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2x14pos")
 newpage 3 4
 title Y2-   ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d2y7neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y8neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y9neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y10neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y11neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y12neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y13neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y14neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y15neg")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y16neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y7neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y8neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y9neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y10neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y11neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y12neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y13neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y14neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y15neg")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y16neg")
 newpage 3 4
 title Y2+   ADC (pC) vs TDC
-macro Macros/rawdraw_2d_phodo.C("uh2d2y7pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y8pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y9pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y10pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y11pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y12pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y13pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y14pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y15pos")
-macro Macros/rawdraw_2d_phodo.C("uh2d2y16pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y7pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y8pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y9pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y10pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y11pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y12pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y13pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y14pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y15pos")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2d2y16pos")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg
index 86361fd1cb8f3f1f9b6df515e483b74b34d30902..c565d8a88bc1155d2e06392b28e0023eb42684a4 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg
@@ -3,118 +3,118 @@ guicolor orange
 canvassize 1600 800
 newpage 4 4
 title X1 Neg TDC vs Y1 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1x13")
 newpage 4 4
 title X1 Pos TDC vs Y1 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1x13")
 newpage 4 4
 title Y1 Neg TDC vs X1 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg1y13")
 newpage 4 4
 title Y1 Pos TDC vs X1 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos1y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos1y13")
 newpage 4 4
 title X2 Neg TDC vs Y1 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x13")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2x14")
 newpage 4 4
 title X2 Pos TDC vs Y1 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x1")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x2")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x3")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x4")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x5")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x6")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x13")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2x14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x1")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x2")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x3")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x4")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x5")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x6")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2x14")
 newpage 3 3
 title Y2 Neg TDC vs X2 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y13")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y14")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y15")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y16")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y15")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdisneg2y16")
 newpage 3 3
 title Y2 Pos TDC vs X2 paddle
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y7")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y8")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y9")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y10")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y11")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y12")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y13")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y14")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y15")
-macro Macros/rawdraw_2d_phodo.C("uh2dtdcvdispos2y16")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y7")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y8")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y9")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y10")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y11")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y12")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y13")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y14")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y15")
+macro UTIL/SHMS/HODO/rawdraw_2d_phodo.C("uh2dtdcvdispos2y16")
 
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg
index 53b0616726d59573499df373e8e46e3f59e817d1..be64c1a527f688c4ea5c9aeeed67080605640e82 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg
@@ -3,289 +3,289 @@ guicolor orange
 canvassize 1600 1600
 newpage 4 4
 title HMS X2+ Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2x1posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x2posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x3posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x4posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x5posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x6posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x7posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x8posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x9posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x10posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x11posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x12posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x13posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x14posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x1posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x2posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x3posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x4posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x5posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x6posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x7posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x8posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x9posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x10posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x11posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x12posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x13posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x14posTimeRaw")
 newpage 4 4
 title HMS X2- Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2x1negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x2negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x3negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x4negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x5negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x6negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x7negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x8negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x9negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x10negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x11negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x12negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x13negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2x14negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x1negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x2negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x3negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x4negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x5negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x6negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x7negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x8negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x9negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x10negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x11negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x12negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x13negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x14negTimeRaw")
 newpage 4 4
 title HMS X2+ TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2x1posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x2posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x3posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x4posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x5posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x6posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x7posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x8posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x9posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x10posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x11posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x12posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x13posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x14posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x1posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x2posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x3posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x4posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x5posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x6posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x7posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x8posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x9posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x10posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x11posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x12posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x13posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x14posTime")
 newpage 4 4
 title HMS X2- TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2x1negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x2negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x3negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x4negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x5negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x6negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x7negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x8negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x9negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x10negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x11negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x12negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x13negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2x14negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x1negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x2negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x3negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x4negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x5negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x6negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x7negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x8negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x9negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x10negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x11negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x12negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x13negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2x14negTime")
 newpage 4 4
 title HMS X2+ FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2x1posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14posPedRaw")
 newpage 4 4
 title HMS X2- FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2x1negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14negPedRaw")
 newpage 4 4
 title HMS X2+ FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2x1posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x2posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x3posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x4posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x5posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x6posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x7posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x8posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x9posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x10posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x11posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x12posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x13posPed")
-macro Macros/rawdraw_phodo.C("uhadc2x14posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14posPed")
 newpage 4 4
 title HMS X2- FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2x1negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x2negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x3negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x4negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x5negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x6negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x7negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x8negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x9negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x10negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x11negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x12negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x13negPed")
-macro Macros/rawdraw_phodo.C("uhadc2x14negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14negPed")
 newpage 4 4
 title HMS X2+ FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc2x1posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14posPulseIntRaw")
 newpage 4 4
 title HMS X2- FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc2x1negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14negPulseIntRaw")
 newpage 4 4
 title HMS X2+ FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc2x1posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x2posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x3posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x4posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x5posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x6posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x7posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x8posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x9posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x10posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x11posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x12posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x13posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x14posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14posPulseInt")
 newpage 4 4
 title HMS X2- FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc2x1negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x2negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x3negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x4negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x5negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x6negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x7negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x8negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x9negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x10negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x11negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x12negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x13negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2x14negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14negPulseInt")
 newpage 4 4
 title HMS X2+ FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc2x1posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14posPulseAmpRaw")
 newpage 4 4
 title HMS X2- FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc2x1negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14negPulseAmpRaw")
 newpage 4 4
 title HMS X2+ FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc2x1posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x2posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x3posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x4posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x5posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x6posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x7posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x8posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x9posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x10posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x11posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x12posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x13posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x14posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14posPulseAmp")
 newpage 4 4
 title HMS X2- FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc2x1negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x2negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x3negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x4negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x5negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x6negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x7negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x8negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x9negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x10negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x11negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x12negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x13negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2x14negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14negPulseAmp")
 newpage 4 4
 title HMS X2+ FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc2x1posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14posPulseTimeRaw")
 newpage 4 4
 title HMS X2- FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc2x1negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x2negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x3negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x4negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x5negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x6negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x7negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x8negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x9negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x10negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x11negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x12negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x13negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2x14negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x1negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x2negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x3negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x4negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x5negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x6negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x7negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x8negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x9negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x10negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x11negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x12negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x13negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2x14negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg
index f1625b413688fe2f7347432e3e857a9eb2887c99..0167267f30e5639ce14ea73fef617539525f78b6 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg
@@ -3,415 +3,415 @@ guicolor orange
 canvassize 1600 800
 newpage 5 4
 title HMS Y2+ Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2y1posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y2posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y3posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y4posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y5posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y6posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y7posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y8posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y9posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y10posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y11posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y12posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y13posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y14posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y15posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y16posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y17posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y18posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y19posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y20posTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y21posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y1posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y2posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y3posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y4posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y5posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y6posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y7posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y8posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y9posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y10posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y11posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y12posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y13posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y14posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y15posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y16posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y17posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y18posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y19posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y20posTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y21posTimeRaw")
 newpage 3 4
 title HMS Y2- Raw TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2y1negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y2negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y3negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y4negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y5negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y6negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y7negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y8negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y9negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y10negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y11negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y12negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y13negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y14negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y15negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y16negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y17negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y18negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y19negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y20negTimeRaw")
-macro Macros/rawdraw_phodo.C("uhtdc2y21negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y1negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y2negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y3negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y4negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y5negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y6negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y7negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y8negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y9negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y10negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y11negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y12negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y13negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y14negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y15negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y16negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y17negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y18negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y19negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y20negTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y21negTimeRaw")
 newpage 3 4
 title HMS Y2+ TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2y1posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y2posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y3posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y4posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y5posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y6posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y7posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y8posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y9posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y10posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y11posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y12posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y13posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y14posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y15posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y16posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y17posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y18posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y19posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y20posTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y21posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y1posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y2posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y3posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y4posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y5posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y6posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y7posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y8posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y9posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y10posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y11posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y12posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y13posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y14posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y15posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y16posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y17posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y18posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y19posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y20posTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y21posTime")
 newpage 3 4
 title HMS Y2- TDCs
-macro Macros/rawdraw_phodo.C("uhtdc2y1negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y2negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y3negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y4negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y5negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y6negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y7negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y8negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y9negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y10negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y11negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y12negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y13negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y14negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y15negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y16negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y17negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y18negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y19negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y20negTime")
-macro Macros/rawdraw_phodo.C("uhtdc2y21negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y1negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y2negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y3negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y4negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y5negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y6negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y7negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y8negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y9negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y10negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y11negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y12negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y13negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y14negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y15negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y16negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y17negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y18negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y19negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y20negTime")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhtdc2y21negTime")
 newpage 3 4
 title HMS Y2+ FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2y1posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y21posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21posPedRaw")
 newpage 3 4
 title HMS Y2- FADC Raw Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2y1negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20negPedRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y21negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20negPedRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21negPedRaw")
 newpage 3 4
 title HMS Y2+ FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2y1posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y2posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y3posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y4posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y5posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y6posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y7posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y8posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y9posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y10posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y11posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y12posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y13posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y14posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y15posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y16posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y17posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y18posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y19posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPed")
-macro Macros/rawdraw_phodo.C("uhadc2y21posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21posPed")
 newpage 3 4
 title HMS Y2- FADC Pedestals
-macro Macros/rawdraw_phodo.C("uhadc2y1negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y2negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y3negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y4negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y5negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y6negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y7negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y8negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y9negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y10negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y11negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y12negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y13negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y14negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y15negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y16negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y17negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y18negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y19negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y20negPed")
-macro Macros/rawdraw_phodo.C("uhadc2y21negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20negPed")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21negPed")
 newpage 3 4
 title HMS Y2+ FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc2y1posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y21posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21posPulseIntRaw")
 newpage 3 4
 title HMS Y2- FADC Raw Integrals
-macro Macros/rawdraw_phodo.C("uhadc2y1negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20negPulseIntRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y21negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20negPulseIntRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21negPulseIntRaw")
 newpage 3 4
 title HMS Y2+ FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc2y1posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y2posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y3posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y4posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y5posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y6posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y7posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y8posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y9posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y10posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y11posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y12posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y13posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y14posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y15posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y16posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y17posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y18posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y19posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y21posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21posPulseInt")
 newpage 3 4
 title HMS Y2- FADC Integrals
-macro Macros/rawdraw_phodo.C("uhadc2y1negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y2negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y3negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y4negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y5negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y6negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y7negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y8negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y9negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y10negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y11negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y12negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y13negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y14negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y15negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y16negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y17negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y18negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y19negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y20negPulseInt")
-macro Macros/rawdraw_phodo.C("uhadc2y21negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20negPulseInt")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21negPulseInt")
 newpage 3 4
 title HMS Y2+ FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc2y1posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPulseAmpRaw")
 newpage 3 4
 title HMS Y2- FADC Amplitudes Raw
-macro Macros/rawdraw_phodo.C("uhadc2y1negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20negPulseAmpRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y21negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20negPulseAmpRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21negPulseAmpRaw")
 newpage 3 4
 title HMS Y2+ FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc2y1posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y2posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y3posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y4posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y5posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y6posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y7posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y8posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y9posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y10posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y11posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y12posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y13posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y14posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y15posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y16posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y17posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y18posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y19posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y21posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21posPulseAmp")
 newpage 3 4
 title HMS Y2- FADC Amplitudes
-macro Macros/rawdraw_phodo.C("uhadc2y1negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y2negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y3negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y4negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y5negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y6negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y7negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y8negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y9negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y10negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y11negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y12negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y13negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y14negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y15negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y16negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y17negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y18negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y19negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y20negPulseAmp")
-macro Macros/rawdraw_phodo.C("uhadc2y21negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20negPulseAmp")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21negPulseAmp")
 newpage 3 4
 title HMS Y2+ FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc2y1posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20posPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y21posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20posPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21posPulseTimeRaw")
 newpage 3 4
 title HMS Y2- FADC Times Raw
-macro Macros/rawdraw_phodo.C("uhadc2y1negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y2negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y3negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y4negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y5negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y6negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y7negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y8negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y9negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y10negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y11negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y12negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y13negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y14negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y15negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y16negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y17negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y18negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y19negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y20negPulseTimeRaw")
-macro Macros/rawdraw_phodo.C("uhadc2y21negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y1negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y2negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y3negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y4negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y5negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y6negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y7negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y8negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y9negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y10negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y11negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y12negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y13negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y14negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y15negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y16negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y17negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y18negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y19negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y20negPulseTimeRaw")
+macro UTIL/SHMS/HODO/rawdraw_phodo.C("uhadc2y21negPulseTimeRaw")
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg
index 62f5af55aa3a10f547552b048f93b33b4f0d9ec1..6b61f80b7ba1e455094a828141cc89bb416c6c50 100644
--- a/onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg
+++ b/onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg
@@ -10,16 +10,16 @@ phodo_2x_multi
 phodo_2y_multi
 newpage 2 2
 title SHMS Hodo Raw ADC Occupancy
-macro Macros/overlay.C("phodo_1x_pos_adc_occu","phodo_1x_neg_adc_occu")
-macro Macros/overlay.C("phodo_1y_pos_adc_occu","phodo_1y_neg_adc_occu")
-macro Macros/overlay.C("phodo_2x_pos_adc_occu","phodo_2x_neg_adc_occu")
-macro Macros/overlay.C("phodo_2y_pos_adc_occu","phodo_2y_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("phodo_1x_pos_adc_occu","phodo_1x_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("phodo_1y_pos_adc_occu","phodo_1y_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("phodo_2x_pos_adc_occu","phodo_2x_neg_adc_occu")
+macro UTIL/GEN/overlay2.C("phodo_2y_pos_adc_occu","phodo_2y_neg_adc_occu")
 newpage 2 2
 title SHMS Hodo Raw TDC Occupancy
-macro Macros/overlay.C("phodo_1x_pos_tdc_occu","phodo_1x_neg_tdc_occu")
-macro Macros/overlay.C("phodo_1y_pos_tdc_occu","phodo_1y_neg_tdc_occu")
-macro Macros/overlay.C("phodo_2x_pos_tdc_occu","phodo_2x_neg_tdc_occu")
-macro Macros/overlay.C("phodo_2y_pos_tdc_occu","phodo_2y_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("phodo_1x_pos_tdc_occu","phodo_1x_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("phodo_1y_pos_tdc_occu","phodo_1y_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("phodo_2x_pos_tdc_occu","phodo_2x_neg_tdc_occu")
+macro UTIL/GEN/overlay2.C("phodo_2y_pos_tdc_occu","phodo_2y_neg_tdc_occu")
 newpage 2 2
 title SHMS Hodo Raw Ped PMT+
 phodo_1x_pos_rawped_vs_pad -type colz
diff --git a/onlineGUI/CONFIG/SHMS/SCALERS/shms_scaler.cfg b/onlineGUI/CONFIG/SHMS/SCALERS/shms_scaler.cfg
index 159aa6312149beda79fdc573c7c735b4c2fac288..e57e520e416d0b271990a4fc566b754d4436f842 100644
--- a/onlineGUI/CONFIG/SHMS/SCALERS/shms_scaler.cfg
+++ b/onlineGUI/CONFIG/SHMS/SCALERS/shms_scaler.cfg
@@ -3,72 +3,72 @@ guicolor orange
 canvassize 1600 800
 newpage 2 3
 title Trig rates
-macro Macros/plot_shms_scalers.C("uhScalTrigS1X","none")
-macro Macros/plot_shms_scalers.C("uhScalTrigS1Y","none")
-macro Macros/plot_shms_scalers.C("uhScalTrigS2X","none")
-macro Macros/plot_shms_scalers.C("uhScalTrigS2Y","none")
-macro Macros/plot_shms_scalers.C("uhScalTrigS1XS1Y","none")
-macro Macros/plot_shms_scalers.C("uhScalTrigTrig","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalTrigS1X","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalTrigS1Y","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalTrigS2X","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalTrigS2Y","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalTrigS1XS1Y","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalTrigTrig","none")
 newpage 2 2
 title Hod ave rates
-macro Macros/plot_shms_scalers.C("uhScalHodNeg1x","uhScalHodPos1x")
-macro Macros/plot_shms_scalers.C("uhScalHodNeg1y","uhScalHodPos1y")
-macro Macros/plot_shms_scalers.C("uhScalHodNeg2x","uhScalHodPos2x")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalHodNeg1x","uhScalHodPos1x")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalHodNeg1y","uhScalHodPos1y")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalHodNeg2x","uhScalHodPos2x")
 newpage 2 2
 title BCM rates
-macro Macros/plot_shms_scalers.C("uhScalBCM1","none")
-macro Macros/plot_shms_scalers.C("uhScalBCM2","none")
-macro Macros/plot_shms_scalers.C("uhScalBCM1","uhScalBCM2")
-macro Macros/plot_shms_scalers.C("uhScalUnser","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalBCM1","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalBCM2","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalBCM1","uhScalBCM2")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalUnser","none")
 newpage 2 2
 title BCM current
-macro Macros/plot_shms_scalers.C("uhCurBCM1","none")
-macro Macros/plot_shms_scalers.C("uhCurBCM2","none")
-macro Macros/plot_shms_scalers.C("uhCurBCM1","uhCurBCM2")
-macro Macros/plot_shms_scalers.C("uhCurUnser","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhCurBCM1","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhCurBCM2","none")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhCurBCM1","uhCurBCM2")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhCurUnser","none")
 newpage 4 4
 title X1 Scalers
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad01","uhScalEvHodPos1xPad01")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad02","uhScalEvHodPos1xPad02")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad03","uhScalEvHodPos1xPad03")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad04","uhScalEvHodPos1xPad04")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad05","uhScalEvHodPos1xPad05")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad06","uhScalEvHodPos1xPad06")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad07","uhScalEvHodPos1xPad07")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad08","uhScalEvHodPos1xPad08")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad09","uhScalEvHodPos1xPad09")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad10","uhScalEvHodPos1xPad10")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad11","uhScalEvHodPos1xPad11")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad12","uhScalEvHodPos1xPad12")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1xPad13","uhScalEvHodPos1xPad13")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad01","uhScalEvHodPos1xPad01")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad02","uhScalEvHodPos1xPad02")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad03","uhScalEvHodPos1xPad03")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad04","uhScalEvHodPos1xPad04")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad05","uhScalEvHodPos1xPad05")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad06","uhScalEvHodPos1xPad06")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad07","uhScalEvHodPos1xPad07")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad08","uhScalEvHodPos1xPad08")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad09","uhScalEvHodPos1xPad09")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad10","uhScalEvHodPos1xPad10")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad11","uhScalEvHodPos1xPad11")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad12","uhScalEvHodPos1xPad12")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1xPad13","uhScalEvHodPos1xPad13")
 newpage 4 4
 title Y1 Scalers
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad01","uhScalEvHodPos1yPad01")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad02","uhScalEvHodPos1yPad02")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad03","uhScalEvHodPos1yPad03")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad04","uhScalEvHodPos1yPad04")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad05","uhScalEvHodPos1yPad05")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad06","uhScalEvHodPos1yPad06")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad07","uhScalEvHodPos1yPad07")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad08","uhScalEvHodPos1yPad08")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad09","uhScalEvHodPos1yPad09")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad10","uhScalEvHodPos1yPad10")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad11","uhScalEvHodPos1yPad11")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad12","uhScalEvHodPos1yPad12")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg1yPad13","uhScalEvHodPos1yPad13")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad01","uhScalEvHodPos1yPad01")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad02","uhScalEvHodPos1yPad02")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad03","uhScalEvHodPos1yPad03")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad04","uhScalEvHodPos1yPad04")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad05","uhScalEvHodPos1yPad05")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad06","uhScalEvHodPos1yPad06")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad07","uhScalEvHodPos1yPad07")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad08","uhScalEvHodPos1yPad08")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad09","uhScalEvHodPos1yPad09")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad10","uhScalEvHodPos1yPad10")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad11","uhScalEvHodPos1yPad11")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad12","uhScalEvHodPos1yPad12")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg1yPad13","uhScalEvHodPos1yPad13")
 newpage 4 4
 title X2 Scalers
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad01","uhScalEvHodPos2xPad01")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad02","uhScalEvHodPos2xPad02")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad03","uhScalEvHodPos2xPad03")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad04","uhScalEvHodPos2xPad04")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad05","uhScalEvHodPos2xPad05")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad06","uhScalEvHodPos2xPad06")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad07","uhScalEvHodPos2xPad07")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad08","uhScalEvHodPos2xPad08")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad09","uhScalEvHodPos2xPad09")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad10","uhScalEvHodPos2xPad10")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad11","uhScalEvHodPos2xPad11")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad12","uhScalEvHodPos2xPad12")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad13","uhScalEvHodPos2xPad13")
-macro Macros/plot_shms_scalers.C("uhScalEvHodNeg2xPad14","uhScalEvHodPos2xPad14")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad01","uhScalEvHodPos2xPad01")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad02","uhScalEvHodPos2xPad02")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad03","uhScalEvHodPos2xPad03")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad04","uhScalEvHodPos2xPad04")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad05","uhScalEvHodPos2xPad05")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad06","uhScalEvHodPos2xPad06")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad07","uhScalEvHodPos2xPad07")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad08","uhScalEvHodPos2xPad08")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad09","uhScalEvHodPos2xPad09")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad10","uhScalEvHodPos2xPad10")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad11","uhScalEvHodPos2xPad11")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad12","uhScalEvHodPos2xPad12")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad13","uhScalEvHodPos2xPad13")
+macro UTIL/SHMS/SCALERS/plot_shms_scalers.C("uhScalEvHodNeg2xPad14","uhScalEvHodPos2xPad14")