diff --git a/.gitignore b/.gitignore
index a07d797a1822a9e346c317da492049c7e0a59d69..b95fc3124e49d320ede6a448b64db97170cdf024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,4 @@ CALIBRATION/shms_cal_calib/pcal_calib_cpp_ACLiC_dict_rdict.pcm
 CALIBRATION/*/data_files/*		
 CALIBRATION/*/root_files/*
 onlineGUI/onlineGUI_v1.2.1/onlineDict_rdict.pcm
-onlineGUI/onlineGUI_v1.2.1/onlineDict.h
 
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_303.param b/DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_303.param
rename to DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param
diff --git a/DBASE/HMS/GEN/general.param b/DBASE/HMS/GEN/general.param
new file mode 100644
index 0000000000000000000000000000000000000000..584a2217466243b2628e95d94be45ee87abedfbb
--- /dev/null
+++ b/DBASE/HMS/GEN/general.param
@@ -0,0 +1,38 @@
+#real raddeg
+raddeg=3.14159265/180
+#real cminch
+cminch=2.54
+
+; General Hall-C parameter files
+#include "PARAM/GEN/genflags.param"
+#include "PARAM/GEN/gdebug.param"
+#include "PARAM/GEN/gtarget.param"
+#include "PARAM/GEN/gbeam.param"
+
+; General HMS parameter files
+; Note: hmsflags.param includes spectrometer offsets and options.
+#include "PARAM/HMS/GEN/hcana.param"
+#include "PARAM/HMS/GEN/hdebug.param"
+#include "PARAM/HMS/GEN/hmsflags.param"
+#include "PARAM/HMS/GEN/htracking.param"
+
+; HMS default geometry parameter files 
+#include "PARAM/HMS/CER/GEOM/hcer_geom.param"
+#include "PARAM/HMS/DC/GEOM/hdc_geom_6gev.param"
+#include "PARAM/HMS/HODO/GEOM/hhodo_geom.param"
+#include "PARAM/HMS/AERO/GEOM/haero_geom.param"
+#include "PARAM/HMS/CAL/GEOM/hcal_geom.param"
+
+; HMS default cut parameter files
+#include "PARAM/HMS/CER/CUTS/hcer_cuts.param"
+#include "PARAM/HMS/DC/CUTS/hdc_cuts_6gev.param"
+#include "PARAM/HMS/HODO/CUTS/hhodo_cuts.param"
+#include "PARAM/HMS/AERO/CUTS/haero_cuts.param"
+#include "PARAM/HMS/CAL/CUTS/hcal_cuts.param"
+
+; HMS default calibration parameter files
+#include "PARAM/HMS/CER/CALIB/hcer_calib.param"
+#include "PARAM/HMS/DC/CALIB/hdc_calib_6gev.param"
+#include "PARAM/HMS/HODO/CALIB/hhodo_calib.param"
+#include "PARAM/HMS/AERO/CALIB/haero_calib.param"
+#include "PARAM/HMS/CAL/CALIB/hcal_calib.param"
\ No newline at end of file
diff --git a/DBASE/HMS/STD/standard.database b/DBASE/HMS/STD/standard.database
new file mode 100644
index 0000000000000000000000000000000000000000..d293eb4905069c3e71c9ac9c652ecee9d50071f4
--- /dev/null
+++ b/DBASE/HMS/STD/standard.database
@@ -0,0 +1,6 @@
+0-99999
+g_ctp_parm_filename ="DBASE/HMS/GEN/general.param"
+g_ctp_kinematics_filename ="DBASE/HMS/STD/standard.kinematics"
+
+303-303
+g_ctp_calib_filename ="DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param"
\ No newline at end of file
diff --git a/DBASE/HMS/STD/standard.kinematics b/DBASE/HMS/STD/standard.kinematics
new file mode 100644
index 0000000000000000000000000000000000000000..92aa0e37bb98843f8823e5beedece5941a8d3e99
--- /dev/null
+++ b/DBASE/HMS/STD/standard.kinematics
@@ -0,0 +1,6 @@
+0-99999
+gpbeam = 6.4
+gtarg_num = 1
+htheta_lab = 15.
+hpcentral = 3.
+hpartmass = 0.00051099
\ No newline at end of file
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_464.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_464.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_469.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_469.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_475.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_475.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_478.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_478.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_479.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_479.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_480.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_480.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_481.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_481.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_483.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_483.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_484.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_484.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_486.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_486.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_486.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_486.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_487.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_487.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_487.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_487.param
diff --git a/DBASE/GEN/KPP_Spring_2017/calib_488.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_488.param
similarity index 100%
rename from DBASE/GEN/KPP_Spring_2017/calib_488.param
rename to DBASE/SHMS/GEN/KPP_Spring_2017/calib_488.param
diff --git a/DBASE/GEN/general.param b/DBASE/SHMS/GEN/general.param
similarity index 58%
rename from DBASE/GEN/general.param
rename to DBASE/SHMS/GEN/general.param
index 32d527da77a9b97e59d0527c62a5ba9e24a38774..1a9ebb4927d78ca501b0aea7ef37f843e6d527c3 100644
--- a/DBASE/GEN/general.param
+++ b/DBASE/SHMS/GEN/general.param
@@ -9,35 +9,6 @@ cminch=2.54
 #include "PARAM/GEN/gtarget.param"
 #include "PARAM/GEN/gbeam.param"
 
-; General HMS parameter files
-; Note: hmsflags.param includes spectrometer offsets and options.
-#include "PARAM/HMS/GEN/hcana.param"
-#include "PARAM/HMS/GEN/hdebug.param"
-#include "PARAM/HMS/GEN/hmsflags.param"
-#include "PARAM/HMS/GEN/htracking.param"
-
-; HMS default geometry parameter files 
-#include "PARAM/HMS/CER/GEOM/hcer_geom.param"
-#include "PARAM/HMS/DC/GEOM/hdc_geom_6gev.param"
-#include "PARAM/HMS/HODO/GEOM/hhodo_geom.param"
-#include "PARAM/HMS/AERO/GEOM/haero_geom.param"
-#include "PARAM/HMS/CAL/GEOM/hcal_geom.param"
-
-; HMS default cut parameter files
-#include "PARAM/HMS/CER/CUTS/hcer_cuts.param"
-#include "PARAM/HMS/DC/CUTS/hdc_cuts_6gev.param"
-#include "PARAM/HMS/HODO/CUTS/hhodo_cuts.param"
-#include "PARAM/HMS/AERO/CUTS/haero_cuts.param"
-#include "PARAM/HMS/CAL/CUTS/hcal_cuts.param"
-
-; HMS default calibration parameter files
-#include "PARAM/HMS/CER/CALIB/hcer_calib.param"
-#include "PARAM/HMS/DC/CALIB/hdc_calib_6gev.param"
-#include "PARAM/HMS/HODO/CALIB/hhodo_calib.param"
-#include "PARAM/HMS/AERO/CALIB/haero_calib.param"
-#include "PARAM/HMS/CAL/CALIB/hcal_calib.param"  
-
-
 ; General SHMS parameter files
 ; Note: shmsflags.param includes spectrometer offsets and options.
 #include "PARAM/SHMS/GEN/pcana.param"
diff --git a/DBASE/SHMS/STD/standard.database b/DBASE/SHMS/STD/standard.database
new file mode 100644
index 0000000000000000000000000000000000000000..9677295561b90bfbf4835a9118614a07be13bd47
--- /dev/null
+++ b/DBASE/SHMS/STD/standard.database
@@ -0,0 +1,39 @@
+0-99999
+g_ctp_parm_filename ="DBASE/SHMS/GEN/general.param"
+g_ctp_kinematics_filename ="DBASE/SHMS/STD/standard.kinematics"
+
+464-464
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param"
+
+469-469
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param"
+
+475-475
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param"
+
+478-478
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param"
+
+479-479
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param"
+
+480-480
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param"
+
+481-481
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param"
+
+483-483
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param"
+
+484-484
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param"
+
+486-486
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_486.param"
+
+487-487
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_487.param"
+
+488-488
+g_ctp_calib_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/calib_488.param"
diff --git a/DBASE/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
similarity index 70%
rename from DBASE/STD/standard.kinematics
rename to DBASE/SHMS/STD/standard.kinematics
index 8534e7c818c7abd8714def18fc82666a3b631c1b..cebcd310ac9ff8a298686a4ae6949053ee45df4e 100644
--- a/DBASE/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -1,11 +1,8 @@
 0-99999
 gpbeam = 6.4
 gtarg_num = 1
-htheta_lab = 15.
 ptheta_lab = 15.
-hpcentral = 3.
 ppcentral = 3.
-hpartmass = 0.00051099
 ppartmass = 0.00051099
 ptargmass_amu=12.0
 465-465
diff --git a/DBASE/STD/standard.database b/DBASE/STD/standard.database
deleted file mode 100644
index d1d852bf2c5f619524c9bd05ecc48839f12225f9..0000000000000000000000000000000000000000
--- a/DBASE/STD/standard.database
+++ /dev/null
@@ -1,42 +0,0 @@
-0-99999
-g_ctp_parm_filename ="DBASE/GEN/general.param"
-g_ctp_kinematics_filename ="DBASE/STD/standard.kinematics"
-
-303-303
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_303.param"
-
-464-464
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_464.param"
-
-469-469
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_469.param"
-
-475-475
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_475.param"
-
-478-478
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_478.param"
-
-479-479
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_479.param"
-
-480-480
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_480.param"
-
-481-481
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_481.param"
-
-483-483
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_483.param"
-
-484-484
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_484.param"
-
-486-486
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_486.param"
-
-487-487
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_487.param"
-
-488-488
-g_ctp_calib_filename ="DBASE/GEN/KPP_Spring_2017/calib_488.param"
diff --git a/DEF-files/HMS/SCALERS/hscaler_cuts.def b/DEF-files/HMS/SCALERS/hscaler_cuts.def
index 0e461516a77e5581f734e557d6325b48f26210a2..d3ddb924e900aae0a2eb571081457ca75f997ec3 100644
--- a/DEF-files/HMS/SCALERS/hscaler_cuts.def
+++ b/DEF-files/HMS/SCALERS/hscaler_cuts.def
@@ -5,23 +5,23 @@ Block: RawDecode
 Pedestal_event     g.evtyp==4
 scalar_event       g.evtyp==0
 HMS_event          g.evtyp==1
-#SHMS_event        g.evtyp==2
-#coin_event        g.evtyp==3
+SHMS_event         g.evtyp==1
+coin_event         g.evtyp==3
 tr4_event          g.evtyp==4
 tr5_event          g.evtyp==5
 tr6_event          g.evtyp==6
 misc_event         g.evtyp>=10
-#hmscoin_event     g.evtyp==1||g.evtyp==3
-#shmscoin_event    g.evtyp==2||g.evtyp==3
-#all_event         g.evtyp==1||g.evtyp==2||g.evtyp==3
+hmscoin_event     g.evtyp==1||g.evtyp==3
+shmscoin_event    g.evtyp==2||g.evtyp==3
+all_event         g.evtyp==1||g.evtyp==2||g.evtyp==3
 
 RawDecode_master  1
 
 Block: Decode
 
-#all_trigs            g.evtyp==1 || g.evtyp==2 || g.evtyp==3
-#hms_shms_trig        g.evtyp==1 || g.evtyp==2
-#hms_coin_trig        g.evtyp==1 || g.evtyp==3
+all_trigs            g.evtyp==1 || g.evtyp==2 || g.evtyp==3
+hms_shms_trig        g.evtyp==1 || g.evtyp==2
+hms_coin_trig        g.evtyp==1 || g.evtyp==3
 
 Decode_master     HMS_event
 
diff --git a/DEF-files/HMS/STACK/TRIG/htrig_histos.def b/DEF-files/HMS/STACK/TRIG/htrig_histos.def
index b094df93083ed475eb209808797187960b7363c8..85f7ab0d722b9a7f53453e341eb0620fef5d10b8 100644
--- a/DEF-files/HMS/STACK/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/STACK/TRIG/htrig_histos.def
@@ -67,7 +67,6 @@ TH1F htrig_hdsum_tdc 'HMS hDsum TDC Time;  TDC Time (TDC Units); Counts / 10 TDC
 TH1F htrig_hpreShwr_adc_pped 'HMS Pre-Shower Pulse Pedestal;  Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hPSHWR_adcPed 5000 0 5000
 TH1F htrig_hpreShwr_adc_pi 'HMS Pre-Shower Pulse Integral;  Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hPSHWR_adcPulseInt 800 0 40000
 TH1F htrig_hpreShwr_adc_pamp 'HMS Pre-Shower Pulse Amplitude;  Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hPSHWR_adcPulseAmp 205 0 4100
-TH1F htrig_hpreShwr_tdc 'HMS Pre-Shower TDC Time;  TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWR_tdcTime 4000 0 40000
 
 #-----------------------------
 # HMS PreShower TRIG LOW/HIGH  
@@ -113,18 +112,18 @@ TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time;  TDC Time (TDC Units); Counts
 # Assume FADC range is set to 1V and the integration is 25 channels
 # Offset in the FADC is about 0.122V or 500 channels.
 
-formula FRXA_V T.hms.pFRXA_adcPulseIntRaw*(1./4096.)/25.
-formula FRXB_V T.hms.pFRXB_adcPulseIntRaw*(1./4096.)/25.
-formula FRYA_V T.hms.pFRYA_adcPulseIntRaw*(1./4096.)/25.
-formula FRYB_V T.hms.pFRYB_adcPulseIntRaw*(1./4096.)/25.
+formula FRXA_V T.hms.hFRXA_adcPulseIntRaw*(1./4096.)/25.
+formula FRXB_V T.hms.hFRXB_adcPulseIntRaw*(1./4096.)/25.
+formula FRYA_V T.hms.hFRYA_adcPulseIntRaw*(1./4096.)/25.
+formula FRYB_V T.hms.hFRYB_adcPulseIntRaw*(1./4096.)/25.
 
-TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' T.hms.pFRXA_adcPulseIntRaw 1000 0 100000
+TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' T.hms.hFRXA_adcPulseIntRaw 1000 0 100000
 TH1F hFRXA_V 'HMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' T.hms.pFRXB_adcPulseIntRaw 1000 0 100000
+TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' T.hms.hFRXB_adcPulseIntRaw 1000 0 100000
 TH1F hFRXB_V 'HMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' T.hms.pFRYA_adcPulseIntRaw 1000 0 100000
+TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' T.hms.hFRYA_adcPulseIntRaw 1000 0 100000
 TH1F hFRYA_V 'HMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' T.hms.pFRYB_adcPulseIntRaw 1000 0 100000
+TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' T.hms.hFRYB_adcPulseIntRaw 1000 0 100000
 TH1F hFRYB_V 'HMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
 TH2F hFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
 TH2F hFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
diff --git a/DEF-files/HMS/STACK/hstackana.def b/DEF-files/HMS/STACK/hstackana.def
index c29c27d8f65c387c37ae8d8a6c217bae34d089e8..6378b365f0dc1a55f48ff92dfd7abf0439795c34 100644
--- a/DEF-files/HMS/STACK/hstackana.def
+++ b/DEF-files/HMS/STACK/hstackana.def
@@ -537,7 +537,6 @@ TH1F htrig_hdsum_tdc 'HMS hDsum TDC Time;  TDC Time (TDC Units); Counts / 10 TDC
 TH1F htrig_hpreShwr_adc_pped 'HMS Pre-Shower Pulse Pedestal;  Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hPSHWR_adcPed 5000 0 5000
 TH1F htrig_hpreShwr_adc_pi 'HMS Pre-Shower Pulse Integral;  Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hPSHWR_adcPulseInt 800 0 40000
 TH1F htrig_hpreShwr_adc_pamp 'HMS Pre-Shower Pulse Amplitude;  Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hPSHWR_adcPulseAmp 205 0 4100
-TH1F htrig_hpreShwr_tdc 'HMS Pre-Shower TDC Time;  TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPSHWR_tdcTime 4000 0 40000
 
 #-----------------------------
 # HMS PreShower TRIG LOW/HIGH  
@@ -583,18 +582,18 @@ TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time;  TDC Time (TDC Units); Counts
 # Assume FADC range is set to 1V and the integration is 25 channels
 # Offset in the FADC is about 0.122V or 500 channels.
 
-formula FRXA_V T.hms.pFRXA_adcPulseIntRaw*(1./4096.)/25.
-formula FRXB_V T.hms.pFRXB_adcPulseIntRaw*(1./4096.)/25.
-formula FRYA_V T.hms.pFRYA_adcPulseIntRaw*(1./4096.)/25.
-formula FRYB_V T.hms.pFRYB_adcPulseIntRaw*(1./4096.)/25.
+formula FRXA_V T.hms.hFRXA_adcPulseIntRaw*(1./4096.)/25.
+formula FRXB_V T.hms.hFRXB_adcPulseIntRaw*(1./4096.)/25.
+formula FRYA_V T.hms.hFRYA_adcPulseIntRaw*(1./4096.)/25.
+formula FRYB_V T.hms.hFRYB_adcPulseIntRaw*(1./4096.)/25.
 
-TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' T.hms.pFRXA_adcPulseIntRaw 1000 0 100000
+TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' T.hms.hFRXA_adcPulseIntRaw 1000 0 100000
 TH1F hFRXA_V 'HMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' T.hms.pFRXB_adcPulseIntRaw 1000 0 100000
+TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' T.hms.hFRXB_adcPulseIntRaw 1000 0 100000
 TH1F hFRXB_V 'HMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' T.hms.pFRYA_adcPulseIntRaw 1000 0 100000
+TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' T.hms.hFRYA_adcPulseIntRaw 1000 0 100000
 TH1F hFRYA_V 'HMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' T.hms.pFRYB_adcPulseIntRaw 1000 0 100000
+TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' T.hms.hFRYB_adcPulseIntRaw 1000 0 100000
 TH1F hFRYB_V 'HMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
 TH2F hFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
 TH2F hFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
diff --git a/DEF-files/HMS/STACK/hstackana_cuts.def b/DEF-files/HMS/STACK/hstackana_cuts.def
index f787145d2ffbc7154a600f29caf4340ded912764..7c5d068e8907cb4671f062155e13baf0f775ce7c 100644
--- a/DEF-files/HMS/STACK/hstackana_cuts.def
+++ b/DEF-files/HMS/STACK/hstackana_cuts.def
@@ -6,23 +6,23 @@ Block: RawDecode
 Pedestal_event     g.evtyp==4
 scalar_event       g.evtyp==0
 HMS_event          g.evtyp==1
-#SHMS_event        g.evtyp==2
-#coin_event        g.evtyp==3
+SHMS_event         g.evtyp==1
+coin_event         g.evtyp==3
 tr4_event          g.evtyp==4
 tr5_event          g.evtyp==5
 tr6_event          g.evtyp==6
 misc_event         g.evtyp>=10
-#hmscoin_event      g.evtyp==1||g.evtyp==3
-#shmscoin_event     g.evtyp==2||g.evtyp==3
-#all_event          g.evtyp==1||g.evtyp==2||g.evtyp==3
+hmscoin_event      g.evtyp==1||g.evtyp==3
+shmscoin_event     g.evtyp==2||g.evtyp==3
+all_event          g.evtyp==1||g.evtyp==2||g.evtyp==3
 
 RawDecode_master  1
 
 Block: Decode
 
-#all_trigs             g.evtyp==1 || g.evtyp==2 || g.evtyp==3
-#hms_shms_trig          g.evtyp==1 || g.evtyp==2
-#hms_coin_trig         g.evtyp==1 || g.evtyp==3
+all_trigs             g.evtyp==1 || g.evtyp==2 || g.evtyp==3
+hms_shms_trig          g.evtyp==1 || g.evtyp==2
+hms_coin_trig         g.evtyp==1 || g.evtyp==3
 
 
 Decode_master     HMS_event
diff --git a/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def b/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def
index 2d64c2e9eb09bf52fa7b2787fabf39b9f9807ce6..923bf801652bf95a147fbfbb7eba708530a69f1b 100644
--- a/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def
+++ b/DEF-files/HMS/TEST_STANDS/CAL/hcalana.def
@@ -5,12 +5,12 @@ block H.cal.*
 #HMS CALORIMETER HISTOGRAMS
 
 #FPGA Error Flags
-TH1F hcal_hA_adcErrFlg2D_pos 'HMS hA+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
-TH1F hcal_hA_adcErrFlg2D_neg 'HMS hA- FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
-TH1F hcal_hB_adcErrFlg2D_pos 'HMS hB+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
-TH1F hcal_hB_adcErrFlg2D_neg 'HMS hB- FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.2ta.negAdcCounter H.cal.2ta.negAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
-TH1F hcal_hC_adcErrFlg2D_pos 'HMS hC+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
-TH1F hcal_hD_adcErrFlg2D_pos 'HMS hD+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
+TH2F hcal_hA_adcErrFlg2D_pos 'HMS hA+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
+TH2F hcal_hA_adcErrFlg2D_neg 'HMS hA- FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.1pr.negAdcCounter H.cal.1pr.negAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
+TH2F hcal_hB_adcErrFlg2D_pos 'HMS hB+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.2ta.posAdcCounter H.cal.2ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
+TH2F hcal_hB_adcErrFlg2D_neg 'HMS hB- FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.2ta.negAdcCounter H.cal.2ta.negAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
+TH2F hcal_hC_adcErrFlg2D_pos 'HMS hC+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.3ta.posAdcCounter H.cal.3ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
+TH2F hcal_hD_adcErrFlg2D_pos 'HMS hD+ FPGA Error Flag; Error Flag; PMT Number; Error Flag' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5
 
 #Raw Occupancy
 TH1F hcal_hA_raw_occ_pos 'HMS hA+ Raw Occupancy; PMT Number; Number of Entries' H.cal.1pr.posAdcCounter 13 0.5 13.5
diff --git a/DEF-files/HMS/TEST_STANDS/CER/hcerana.def b/DEF-files/HMS/TEST_STANDS/CER/hcerana.def
index 83503cbed11e8878e8700d06a854135f53058930..9931c42ab2476fd6e2e841853edcf3a8e2127d33 100644
--- a/DEF-files/HMS/TEST_STANDS/CER/hcerana.def
+++ b/DEF-files/HMS/TEST_STANDS/CER/hcerana.def
@@ -4,7 +4,7 @@ block H.cer.*
 block T.hms.*
 
 # HMS CER Error FPGA Error Flag
-TH2F hcer_adcErrFlg2D_pos 'HMS Cherenkov FPGA Error Flag; Number of Entries' H.cer.posAdcCounter H.cer.posAdcErrorFlag 2 0.5 2.5 2 -0.5 1.5
+TH2F hcer_adcErrFlg2D 'HMS Cherenkov FPGA Error Flag; Number of Entries' H.cer.adcCounter H.cer.adcErrorFlag 2 0.5 2.5 2 -0.5 1.5
 
 # HMS CER Raw Occupancy and Multiplicity
 TH1F hcer_raw_occ 'HMS Cherenkov Raw Occupancy; PMT Number; Number of Entries' H.cer.adcCounter 2 0.5 2.5
diff --git a/DEF-files/SHMS/SCALERS/pscaler_cuts.def b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
index af374d29493dde7fbdb84559f07c6cdd7bde7323..4868f694798b9feffa8f308c4182381563e98681 100644
--- a/DEF-files/SHMS/SCALERS/pscaler_cuts.def
+++ b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
@@ -4,20 +4,20 @@ Block: RawDecode
 
 Pedestal_event     g.evtyp == 4
 scalar_event       g.evtyp == 0
-#HMS_event          g.evtyp == 1
+HMS_event          g.evtyp == 1
 SHMS_event         g.evtyp == 1
-#coin_event         g.evtyp == 3
+coin_event         g.evtyp == 3
 misc_event         g.evtyp >= 5
-#hmscoin_event      HMS_event || coin_event
-#shmscoin_event     SHMS_event || coin_event
-#all_event          HMS_event || SHMS_event || coin_event
+hmscoin_event      HMS_event || coin_event
+shmscoin_event     SHMS_event || coin_event
+all_event          HMS_event || SHMS_event || coin_event
 
 RawDecode_master  1
 
 Block: Decode
 
-#all_trigs          HMS_event || SHMS_event || coin_event
-#shms_coin_trig     SHMS_event || coin_event
+all_trigs          HMS_event || SHMS_event || coin_event
+shms_coin_trig     SHMS_event || coin_event
 
 Decode_master     SHMS_event
 
diff --git a/PARAM/HMS/GEN/h_fadc_debug.param b/PARAM/HMS/GEN/h_fadc_debug.param
index 6dc14cc8d6d8f57352c9503192c93ae58fe0728b..9b9e8868980bfbe1208aba917ff5a9bd4eca3acc 100644
--- a/PARAM/HMS/GEN/h_fadc_debug.param
+++ b/PARAM/HMS/GEN/h_fadc_debug.param
@@ -1,2 +1,5 @@
 hcer_debug_adc = 1
-hcal_debug_adc = 1
\ No newline at end of file
+hcal_debug_adc = 1
+hhodo_debug_adc = 1
+hdc_debug_adc = 1
+haero_debug_adc = 1
\ No newline at end of file
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
index cb5d01d0fe3920890d5f21d0b1f2adf6cb556d0b..dc44af6c828bb33610ab195ae1aed957f54d6ce8 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
@@ -22,7 +22,7 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   //Load Global parameters
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
@@ -68,8 +68,8 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Add Ideal Beam Apparatus
   THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
   gHaApps->Add(beam);
-  // Add Physics Module to calculate primary (scattered beam - usually electron) kinematics
-  THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS single arm e- kinematics", "H", "IB");
+  // Add Physics Module to calculate primary (scattered) beam kinematics
+  THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "IB");
   gHaPhysics->Add(hkin);
 
   // Add handler for prestart event 125.
diff --git a/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C b/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C
index f23116dac1bbc244b4ee4758a76f7e0dbb3217b9..e897a0f9bbc11f20d2a9c6e99d4751f0ea0b8784 100644
--- a/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C
+++ b/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C
@@ -20,16 +20,14 @@ void replay_hms_raster_simple(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/hms_raster_simple_%d_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   //Load global parameters
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
+  gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
   // Load params for HMS trigger configuration
   gHcParms->Load("PARAM/TRIG/thms_raster.param");
 
diff --git a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
index 9d479b762215871a94bb480587ebd6ea62632f6c..7efb4ec55147f3bbfb6b5d322e9d7fc365785d49 100644
--- a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
+++ b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
@@ -22,7 +22,7 @@ void replay_hms_scalers(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Load global parameters
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
diff --git a/SCRIPTS/HMS/STACK/replay_hms.C b/SCRIPTS/HMS/STACK/replay_hms.C
index 4c16798ba61e074d6d023d4c7292e4133c28df27..8219c289ba3580914ac7b4096fd4af9e66035bdb 100644
--- a/SCRIPTS/HMS/STACK/replay_hms.C
+++ b/SCRIPTS/HMS/STACK/replay_hms.C
@@ -20,16 +20,13 @@ void replay_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_%d_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-
   // Load params for HMS trigger configuration
   gHcParms->Load("PARAM/TRIG/thms.param");
 
@@ -43,7 +40,6 @@ void replay_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Add trigger detector to trigger apparatus
   THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
   TRG->AddDetector(hms);
-
   // Set up the equipment to be analyzed.
   THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
   gHaApps->Add(HMS);
@@ -53,11 +49,9 @@ void replay_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Add hodoscope to HMS apparatus
   THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
   HMS->AddDetector(hod);
-  
   // Add Aerogel Cherenkov to SHMS apparatus
   //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
   //HMS->AddDetector(aero);
-
   // Add Cherenkov to HMS apparatus
   THcCherenkov* cer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
   HMS->AddDetector(cer);
@@ -68,7 +62,6 @@ void replay_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Include golden track information
   THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
   gHaPhysics->Add(gtr);
-
   // Add handler for prestart event 125.
   THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
   gHaEvtHandlers->Add(ev125);
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
index e2c4fa6f02fe728b175d3bf565090e9bc651453a..2795dffd4c1850d08452e06b991b90b24f827d79 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
@@ -20,11 +20,9 @@ void replay_hcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/hcal_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C
index 072e1a2fea7d00c054c85ca9d73126a29df20440..28e4fc9aadf3d239a1b9c9acd27074921a093216 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C
@@ -18,21 +18,20 @@ void replay_hcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
   const char* ROOTFileNamePattern = "ROOTfiles/hcer_replay_%d.root";
+
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-
   // Load params for HMS trigger configuration
   gHcParms->Load("PARAM/TRIG/thms.param");
   gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
+
   // Load the Hall C style detector map
   gHcDetectorMap = new THcDetectorMap();
   gHcDetectorMap->Load("MAPS/HMS/DETEC/CER/hcer_htrig.map");
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C
index 71c184bc8d85e72b94c8b74b576f2cf79ead6592..3536e682c942e7768bda0cf94824c179b25d9fa4 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C
@@ -18,18 +18,16 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
   const char* ROOTFileNamePattern = "ROOTfiles/hdc_replay_%d.root";
+
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-
    // Load params for HMS trigger configuration
   gHcParms->Load("PARAM/TRIG/thms.param");
 
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C
index 6fa31b05174be015e9120e77ce481cd3d7c26685..c202cfd229a6187682b89e6161acab8304cd4a08 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C
@@ -18,18 +18,16 @@ void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
   const char* ROOTFileNamePattern = "ROOTfiles/hhodo_replay_%d.root";
+
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-
   // Load params for HMS trigger configuration
   gHcParms->Load("PARAM/TRIG/thms.param");
 
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C
index 219ad1daf4d7e829c7a488516b1486bc74787ff8..b535387c24e2a1bc2994a8edf5e6bd3baec7ffc2 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C
@@ -18,18 +18,16 @@ void replay_htrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
   const char* ROOTFileNamePattern = "ROOTfiles/htrig_replay_%d.root";
+
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-
   // Load params for HMS DC test stand configuration
   gHcParms->Load("PARAM/TRIG/thms.param");
 
diff --git a/SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C b/SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C
index 5dc5e0d7a52280e46a20a28237d77b76376cfed7..6cc389b4be42424381d1fc86ee6360e8ac658d5d 100644
--- a/SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C
+++ b/SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C
@@ -19,18 +19,19 @@ void replay_workshop_example(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%d_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+  gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
   // Load params for SHMS trigger configuration
   gHcParms->Load("PARAM/TRIG/tshms.param");
 
   // Load the Hall C style detector map
   gHcDetectorMap = new THcDetectorMap();
-  gHcDetectorMap->Load("MAPS/SHMS/DETEC/shms_stack.map");
+  gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
 
   // Add trigger apparatus
   THaApparatus* TRG = new THcTrigApp("T", "TRG");
@@ -92,8 +93,8 @@ void replay_workshop_example(Int_t RunNumber=0, Int_t MaxEvent=0) {
   analyzer->SetEvent(event);
   analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
   analyzer->SetOutFile(ROOTFileName.Data());
-  analyzer->SetOdefFile("DEF-files/SHMS/GEN/workshop_example.def");
-  analyzer->SetCutFile("DEF-files/SHMS/GEN/pstackana_cuts.def");    // optional
+  analyzer->SetOdefFile("DEF-files/SHMS/EXAMPLES/workshop_example.def");
+  analyzer->SetCutFile("DEF-files/SHMS/STACK/pstackana_cuts.def");    // optional
 
   // File to record cuts accounting information
   //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
index a359b3e05e8152de142f2389ee1848898d77924f..d80c02bb5e92a7a8ea4e21ddc4a7f20832179875 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
@@ -22,7 +22,7 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   // Load global parameters
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
diff --git a/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C b/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C
index e90c2559e95f95783cbdc1a9e9841640cfe9bf7d..1c417ab6705cab4b5d80ad55feef58f5aedbb782 100644
--- a/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C
+++ b/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C
@@ -20,7 +20,7 @@ void replay_shms_raster_simple (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_raster_simple_%d_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
 
   // Load global parameters
   // Add varibles to global list.
diff --git a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
index e7ffd129d615295e25a2448ab60bdd60de573852..0a74c103c90db9969869e560aa067d86c0c8c58e 100644
--- a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
+++ b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
@@ -22,7 +22,7 @@ void replay_shms_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   // Load global parameters
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
diff --git a/SCRIPTS/SHMS/STACK/replay_shms.C b/SCRIPTS/SHMS/STACK/replay_shms.C
index 18a7a7a3f22c70982372f7de1f2579ce763471d8..8dbff29a73f3489531b100bfc3eaee9d557ea23b 100644
--- a/SCRIPTS/SHMS/STACK/replay_shms.C
+++ b/SCRIPTS/SHMS/STACK/replay_shms.C
@@ -22,7 +22,7 @@ void replay_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   // Load global parameters
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
index 572c21ff27ed440013987eb3c8bbfac2c0c2850d..aa6c978846007864465e1cdb6e1f3be7a6cb5f8e 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
@@ -20,7 +20,7 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/paero_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
 
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
index e4334b3a7e0d3ea326496b4d43a256fadbc787d3..2922eb38a59d7a61924dedd942dfe443414f0520 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
@@ -20,7 +20,7 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/pcal_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
 
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
index 30495784b16ad7eefed86c968333fbcc17fdabe0..89a43b02536614bf49b85d849f04076741cdb6cf 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
@@ -20,7 +20,7 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/pdc_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
 
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
index e554f1adc75e7ed6f7761a67d84e384b8609084e..d7f00f642b8ed6409e7e0af4a4d447870284ac59 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
@@ -20,7 +20,7 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/phgcer_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
 
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
index bfca89e9a3120c26886f210218d7492b8e42434f..9e32b3304d454d807df81b6ee45f52e61b602c1e 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
@@ -20,11 +20,9 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/phodo_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
-
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
   // g_ctp_parm_filename and g_decode_map_filename should now be defined.
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
index 312d157bbed566268be9fbbb2bfbfbe1808b9f5f..4c2d23341dd141e993c911809069ba30811d2567 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
@@ -20,7 +20,7 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/pngcer_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
 
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
index 96d5a5e4186e0517c0d849d94555d0531df86069..9df0e328616f86be92029c39510176fc88931961 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
@@ -20,7 +20,7 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   const char* ROOTFileNamePattern = "ROOTfiles/ptrig_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
-  gHcParms->AddString("g_ctp_database_filename", "DBASE/STD/standard.database");
+  gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
 
   // Load varibles from files to global list.
   gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
diff --git a/onlineGUI/onlineGUI_v1.2.1/onlineDict.h b/onlineGUI/onlineGUI_v1.2.1/onlineDict.h
index 419d2a72a57b54e17c75c873b78aa737430d933d..a194f990b55a6149b0385ae96e74b235b113e0ce 100644
--- a/onlineGUI/onlineGUI_v1.2.1/onlineDict.h
+++ b/onlineGUI/onlineGUI_v1.2.1/onlineDict.h
@@ -1,92 +1,92 @@
-/********************************************************************
-* onlineDict.h
-* CAUTION: DON'T CHANGE THIS FILE. THIS FILE IS AUTOMATICALLY GENERATED
-*          FROM HEADER FILES LISTED IN G__setup_cpp_environmentXXX().
-*          CHANGE THOSE HEADER FILES AND REGENERATE THIS FILE.
-********************************************************************/
-#ifdef __CINT__
-#error onlineDict.h/C is only for compilation. Abort cint.
-#endif
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#define G__ANSIHEADER
-#define G__DICTIONARY
-#define G__PRIVATE_GVALUE
-#include "G__ci.h"
-#include "FastAllocString.h"
-extern "C" {
-extern void G__cpp_setup_tagtableonlineDict();
-extern void G__cpp_setup_inheritanceonlineDict();
-extern void G__cpp_setup_typetableonlineDict();
-extern void G__cpp_setup_memvaronlineDict();
-extern void G__cpp_setup_globalonlineDict();
-extern void G__cpp_setup_memfunconlineDict();
-extern void G__cpp_setup_funconlineDict();
-extern void G__set_cpp_environmentonlineDict();
-}
-
-
-#include "TObject.h"
-#include "TMemberInspector.h"
-#include "online.h"
-#include <algorithm>
-namespace std { }
-using namespace std;
-
-#ifndef G__MEMFUNCBODY
-#endif
-
-extern G__linked_taginfo G__onlineDictLN_TString;
-extern G__linked_taginfo G__onlineDictLN_vectorlEunsignedsPintcOallocatorlEunsignedsPintgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_basic_ifstreamlEcharcOchar_traitslEchargRsPgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_TList;
-extern G__linked_taginfo G__onlineDictLN_TTimer;
-extern G__linked_taginfo G__onlineDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_iteratorlEbidirectional_iterator_tagcOTObjectmUcOlongcOconstsPTObjectmUmUcOconstsPTObjectmUaNgR;
-extern G__linked_taginfo G__onlineDictLN_maplEstringcOTObjArraymUcOlesslEstringgRcOallocatorlEpairlEconstsPstringcOTObjArraymUgRsPgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_TCut;
-extern G__linked_taginfo G__onlineDictLN_TQObjSender;
-extern G__linked_taginfo G__onlineDictLN_TGWindow;
-extern G__linked_taginfo G__onlineDictLN_pairlEunsignedsPintcOintgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlEpairlEunsignedsPintcOintgRcOallocatorlEpairlEunsignedsPintcOintgRsPgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEpairlEunsignedsPintcOintgRcOallocatorlEpairlEunsignedsPintcOintgRsPgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_TGTextButton;
-extern G__linked_taginfo G__onlineDictLN_TGVerticalFrame;
-extern G__linked_taginfo G__onlineDictLN_TGHorizontalFrame;
-extern G__linked_taginfo G__onlineDictLN_TGMainFrame;
-extern G__linked_taginfo G__onlineDictLN_TGPictureButton;
-extern G__linked_taginfo G__onlineDictLN_TGRadioButton;
-extern G__linked_taginfo G__onlineDictLN_TCanvas;
-extern G__linked_taginfo G__onlineDictLN_TRootEmbeddedCanvas;
-extern G__linked_taginfo G__onlineDictLN_TGLabel;
-extern G__linked_taginfo G__onlineDictLN_TVectorTlEfloatgR;
-extern G__linked_taginfo G__onlineDictLN_TVectorTlEdoublegR;
-extern G__linked_taginfo G__onlineDictLN_TMatrixTBaselEfloatgR;
-extern G__linked_taginfo G__onlineDictLN_TMatrixTBaselEdoublegR;
-extern G__linked_taginfo G__onlineDictLN_RootFileObject;
-extern G__linked_taginfo G__onlineDictLN_vectorlETTreemUcOallocatorlETTreemUgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETTreemUcOallocatorlETTreemUgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlEintcOallocatorlEintgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlETStringcOallocatorlETStringgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETStringcOallocatorlETStringgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlEvectorlETStringcOallocatorlETStringgRsPgRcOallocatorlEvectorlETStringcOallocatorlETStringgRsPgRsPgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEvectorlETStringcOallocatorlETStringgRsPgRcOallocatorlEvectorlETStringcOallocatorlETStringgRsPgRsPgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlEfileObjectcOallocatorlEfileObjectgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEfileObjectcOallocatorlEfileObjectgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_drawcommand;
-extern G__linked_taginfo G__onlineDictLN_OnlineConfig;
-extern G__linked_taginfo G__onlineDictLN_pairlEunsignedsPintcOunsignedsPintgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlEpairlEunsignedsPintcOunsignedsPintgRcOallocatorlEpairlEunsignedsPintcOunsignedsPintgRsPgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEpairlEunsignedsPintcOunsignedsPintgRcOallocatorlEpairlEunsignedsPintcOunsignedsPintgRsPgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_vectorlETCutcOallocatorlETCutgRsPgR;
-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETCutcOallocatorlETCutgRsPgRcLcLiteratorgR;
-extern G__linked_taginfo G__onlineDictLN_OnlineGUI;
-
-/* STUB derived class for protected member access */
+-/********************************************************************
+-* onlineDict.h
+-* CAUTION: DON'T CHANGE THIS FILE. THIS FILE IS AUTOMATICALLY GENERATED
+-*          FROM HEADER FILES LISTED IN G__setup_cpp_environmentXXX().
+-*          CHANGE THOSE HEADER FILES AND REGENERATE THIS FILE.
+-********************************************************************/
+-#ifdef __CINT__
+-#error onlineDict.h/C is only for compilation. Abort cint.
+-#endif
+-#include <stddef.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <math.h>
+-#include <string.h>
+-#define G__ANSIHEADER
+-#define G__DICTIONARY
+-#define G__PRIVATE_GVALUE
+-#include "G__ci.h"
+-#include "FastAllocString.h"
+-extern "C" {
+-extern void G__cpp_setup_tagtableonlineDict();
+-extern void G__cpp_setup_inheritanceonlineDict();
+-extern void G__cpp_setup_typetableonlineDict();
+-extern void G__cpp_setup_memvaronlineDict();
+-extern void G__cpp_setup_globalonlineDict();
+-extern void G__cpp_setup_memfunconlineDict();
+-extern void G__cpp_setup_funconlineDict();
+-extern void G__set_cpp_environmentonlineDict();
+-}
+-
+-
+-#include "TObject.h"
+-#include "TMemberInspector.h"
+-#include "online.h"
+-#include <algorithm>
+-namespace std { }
+-using namespace std;
+-
+-#ifndef G__MEMFUNCBODY
+-#endif
+-
+-extern G__linked_taginfo G__onlineDictLN_TString;
+-extern G__linked_taginfo G__onlineDictLN_vectorlEunsignedsPintcOallocatorlEunsignedsPintgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_basic_ifstreamlEcharcOchar_traitslEchargRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_TList;
+-extern G__linked_taginfo G__onlineDictLN_TTimer;
+-extern G__linked_taginfo G__onlineDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_iteratorlEbidirectional_iterator_tagcOTObjectmUcOlongcOconstsPTObjectmUmUcOconstsPTObjectmUaNgR;
+-extern G__linked_taginfo G__onlineDictLN_maplEstringcOTObjArraymUcOlesslEstringgRcOallocatorlEpairlEconstsPstringcOTObjArraymUgRsPgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_TCut;
+-extern G__linked_taginfo G__onlineDictLN_TQObjSender;
+-extern G__linked_taginfo G__onlineDictLN_TGWindow;
+-extern G__linked_taginfo G__onlineDictLN_pairlEunsignedsPintcOintgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlEpairlEunsignedsPintcOintgRcOallocatorlEpairlEunsignedsPintcOintgRsPgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEpairlEunsignedsPintcOintgRcOallocatorlEpairlEunsignedsPintcOintgRsPgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_TGTextButton;
+-extern G__linked_taginfo G__onlineDictLN_TGVerticalFrame;
+-extern G__linked_taginfo G__onlineDictLN_TGHorizontalFrame;
+-extern G__linked_taginfo G__onlineDictLN_TGMainFrame;
+-extern G__linked_taginfo G__onlineDictLN_TGPictureButton;
+-extern G__linked_taginfo G__onlineDictLN_TGRadioButton;
+-extern G__linked_taginfo G__onlineDictLN_TCanvas;
+-extern G__linked_taginfo G__onlineDictLN_TRootEmbeddedCanvas;
+-extern G__linked_taginfo G__onlineDictLN_TGLabel;
+-extern G__linked_taginfo G__onlineDictLN_TVectorTlEfloatgR;
+-extern G__linked_taginfo G__onlineDictLN_TVectorTlEdoublegR;
+-extern G__linked_taginfo G__onlineDictLN_TMatrixTBaselEfloatgR;
+-extern G__linked_taginfo G__onlineDictLN_TMatrixTBaselEdoublegR;
+-extern G__linked_taginfo G__onlineDictLN_RootFileObject;
+-extern G__linked_taginfo G__onlineDictLN_vectorlETTreemUcOallocatorlETTreemUgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETTreemUcOallocatorlETTreemUgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlEintcOallocatorlEintgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlETStringcOallocatorlETStringgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETStringcOallocatorlETStringgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlEvectorlETStringcOallocatorlETStringgRsPgRcOallocatorlEvectorlETStringcOallocatorlETStringgRsPgRsPgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEvectorlETStringcOallocatorlETStringgRsPgRcOallocatorlEvectorlETStringcOallocatorlETStringgRsPgRsPgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlEfileObjectcOallocatorlEfileObjectgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEfileObjectcOallocatorlEfileObjectgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_drawcommand;
+-extern G__linked_taginfo G__onlineDictLN_OnlineConfig;
+-extern G__linked_taginfo G__onlineDictLN_pairlEunsignedsPintcOunsignedsPintgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlEpairlEunsignedsPintcOunsignedsPintgRcOallocatorlEpairlEunsignedsPintcOunsignedsPintgRsPgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlEpairlEunsignedsPintcOunsignedsPintgRcOallocatorlEpairlEunsignedsPintcOunsignedsPintgRsPgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_vectorlETCutcOallocatorlETCutgRsPgR;
+-extern G__linked_taginfo G__onlineDictLN_reverse_iteratorlEvectorlETCutcOallocatorlETCutgRsPgRcLcLiteratorgR;
+-extern G__linked_taginfo G__onlineDictLN_OnlineGUI;
+-
+-/* STUB derived class for protected member access */