From 56028cfd1df4203bea3e82576c368f44b17ad99b Mon Sep 17 00:00:00 2001
From: Holly Szumila <hszumila@jlab.org>
Date: Mon, 16 Oct 2017 10:45:38 -0400
Subject: [PATCH] Monitoring sub-directory restructure (#230)

* re-organized the onlineGUI sub-directories

* update the README to match directory structure
---
 .../GEN}/default.cfg                          |   0
 .../{Config/EXAMPLES => CONFIG/GEN}/kpp.cfg   |   0
 .../EXAMPLES => CONFIG/GEN}/standard.cfg      |   0
 .../{Config => CONFIG}/HMS/CER/hcer_stand.cfg |   0
 .../HMS/GEN/hallc_onlana.cfg                  |   0
 .../HMS/HODO/good_hhodo_2d.cfg                |   0
 .../HMS/HODO/good_hhodo_2d_dis.cfg            |   0
 .../HMS/HODO}/hodtest.cfg                     |   0
 .../HMS/HODO/raw_hhodo_1x.cfg                 |   0
 .../HMS/HODO/raw_hhodo_1y.cfg                 |   0
 .../HMS/HODO/raw_hhodo_2d.cfg                 |   0
 .../HMS/HODO/raw_hhodo_2x.cfg                 |   0
 .../HMS/HODO/raw_hhodo_2y.cfg                 |   0
 .../HMS/HODO/raw_hhodoana.cfg                 |   0
 .../HMS/RASTER/simple_raster.cfg              |   0
 .../HMS}/SCALERS/hms_scaler.cfg               |   0
 .../SHMS/AERO/aero_stand.cfg                  |   0
 .../SHMS/CAL/pcalo_stand.cfg                  |   0
 .../SHMS/CER}/phgcer_stand.cfg                |   0
 .../SHMS/CER}/pngcer_stand.cfg                |   0
 .../SHMS/CER/shms_cer_eff.cfg                 |   0
 onlineGUI/CONFIG/SHMS/DC/pdc_stand.cfg        | 115 ++++++++++++++++++
 .../SHMS/GEN/hallc_onlana.cfg                 |   0
 .../SHMS/GEN/shms_stack.cfg                   |   0
 .../SHMS/HODO/good_phodo_2d.cfg               |   0
 .../SHMS/HODO/good_phodo_2d_dis.cfg           |   0
 .../SHMS/HODO/phodo_stand.cfg                 |   0
 .../SHMS/HODO/raw_phodo_1x.cfg                |   0
 .../SHMS/HODO/raw_phodo_1y.cfg                |   0
 .../SHMS/HODO/raw_phodo_2d.cfg                |   0
 .../SHMS/HODO/raw_phodo_2d_pad.cfg            |   0
 .../SHMS/HODO/raw_phodo_2x.cfg                |   0
 .../SHMS/HODO/raw_phodo_2y.cfg                |   0
 .../SHMS/HODO/raw_phodoana.cfg                |   0
 .../SHMS/RASTER/simple_raster.cfg             |   0
 .../SHMS}/SCALERS/shms_scaler.cfg             |   0
 onlineGUI/Config/SHMS/DC/pdc_stand.cfg        | 115 ------------------
 onlineGUI/Macros/EXAMPLES/overlay.C           |  54 --------
 onlineGUI/README.md                           |  29 ++---
 onlineGUI/{Macros => UTIL/GEN}/comp_histos.C  |   0
 .../EXAMPLES => UTIL/GEN}/hodo_efficiency.C   |   0
 .../EXAMPLE => UTIL/GEN}/kpp_analysis.C       |   0
 .../{Macros/EXAMPLES => UTIL/GEN}/overlay2.C  |   0
 .../{Macros/EXAMPLES => UTIL/GEN}/rawdraw.C   |   0
 .../HMS/HODO/gooddraw_2d_hhodo.C              |   0
 .../HMS/HODO/rawdraw_2d_hhodo.C               |   0
 .../{Macros => UTIL}/HMS/HODO/rawdraw_hhodo.C |   0
 .../HMS}/SCALERS/plot_hms_scalers.C           |   0
 .../{Macros => UTIL}/SHMS/CER/cer_2d_ratio.C  |   0
 .../SHMS/HODO/gooddraw_2d_phodo.C             |   0
 .../SHMS/HODO/rawdraw_2d_phodo.C              |   0
 .../SHMS/HODO/rawdraw_phodo.C                 |   0
 .../SHMS}/SCALERS/plot_shms_scalers.C         |   0
 onlineGUI/onlineGUI_v1.2.1/online.C           |  21 ++++
 54 files changed, 146 insertions(+), 188 deletions(-)
 rename onlineGUI/{onlineGUI_v1.2.1 => CONFIG/GEN}/default.cfg (100%)
 rename onlineGUI/{Config/EXAMPLES => CONFIG/GEN}/kpp.cfg (100%)
 rename onlineGUI/{Config/EXAMPLES => CONFIG/GEN}/standard.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/CER/hcer_stand.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/GEN/hallc_onlana.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/good_hhodo_2d.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/good_hhodo_2d_dis.cfg (100%)
 rename onlineGUI/{onlineGUI_v1.2.1 => CONFIG/HMS/HODO}/hodtest.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/raw_hhodo_1x.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/raw_hhodo_1y.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/raw_hhodo_2d.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/raw_hhodo_2x.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/raw_hhodo_2y.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/HODO/raw_hhodoana.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/HMS/RASTER/simple_raster.cfg (100%)
 rename onlineGUI/{Config => CONFIG/HMS}/SCALERS/hms_scaler.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/AERO/aero_stand.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/CAL/pcalo_stand.cfg (100%)
 rename onlineGUI/{Config/SHMS/HGCER => CONFIG/SHMS/CER}/phgcer_stand.cfg (100%)
 rename onlineGUI/{Config/SHMS/NGCER => CONFIG/SHMS/CER}/pngcer_stand.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/CER/shms_cer_eff.cfg (100%)
 create mode 100644 onlineGUI/CONFIG/SHMS/DC/pdc_stand.cfg
 rename onlineGUI/{Config => CONFIG}/SHMS/GEN/hallc_onlana.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/GEN/shms_stack.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/good_phodo_2d.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/good_phodo_2d_dis.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/phodo_stand.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/raw_phodo_1x.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/raw_phodo_1y.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/raw_phodo_2d.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/raw_phodo_2d_pad.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/raw_phodo_2x.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/raw_phodo_2y.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/HODO/raw_phodoana.cfg (100%)
 rename onlineGUI/{Config => CONFIG}/SHMS/RASTER/simple_raster.cfg (100%)
 rename onlineGUI/{Config => CONFIG/SHMS}/SCALERS/shms_scaler.cfg (100%)
 delete mode 100644 onlineGUI/Config/SHMS/DC/pdc_stand.cfg
 delete mode 100755 onlineGUI/Macros/EXAMPLES/overlay.C
 rename onlineGUI/{Macros => UTIL/GEN}/comp_histos.C (100%)
 rename onlineGUI/{Macros/EXAMPLES => UTIL/GEN}/hodo_efficiency.C (100%)
 rename onlineGUI/{Macros/EXAMPLES/EXAMPLE => UTIL/GEN}/kpp_analysis.C (100%)
 rename onlineGUI/{Macros/EXAMPLES => UTIL/GEN}/overlay2.C (100%)
 rename onlineGUI/{Macros/EXAMPLES => UTIL/GEN}/rawdraw.C (100%)
 rename onlineGUI/{Macros => UTIL}/HMS/HODO/gooddraw_2d_hhodo.C (100%)
 rename onlineGUI/{Macros => UTIL}/HMS/HODO/rawdraw_2d_hhodo.C (100%)
 rename onlineGUI/{Macros => UTIL}/HMS/HODO/rawdraw_hhodo.C (100%)
 rename onlineGUI/{Macros => UTIL/HMS}/SCALERS/plot_hms_scalers.C (100%)
 rename onlineGUI/{Macros => UTIL}/SHMS/CER/cer_2d_ratio.C (100%)
 rename onlineGUI/{Macros => UTIL}/SHMS/HODO/gooddraw_2d_phodo.C (100%)
 rename onlineGUI/{Macros => UTIL}/SHMS/HODO/rawdraw_2d_phodo.C (100%)
 rename onlineGUI/{Macros => UTIL}/SHMS/HODO/rawdraw_phodo.C (100%)
 rename onlineGUI/{Macros => UTIL/SHMS}/SCALERS/plot_shms_scalers.C (100%)

diff --git a/onlineGUI/onlineGUI_v1.2.1/default.cfg b/onlineGUI/CONFIG/GEN/default.cfg
similarity index 100%
rename from onlineGUI/onlineGUI_v1.2.1/default.cfg
rename to onlineGUI/CONFIG/GEN/default.cfg
diff --git a/onlineGUI/Config/EXAMPLES/kpp.cfg b/onlineGUI/CONFIG/GEN/kpp.cfg
similarity index 100%
rename from onlineGUI/Config/EXAMPLES/kpp.cfg
rename to onlineGUI/CONFIG/GEN/kpp.cfg
diff --git a/onlineGUI/Config/EXAMPLES/standard.cfg b/onlineGUI/CONFIG/GEN/standard.cfg
similarity index 100%
rename from onlineGUI/Config/EXAMPLES/standard.cfg
rename to onlineGUI/CONFIG/GEN/standard.cfg
diff --git a/onlineGUI/Config/HMS/CER/hcer_stand.cfg b/onlineGUI/CONFIG/HMS/CER/hcer_stand.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/CER/hcer_stand.cfg
rename to onlineGUI/CONFIG/HMS/CER/hcer_stand.cfg
diff --git a/onlineGUI/Config/HMS/GEN/hallc_onlana.cfg b/onlineGUI/CONFIG/HMS/GEN/hallc_onlana.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/GEN/hallc_onlana.cfg
rename to onlineGUI/CONFIG/HMS/GEN/hallc_onlana.cfg
diff --git a/onlineGUI/Config/HMS/HODO/good_hhodo_2d.cfg b/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/good_hhodo_2d.cfg
rename to onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg
diff --git a/onlineGUI/Config/HMS/HODO/good_hhodo_2d_dis.cfg b/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/good_hhodo_2d_dis.cfg
rename to onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg
diff --git a/onlineGUI/onlineGUI_v1.2.1/hodtest.cfg b/onlineGUI/CONFIG/HMS/HODO/hodtest.cfg
similarity index 100%
rename from onlineGUI/onlineGUI_v1.2.1/hodtest.cfg
rename to onlineGUI/CONFIG/HMS/HODO/hodtest.cfg
diff --git a/onlineGUI/Config/HMS/HODO/raw_hhodo_1x.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/raw_hhodo_1x.cfg
rename to onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg
diff --git a/onlineGUI/Config/HMS/HODO/raw_hhodo_1y.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/raw_hhodo_1y.cfg
rename to onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg
diff --git a/onlineGUI/Config/HMS/HODO/raw_hhodo_2d.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/raw_hhodo_2d.cfg
rename to onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg
diff --git a/onlineGUI/Config/HMS/HODO/raw_hhodo_2x.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/raw_hhodo_2x.cfg
rename to onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg
diff --git a/onlineGUI/Config/HMS/HODO/raw_hhodo_2y.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/raw_hhodo_2y.cfg
rename to onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg
diff --git a/onlineGUI/Config/HMS/HODO/raw_hhodoana.cfg b/onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/HODO/raw_hhodoana.cfg
rename to onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg
diff --git a/onlineGUI/Config/HMS/RASTER/simple_raster.cfg b/onlineGUI/CONFIG/HMS/RASTER/simple_raster.cfg
similarity index 100%
rename from onlineGUI/Config/HMS/RASTER/simple_raster.cfg
rename to onlineGUI/CONFIG/HMS/RASTER/simple_raster.cfg
diff --git a/onlineGUI/Config/SCALERS/hms_scaler.cfg b/onlineGUI/CONFIG/HMS/SCALERS/hms_scaler.cfg
similarity index 100%
rename from onlineGUI/Config/SCALERS/hms_scaler.cfg
rename to onlineGUI/CONFIG/HMS/SCALERS/hms_scaler.cfg
diff --git a/onlineGUI/Config/SHMS/AERO/aero_stand.cfg b/onlineGUI/CONFIG/SHMS/AERO/aero_stand.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/AERO/aero_stand.cfg
rename to onlineGUI/CONFIG/SHMS/AERO/aero_stand.cfg
diff --git a/onlineGUI/Config/SHMS/CAL/pcalo_stand.cfg b/onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/CAL/pcalo_stand.cfg
rename to onlineGUI/CONFIG/SHMS/CAL/pcalo_stand.cfg
diff --git a/onlineGUI/Config/SHMS/HGCER/phgcer_stand.cfg b/onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HGCER/phgcer_stand.cfg
rename to onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg
diff --git a/onlineGUI/Config/SHMS/NGCER/pngcer_stand.cfg b/onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/NGCER/pngcer_stand.cfg
rename to onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg
diff --git a/onlineGUI/Config/SHMS/CER/shms_cer_eff.cfg b/onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/CER/shms_cer_eff.cfg
rename to onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg
diff --git a/onlineGUI/CONFIG/SHMS/DC/pdc_stand.cfg b/onlineGUI/CONFIG/SHMS/DC/pdc_stand.cfg
new file mode 100644
index 00000000..9d55f384
--- /dev/null
+++ b/onlineGUI/CONFIG/SHMS/DC/pdc_stand.cfg
@@ -0,0 +1,115 @@
+protorootfile ../ROOTfiles/shms_replay_production_XXXXX_1000000.root
+guicolor orange
+canvassize 1200 1000
+
+newpage 2 3
+title SHMS DC raw TDC
+macro    UTIL/GEN/overlay2.C("pdc1u1_raw_tdc","pdc2v1_raw_tdc","1U1","2V1")
+macro    UTIL/GEN/overlay2.C("pdc1u2_raw_tdc","pdc2v2_raw_tdc","1U2","2V2")
+macro    UTIL/GEN/overlay2.C("pdc1x1_raw_tdc","pdc2x1_raw_tdc","1X1","2X1")
+macro    UTIL/GEN/overlay2.C("pdc1x2_raw_tdc","pdc2x2_raw_tdc","1X2","2X2")
+macro    UTIL/GEN/overlay2.C("pdc1v1_raw_tdc","pdc2u1_raw_tdc","1V1","2U1")
+macro    UTIL/GEN/overlay2.C("pdc1v2_raw_tdc","pdc2u2_raw_tdc","1V2","2U2")
+
+newpage 3 4 logz
+title SHMS DC raw TDC vs wire
+pdc1u1_raw_tdc_vs_wirenum -colz
+pdc1u2_raw_tdc_vs_wirenum -colz
+pdc1x1_raw_tdc_vs_wirenum -colz
+pdc1x2_raw_tdc_vs_wirenum -colz
+pdc1v1_raw_tdc_vs_wirenum -colz
+pdc1v2_raw_tdc_vs_wirenum -colz
+pdc2v2_raw_tdc_vs_wirenum -colz
+pdc2v1_raw_tdc_vs_wirenum -colz
+pdc2x2_raw_tdc_vs_wirenum -colz
+pdc2x1_raw_tdc_vs_wirenum -colz
+pdc2u2_raw_tdc_vs_wirenum -colz
+pdc2u1_raw_tdc_vs_wirenum -colz
+
+newpage 2 3
+title SHMS DC wire hits
+macro    UTIL/GEN/overlay2.C("pdc1u1_wirenum","pdc2v1_wirenum","1U1","2V1")
+macro    UTIL/GEN/overlay2.C("pdc1u2_wirenum","pdc2v2_wirenum","1U2","2V2")
+macro    UTIL/GEN/overlay2.C("pdc1x1_wirenum","pdc2x1_wirenum","1X1","2X1")
+macro    UTIL/GEN/overlay2.C("pdc1x2_wirenum","pdc2x2_wirenum","1X2","2X2")
+macro    UTIL/GEN/overlay2.C("pdc1v1_wirenum","pdc2u1_wirenum","1V1","2U1")
+macro    UTIL/GEN/overlay2.C("pdc1v2_wirenum","pdc2u2_wirenum","1V2","2U2")
+
+newpage 2 3
+title SHMS DC drift distance
+macro    UTIL/GEN/overlay2.C("pdc1u1_ddist","pdc2v1_ddist","1U1","2V1")
+macro    UTIL/GEN/overlay2.C("pdc1u2_ddist","pdc2v2_ddist","1U2","2V2")
+macro    UTIL/GEN/overlay2.C("pdc1x1_ddist","pdc2x1_ddist","1X1","2X1")
+macro    UTIL/GEN/overlay2.C("pdc1x2_ddist","pdc2x2_ddist","1X2","2X2")
+macro    UTIL/GEN/overlay2.C("pdc1v1_ddist","pdc2u1_ddist","1V1","2U1")
+macro    UTIL/GEN/overlay2.C("pdc1v2_ddist","pdc2u2_ddist","1V2","2U2")
+
+newpage 3 4 logz
+title SHMS DC drift dist vs wire
+pdc1u1_wirenum_vs_ddist -colz
+pdc1u2_wirenum_vs_ddist -colz
+pdc1x1_wirenum_vs_ddist -colz
+pdc1x2_wirenum_vs_ddist -colz
+pdc1v1_wirenum_vs_ddist -colz
+pdc1v2_wirenum_vs_ddist -colz
+pdc2v2_wirenum_vs_ddist -colz
+pdc2v1_wirenum_vs_ddist -colz
+pdc2x2_wirenum_vs_ddist -colz
+pdc2x1_wirenum_vs_ddist -colz
+pdc2u2_wirenum_vs_ddist -colz
+pdc2u1_wirenum_vs_ddist -colz
+
+newpage 2 3
+title SHMS DC drift time
+macro    UTIL/GEN/overlay2.C("pdc1u1_drifttime","pdc2v1_drifttime","1U1","2V1")
+macro    UTIL/GEN/overlay2.C("pdc1u2_drifttime","pdc2v1_drifttime","1U2","2V2")
+macro    UTIL/GEN/overlay2.C("pdc1x1_drifttime","pdc2x1_drifttime","1X1","2X1")
+macro    UTIL/GEN/overlay2.C("pdc1x2_drifttime","pdc2x2_drifttime","1X2","2X2")
+macro    UTIL/GEN/overlay2.C("pdc1v1_drifttime","pdc2u1_drifttime","1V1","2U1")
+macro    UTIL/GEN/overlay2.C("pdc1v2_drifttime","pdc2u2_drifttime","1V2","2U2")
+
+newpage 3 4 logz
+title SHMS DC drift time vs wire
+pdc1u1_drifttime_vs_wirenum -colz
+pdc1u2_drifttime_vs_wirenum -colz
+pdc1x1_drifttime_vs_wirenum -colz
+pdc1x2_drifttime_vs_wirenum -colz
+pdc1v1_drifttime_vs_wirenum -colz
+pdc1v2_drifttime_vs_wirenum -colz
+pdc2v2_drifttime_vs_wirenum -colz
+pdc2v1_drifttime_vs_wirenum -colz
+pdc2x2_drifttime_vs_wirenum -colz
+pdc2x1_drifttime_vs_wirenum -colz
+pdc2u2_drifttime_vs_wirenum -colz
+pdc2u1_drifttime_vs_wirenum -colz
+
+newpage 2 3
+title SHMS DC residuals
+macro    UTIL/GEN/overlay2.C("pdc1u1_residuals","pdc2v1_residuals","1U1","2V1")
+macro    UTIL/GEN/overlay2.C("pdc1u2_residuals","pdc2v2_residuals","1U2","2V2")
+macro    UTIL/GEN/overlay2.C("pdc1x1_residuals","pdc2x1_residuals","1X1","2X1")
+macro    UTIL/GEN/overlay2.C("pdc1x2_residuals","pdc2x2_residuals","1X2","2X2")
+macro    UTIL/GEN/overlay2.C("pdc1v1_residuals","pdc2u1_residuals","1V1","2U1")
+macro    UTIL/GEN/overlay2.C("pdc1v2_residuals","pdc2u2_residuals","1V2","2U2")
+
+newpage 3 4 logz
+title SHMS DC residuals vs wire 
+pdc1u1_residuals_vs_wirenum -colz
+pdc1u2_residuals_vs_wirenum -colz
+pdc1x1_residuals_vs_wirenum -colz
+pdc1x2_residuals_vs_wirenum -colz
+pdc1v1_residuals_vs_wirenum -colz
+pdc1v2_residuals_vs_wirenum -colz
+pdc2v2_residuals_vs_wirenum -colz
+pdc2v1_residuals_vs_wirenum -colz
+pdc2x2_residuals_vs_wirenum -colz
+pdc2x1_residuals_vs_wirenum -colz
+pdc2u2_residuals_vs_wirenum -colz
+pdc2u1_residuals_vs_wirenum -colz
+
+newpage 2 2 
+title SHMS DC track at focal plane
+pdc_xfp_vs_yxp -nostat
+pdc_xpfp_vs_ypfp -nostat
+pdc_xfp_vs_ypfp -nostat
+pdc_xfp_vs_xpfp -nostat
\ No newline at end of file
diff --git a/onlineGUI/Config/SHMS/GEN/hallc_onlana.cfg b/onlineGUI/CONFIG/SHMS/GEN/hallc_onlana.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/GEN/hallc_onlana.cfg
rename to onlineGUI/CONFIG/SHMS/GEN/hallc_onlana.cfg
diff --git a/onlineGUI/Config/SHMS/GEN/shms_stack.cfg b/onlineGUI/CONFIG/SHMS/GEN/shms_stack.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/GEN/shms_stack.cfg
rename to onlineGUI/CONFIG/SHMS/GEN/shms_stack.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/good_phodo_2d.cfg b/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/good_phodo_2d.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/good_phodo_2d_dis.cfg b/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/good_phodo_2d_dis.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/phodo_stand.cfg b/onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/phodo_stand.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/raw_phodo_1x.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/raw_phodo_1x.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/raw_phodo_1y.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/raw_phodo_1y.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/raw_phodo_2d.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/raw_phodo_2d.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/raw_phodo_2d_pad.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/raw_phodo_2d_pad.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/raw_phodo_2x.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/raw_phodo_2x.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/raw_phodo_2y.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/raw_phodo_2y.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg
diff --git a/onlineGUI/Config/SHMS/HODO/raw_phodoana.cfg b/onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/HODO/raw_phodoana.cfg
rename to onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg
diff --git a/onlineGUI/Config/SHMS/RASTER/simple_raster.cfg b/onlineGUI/CONFIG/SHMS/RASTER/simple_raster.cfg
similarity index 100%
rename from onlineGUI/Config/SHMS/RASTER/simple_raster.cfg
rename to onlineGUI/CONFIG/SHMS/RASTER/simple_raster.cfg
diff --git a/onlineGUI/Config/SCALERS/shms_scaler.cfg b/onlineGUI/CONFIG/SHMS/SCALERS/shms_scaler.cfg
similarity index 100%
rename from onlineGUI/Config/SCALERS/shms_scaler.cfg
rename to onlineGUI/CONFIG/SHMS/SCALERS/shms_scaler.cfg
diff --git a/onlineGUI/Config/SHMS/DC/pdc_stand.cfg b/onlineGUI/Config/SHMS/DC/pdc_stand.cfg
deleted file mode 100644
index d67ebc6f..00000000
--- a/onlineGUI/Config/SHMS/DC/pdc_stand.cfg
+++ /dev/null
@@ -1,115 +0,0 @@
-protorootfile ../ROOTfiles/shms_replay_production_XXXXX_1000000.root
-guicolor orange
-canvassize 1200 1000
-
-newpage 2 3
-title SHMS DC raw TDC
-macro    Macros/EXAMPLES/overlay2.C("pdc1u1_raw_tdc","pdc2v1_raw_tdc","1U1","2V1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1u2_raw_tdc","pdc2v2_raw_tdc","1U2","2V2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x1_raw_tdc","pdc2x1_raw_tdc","1X1","2X1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x2_raw_tdc","pdc2x2_raw_tdc","1X2","2X2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v1_raw_tdc","pdc2u1_raw_tdc","1V1","2U1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v2_raw_tdc","pdc2u2_raw_tdc","1V2","2U2")
-
-newpage 3 4 logz
-title SHMS DC raw TDC vs wire
-pdc1u1_raw_tdc_vs_wirenum -colz
-pdc1u2_raw_tdc_vs_wirenum -colz
-pdc1x1_raw_tdc_vs_wirenum -colz
-pdc1x2_raw_tdc_vs_wirenum -colz
-pdc1v1_raw_tdc_vs_wirenum -colz
-pdc1v2_raw_tdc_vs_wirenum -colz
-pdc2v2_raw_tdc_vs_wirenum -colz
-pdc2v1_raw_tdc_vs_wirenum -colz
-pdc2x2_raw_tdc_vs_wirenum -colz
-pdc2x1_raw_tdc_vs_wirenum -colz
-pdc2u2_raw_tdc_vs_wirenum -colz
-pdc2u1_raw_tdc_vs_wirenum -colz
-
-newpage 2 3
-title SHMS DC wire hits
-macro    Macros/EXAMPLES/overlay2.C("pdc1u1_wirenum","pdc2v1_wirenum","1U1","2V1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1u2_wirenum","pdc2v2_wirenum","1U2","2V2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x1_wirenum","pdc2x1_wirenum","1X1","2X1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x2_wirenum","pdc2x2_wirenum","1X2","2X2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v1_wirenum","pdc2u1_wirenum","1V1","2U1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v2_wirenum","pdc2u2_wirenum","1V2","2U2")
-
-newpage 2 3
-title SHMS DC drift distance
-macro    Macros/EXAMPLES/overlay2.C("pdc1u1_ddist","pdc2v1_ddist","1U1","2V1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1u2_ddist","pdc2v2_ddist","1U2","2V2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x1_ddist","pdc2x1_ddist","1X1","2X1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x2_ddist","pdc2x2_ddist","1X2","2X2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v1_ddist","pdc2u1_ddist","1V1","2U1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v2_ddist","pdc2u2_ddist","1V2","2U2")
-
-newpage 3 4 logz
-title SHMS DC drift dist vs wire
-pdc1u1_wirenum_vs_ddist -colz
-pdc1u2_wirenum_vs_ddist -colz
-pdc1x1_wirenum_vs_ddist -colz
-pdc1x2_wirenum_vs_ddist -colz
-pdc1v1_wirenum_vs_ddist -colz
-pdc1v2_wirenum_vs_ddist -colz
-pdc2v2_wirenum_vs_ddist -colz
-pdc2v1_wirenum_vs_ddist -colz
-pdc2x2_wirenum_vs_ddist -colz
-pdc2x1_wirenum_vs_ddist -colz
-pdc2u2_wirenum_vs_ddist -colz
-pdc2u1_wirenum_vs_ddist -colz
-
-newpage 2 3
-title SHMS DC drift time
-macro    Macros/EXAMPLES/overlay2.C("pdc1u1_drifttime","pdc2v1_drifttime","1U1","2V1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1u2_drifttime","pdc2v1_drifttime","1U2","2V2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x1_drifttime","pdc2x1_drifttime","1X1","2X1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x2_drifttime","pdc2x2_drifttime","1X2","2X2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v1_drifttime","pdc2u1_drifttime","1V1","2U1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v2_drifttime","pdc2u2_drifttime","1V2","2U2")
-
-newpage 3 4 logz
-title SHMS DC drift time vs wire
-pdc1u1_drifttime_vs_wirenum -colz
-pdc1u2_drifttime_vs_wirenum -colz
-pdc1x1_drifttime_vs_wirenum -colz
-pdc1x2_drifttime_vs_wirenum -colz
-pdc1v1_drifttime_vs_wirenum -colz
-pdc1v2_drifttime_vs_wirenum -colz
-pdc2v2_drifttime_vs_wirenum -colz
-pdc2v1_drifttime_vs_wirenum -colz
-pdc2x2_drifttime_vs_wirenum -colz
-pdc2x1_drifttime_vs_wirenum -colz
-pdc2u2_drifttime_vs_wirenum -colz
-pdc2u1_drifttime_vs_wirenum -colz
-
-newpage 2 3
-title SHMS DC residuals
-macro    Macros/EXAMPLES/overlay2.C("pdc1u1_residuals","pdc2v1_residuals","1U1","2V1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1u2_residuals","pdc2v2_residuals","1U2","2V2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x1_residuals","pdc2x1_residuals","1X1","2X1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1x2_residuals","pdc2x2_residuals","1X2","2X2")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v1_residuals","pdc2u1_residuals","1V1","2U1")
-macro    Macros/EXAMPLES/overlay2.C("pdc1v2_residuals","pdc2u2_residuals","1V2","2U2")
-
-newpage 3 4 logz
-title SHMS DC residuals vs wire 
-pdc1u1_residuals_vs_wirenum -colz
-pdc1u2_residuals_vs_wirenum -colz
-pdc1x1_residuals_vs_wirenum -colz
-pdc1x2_residuals_vs_wirenum -colz
-pdc1v1_residuals_vs_wirenum -colz
-pdc1v2_residuals_vs_wirenum -colz
-pdc2v2_residuals_vs_wirenum -colz
-pdc2v1_residuals_vs_wirenum -colz
-pdc2x2_residuals_vs_wirenum -colz
-pdc2x1_residuals_vs_wirenum -colz
-pdc2u2_residuals_vs_wirenum -colz
-pdc2u1_residuals_vs_wirenum -colz
-
-newpage 2 2 
-title SHMS DC track at focal plane
-pdc_xfp_vs_yxp -nostat
-pdc_xpfp_vs_ypfp -nostat
-pdc_xfp_vs_ypfp -nostat
-pdc_xfp_vs_xpfp -nostat
\ No newline at end of file
diff --git a/onlineGUI/Macros/EXAMPLES/overlay.C b/onlineGUI/Macros/EXAMPLES/overlay.C
deleted file mode 100755
index ac7f0389..00000000
--- a/onlineGUI/Macros/EXAMPLES/overlay.C
+++ /dev/null
@@ -1,54 +0,0 @@
-void overlay(TString hist1name, TString hist2name, Bool_t golden=false,TString samestr=""){
-  TH1F* H1;
-  TH1F* H2;
-  
-  H1 = (TH1F*) gDirectory->Get(hist1name);
-  H2 = (TH1F*) gDirectory->Get(hist2name);
-  if (H1 && H2) {
-  if(golden){
-    H1->SetLineColor(30);
-    H1->SetFillColor(30);
-    H1->SetFillStyle(3027);
-    H2->SetLineColor(46);
-    H2->SetFillColor(46);
-    H2->SetFillStyle(3027);
-  } else {
-    H1->SetLineColor(4);
-    H2->SetLineColor(2);
-    H1->SetStats(0);
-    H2->SetStats(0);
-    H1->SetMinimum(0);
-    H2->SetMinimum(0);
-  }
-
-  if(golden){
-    if(!samestr.Contains("sames")) samestr += "sames";
-    H1->Draw(samestr);
-    H2->Draw(samestr);
-  } else {
-    if(!golden && !samestr.Contains("sames")){
-      // pick which hist to draw first:
-      if(H1->GetMaximum() > H2->GetMaximum()){
-	H1->Draw(samestr);
-	if(!samestr.Contains("sames")) samestr += "sames";
-	H2->Draw(samestr);
-      } else {
-	H2->Draw(samestr);
-	if(!samestr.Contains("sames")) samestr += "sames";
-	H1->Draw(samestr);
-      }
-    } else {
-      H1->Draw(samestr);
-      if(!samestr.Contains("sames")) samestr += "sames";
-      H2->Draw(samestr);
-    H2->GetXaxis()->SetTitleOffset(.6);
-    H2->GetXaxis()->SetTitleSize(0.08);
-    H2->GetYaxis()->SetTitleOffset(.6);
-    H2->GetYaxis()->SetTitleSize(0.08);
-    }
-  }
-  } else {
-    if (!H1) cout << " Histogram " << hist1name << " does not exist" << endl;
-    if (!H2) cout << " Histogram " << hist2name << " does not exist" << endl;
-  }
-}
diff --git a/onlineGUI/README.md b/onlineGUI/README.md
index 2f31aaf6..b003f26d 100644
--- a/onlineGUI/README.md
+++ b/onlineGUI/README.md
@@ -4,22 +4,13 @@ This is the GUI that is used for the monitoring of online replay.
 
 Directory structure
 ----------------------
-* Config : directory with the  onlineGUI configuration files
-  *Files in Config:
-    *HMS/HODO/raw_hhodoana.cfg (Plots standard  hisotgrams in DEF-files/HMS/HODO/hhodoana.def )
-    *SHMS/HODO/raw_phodoana.cfg (Plots standard  hisotgrams in DEF-files/SHMS/HODO/phodoana.def )
-    *HMS/HODO/raw_hhodo_2d.cfg (2d plots of Good HMS Hodoscope data, efficiency plots)
-    *HMS/HODO/good_hhodo_2d.cfg (2d plots of Good HMS Hodoscope data, efficiency plots)
-    *SHMS/HODO/good_phodo_2d.cfg (2d of Good SHMS Hodoscope data, efficiency plots)
-* Macros : directory with root macros that can be called by the onlineGUI code
-  * Files in Macro: 
-    * overlay.C (script to overlay 2 histograms)
-    * rawdraw_2d_hhodo.C ( Used by raw_hhodo_2d.cfg)
-    * rawdraw_2d_phodo.C ( Used by raw_phodo_2d.cfg)
-    * gooddraw_2d_hhodo.C ( Used by good_hhodo_2d.cfg)
-    * gooddraw_2d_phodo.C ( Used by good_phodo_2d.cfg)
-    * hodo_efficiency.C ( Used by good_phodo_2d.cfg,good_hhodo_2d.cfg)
-* onlineGUI_v1.2.1: directory with the online.c and other files.
+* CONFIG : directory with the  onlineGUI configuration files
+  This folder is organized by spectrometer, then by system. A GEN top level 
+  folder contains .cfg files that contain whole runs or multiple systems.
+* UTIL : directory with root macros that can be called by the onlineGUI code
+  This folder is organized by spectrometer, then by system. A GEN top level
+  folder contains codes that are non-specific toward the detector system.
+* onlineGUI_v1.2.1: directory with the online.c and its dependencies.
 
 Compiling code
 ----------------------
@@ -30,8 +21,8 @@ Documentation and Running the code
 ----------------
 * The pdf file  guiHOWTO2007.pdf documents how to use the code
 * One method to run the code is:
-  * online -f Config/hmsdc.cfg -r 60
-  * "60" is the run number
-  * This assumes that hmsdc.cfg as a line such as:protorootfile ../ROOTfiles/hms1190_XXXXX.root
+  * online -f CONFIG/kpp.cfg -r 488
+  * "488" is the run number
+  * This looks for a file following the format in the .cfg file:protorootfile ../ROOTfiles/shms_replay_XXXXX.root
 
 
diff --git a/onlineGUI/Macros/comp_histos.C b/onlineGUI/UTIL/GEN/comp_histos.C
similarity index 100%
rename from onlineGUI/Macros/comp_histos.C
rename to onlineGUI/UTIL/GEN/comp_histos.C
diff --git a/onlineGUI/Macros/EXAMPLES/hodo_efficiency.C b/onlineGUI/UTIL/GEN/hodo_efficiency.C
similarity index 100%
rename from onlineGUI/Macros/EXAMPLES/hodo_efficiency.C
rename to onlineGUI/UTIL/GEN/hodo_efficiency.C
diff --git a/onlineGUI/Macros/EXAMPLES/EXAMPLE/kpp_analysis.C b/onlineGUI/UTIL/GEN/kpp_analysis.C
similarity index 100%
rename from onlineGUI/Macros/EXAMPLES/EXAMPLE/kpp_analysis.C
rename to onlineGUI/UTIL/GEN/kpp_analysis.C
diff --git a/onlineGUI/Macros/EXAMPLES/overlay2.C b/onlineGUI/UTIL/GEN/overlay2.C
similarity index 100%
rename from onlineGUI/Macros/EXAMPLES/overlay2.C
rename to onlineGUI/UTIL/GEN/overlay2.C
diff --git a/onlineGUI/Macros/EXAMPLES/rawdraw.C b/onlineGUI/UTIL/GEN/rawdraw.C
similarity index 100%
rename from onlineGUI/Macros/EXAMPLES/rawdraw.C
rename to onlineGUI/UTIL/GEN/rawdraw.C
diff --git a/onlineGUI/Macros/HMS/HODO/gooddraw_2d_hhodo.C b/onlineGUI/UTIL/HMS/HODO/gooddraw_2d_hhodo.C
similarity index 100%
rename from onlineGUI/Macros/HMS/HODO/gooddraw_2d_hhodo.C
rename to onlineGUI/UTIL/HMS/HODO/gooddraw_2d_hhodo.C
diff --git a/onlineGUI/Macros/HMS/HODO/rawdraw_2d_hhodo.C b/onlineGUI/UTIL/HMS/HODO/rawdraw_2d_hhodo.C
similarity index 100%
rename from onlineGUI/Macros/HMS/HODO/rawdraw_2d_hhodo.C
rename to onlineGUI/UTIL/HMS/HODO/rawdraw_2d_hhodo.C
diff --git a/onlineGUI/Macros/HMS/HODO/rawdraw_hhodo.C b/onlineGUI/UTIL/HMS/HODO/rawdraw_hhodo.C
similarity index 100%
rename from onlineGUI/Macros/HMS/HODO/rawdraw_hhodo.C
rename to onlineGUI/UTIL/HMS/HODO/rawdraw_hhodo.C
diff --git a/onlineGUI/Macros/SCALERS/plot_hms_scalers.C b/onlineGUI/UTIL/HMS/SCALERS/plot_hms_scalers.C
similarity index 100%
rename from onlineGUI/Macros/SCALERS/plot_hms_scalers.C
rename to onlineGUI/UTIL/HMS/SCALERS/plot_hms_scalers.C
diff --git a/onlineGUI/Macros/SHMS/CER/cer_2d_ratio.C b/onlineGUI/UTIL/SHMS/CER/cer_2d_ratio.C
similarity index 100%
rename from onlineGUI/Macros/SHMS/CER/cer_2d_ratio.C
rename to onlineGUI/UTIL/SHMS/CER/cer_2d_ratio.C
diff --git a/onlineGUI/Macros/SHMS/HODO/gooddraw_2d_phodo.C b/onlineGUI/UTIL/SHMS/HODO/gooddraw_2d_phodo.C
similarity index 100%
rename from onlineGUI/Macros/SHMS/HODO/gooddraw_2d_phodo.C
rename to onlineGUI/UTIL/SHMS/HODO/gooddraw_2d_phodo.C
diff --git a/onlineGUI/Macros/SHMS/HODO/rawdraw_2d_phodo.C b/onlineGUI/UTIL/SHMS/HODO/rawdraw_2d_phodo.C
similarity index 100%
rename from onlineGUI/Macros/SHMS/HODO/rawdraw_2d_phodo.C
rename to onlineGUI/UTIL/SHMS/HODO/rawdraw_2d_phodo.C
diff --git a/onlineGUI/Macros/SHMS/HODO/rawdraw_phodo.C b/onlineGUI/UTIL/SHMS/HODO/rawdraw_phodo.C
similarity index 100%
rename from onlineGUI/Macros/SHMS/HODO/rawdraw_phodo.C
rename to onlineGUI/UTIL/SHMS/HODO/rawdraw_phodo.C
diff --git a/onlineGUI/Macros/SCALERS/plot_shms_scalers.C b/onlineGUI/UTIL/SHMS/SCALERS/plot_shms_scalers.C
similarity index 100%
rename from onlineGUI/Macros/SCALERS/plot_shms_scalers.C
rename to onlineGUI/UTIL/SHMS/SCALERS/plot_shms_scalers.C
diff --git a/onlineGUI/onlineGUI_v1.2.1/online.C b/onlineGUI/onlineGUI_v1.2.1/online.C
index 72c62caa..534cc609 100755
--- a/onlineGUI/onlineGUI_v1.2.1/online.C
+++ b/onlineGUI/onlineGUI_v1.2.1/online.C
@@ -980,8 +980,13 @@ void OnlineGUI::CreateGUI(const TGWindow *p, UInt_t w, UInt_t h)
 
 void OnlineGUI::DoDraw()
 {
+<<<<<<< Updated upstream
     // The main Drawing Routine.
 
+=======
+  // The main Drawing Routine.
+ 
+>>>>>>> Stashed changes
 #ifdef INTERNALSTYLE
     gStyle->SetOptStat(1110);
     gStyle->SetStatFontSize(0.1);
@@ -1002,6 +1007,7 @@ void OnlineGUI::DoDraw()
         gStyle->SetOptLogz(0);
     }
 #ifdef INTERNALSTYLE
+<<<<<<< Updated upstream
     gStyle->SetTitleH(0.10);
     gStyle->SetTitleW(0.40);
     //   gStyle->SetLabelSize(0.10,"X");
@@ -1013,6 +1019,21 @@ void OnlineGUI::DoDraw()
     gStyle->SetNdivisions(404,"Y");
     gStyle->SetPalette(1);
     gROOT->ForceStyle();
+=======
+  gStyle->SetTitleH(0.10);
+  gStyle->SetTitleW(0.40);
+  //gStyle->SetLabelSize(0.10,"X");
+  //gStyle->SetLabelSize(0.10,"Y");
+  gStyle->SetLabelSize(0.05,"X");
+  gStyle->SetLabelSize(0.05,"Y");
+  gStyle->SetTitleSize(0.045,"X");
+  gStyle->SetTitleSize(0.045,"Y");
+  gStyle->SetPadLeftMargin(0.14);
+  gStyle->SetNdivisions(505,"X");
+  gStyle->SetNdivisions(404,"Y");
+  gStyle->SetPalette(1);
+  gROOT->ForceStyle();
+>>>>>>> Stashed changes
 #endif
 
     // Determine the dimensions of the canvas..
-- 
GitLab