From 3f140f9e32b649c251f5aba7ad4f69c24968db64 Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Mon, 19 Feb 2018 11:51:58 -0500
Subject: [PATCH] Simple (#403)
* Simplification of hallc-replay to specifically support hallc-online hallc_replay operations.
* Re-add bcm_current_calib files
---
.gitignore | 2 +
DBASE/COIN/GEN/default_det_calib_files.param | 8 -
DBASE/COIN/GEN/general.param | 72 --
DBASE/COIN/STD/ep.database | 4 -
DBASE/COIN/STD/ep.kinematics | 277 -------
DBASE/COIN/STD/standard.database | 4 -
DBASE/COIN/general.param | 72 ++
DBASE/COIN/standard.database | 3 +
DBASE/COIN/{STD => }/standard.kinematics | 138 +---
DBASE/HMS/GEN/Fall_Comm_2017/calib_1130.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1136.param | 3 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1178.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1179.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1180.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1212.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1213.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1214.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1235.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/calib_1249.param | 2 -
DBASE/HMS/GEN/Fall_Comm_2017/general.param | 40 -
DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param | 5 -
DBASE/HMS/GEN/KPP_Spring_2017/general.param | 39 -
DBASE/HMS/GEN/default_det_calib_files.param | 7 -
DBASE/HMS/GEN/general.param | 40 -
DBASE/HMS/STD/standard.database | 41 --
DBASE/HMS/general.param | 40 +
DBASE/HMS/standard.database | 3 +
DBASE/HMS/{STD => }/standard.kinematics | 0
.../SHMS/GEN/Fall_Comm_2017/calib_1583.param | 2 -
.../SHMS/GEN/Fall_Comm_2017/calib_1585.param | 3 -
.../SHMS/GEN/Fall_Comm_2017/calib_1586.param | 2 -
DBASE/SHMS/GEN/Fall_Comm_2017/general.param | 43 --
.../SHMS/GEN/KPP_Spring_2017/calib_464.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_469.param | 1 -
.../SHMS/GEN/KPP_Spring_2017/calib_475.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_478.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_479.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_480.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_481.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_483.param | 3 -
.../SHMS/GEN/KPP_Spring_2017/calib_484.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_486.param | 2 -
.../SHMS/GEN/KPP_Spring_2017/calib_487.param | 3 -
.../SHMS/GEN/KPP_Spring_2017/calib_488.param | 4 -
DBASE/SHMS/GEN/KPP_Spring_2017/general.param | 43 --
DBASE/SHMS/GEN/default_det_calib_files.param | 8 -
DBASE/SHMS/GEN/general.param | 43 --
DBASE/SHMS/STD/standard.database | 55 --
DBASE/SHMS/general.param | 43 ++
DBASE/SHMS/standard.database | 3 +
DBASE/SHMS/{STD => }/standard.kinematics | 0
DBASE/db_run.dat | 7 -
.../HMS/PRODUCTION/TRIG/htrig_histos.def | 6 +-
DEF-files/HMS/STACK/AERO/haero_histos.def | 43 --
DEF-files/HMS/STACK/BLOCK/hblock_vars.def | 12 -
DEF-files/HMS/STACK/CAL/hcal_histos.def | 106 ---
DEF-files/HMS/STACK/CER/hcer_histos.def | 41 --
DEF-files/HMS/STACK/DC/hdc_6gev_histos.def | 122 ----
DEF-files/HMS/STACK/DC/hdc_histos.def | 69 --
DEF-files/HMS/STACK/HODO/hhodo_histos.def | 178 -----
DEF-files/HMS/STACK/TRIG/htrig_histos.def | 130 ----
DEF-files/HMS/STACK/hstack_include.def | 6 -
DEF-files/HMS/STACK/hstackana.def | 600 ---------------
DEF-files/HMS/STACK/hstackana_6gev_cuts.def | 199 -----
DEF-files/HMS/STACK/hstackana_cuts.def | 201 ------
DEF-files/HMS/STACK/merge_def_files.py | 25 -
DEF-files/HMS/STACK/merge_list.txt | 6 -
DEF-files/SHMS/EXAMPLES/workshop_example.def | 31 -
.../SHMS/PRODUCTION/TRIG/ptrig_histos.def | 10 +-
DEF-files/SHMS/STACK/AERO/paero_histos.def | 43 --
DEF-files/SHMS/STACK/BLOCK/pblock_vars.def | 13 -
DEF-files/SHMS/STACK/CAL/pcal_histos.def | 110 ---
DEF-files/SHMS/STACK/DC/pdc_histos.def | 162 -----
DEF-files/SHMS/STACK/HGCER/phgcer_histos.def | 39 -
DEF-files/SHMS/STACK/HODO/phodo_histos.def | 178 -----
DEF-files/SHMS/STACK/NGCER/pngcer_histos.def | 39 -
DEF-files/SHMS/STACK/TRIG/ptrig_histos.def | 90 ---
DEF-files/SHMS/STACK/merge_def_files.py | 25 -
DEF-files/SHMS/STACK/merge_list.txt | 8 -
DEF-files/SHMS/STACK/pstackana.def | 683 ------------------
DEF-files/SHMS/STACK/pstackana_cuts.def | 275 -------
PARAM/HMS/AERO/{CALIB => }/haero_calib.param | 0
PARAM/HMS/AERO/{CUTS => }/haero_cuts.param | 0
PARAM/HMS/AERO/{GEOM => }/haero_geom.param | 0
PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param | 13 +
PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param | 13 +
.../Fall_Comm_2017/hcal_calib_1136.param | 10 -
.../Fall_Comm_2017/hcal_calib_1249.param | 10 -
.../KPP_Spring_2017/hcal_calib_303.param | 10 -
PARAM/HMS/CAL/CALIB/hcal_calib.param | 1 -
...hcal_calib_1235.param => hcal_calib.param} | 0
PARAM/HMS/CAL/{CUTS => }/hcal_cuts.param | 0
PARAM/HMS/CAL/{GEOM => }/hcal_geom.param | 0
.../Fall_Comm_2017/hcer_calib_1130.param | 1 -
.../Fall_Comm_2017/hcer_calib_1136.param | 1 -
.../Fall_Comm_2017/hcer_calib_1178.param | 1 -
.../Fall_Comm_2017/hcer_calib_1179.param | 1 -
.../Fall_Comm_2017/hcer_calib_1180.param | 1 -
.../Fall_Comm_2017/hcer_calib_1213.param | 1 -
.../Fall_Comm_2017/hcer_calib_1214.param | 1 -
.../CALIB/KPP_Spring_2017/hcer_calib.param | 3 -
.../KPP_Spring_2017/hcer_calib_303.param | 3 -
PARAM/HMS/CER/CALIB/hcer_calib.param | 1 -
...hcer_calib_1212.param => hcer_calib.param} | 0
PARAM/HMS/CER/{CUTS => }/hcer_cuts.param | 0
PARAM/HMS/CER/{GEOM => }/hcer_geom.param | 0
.../CALIB/KPP_Spring_2017/hdc_calib_303.param | 175 -----
.../KPP_Spring_2017/hdc_calib_6gev.param | 175 -----
.../CUTS/KPP_Spring_2017/hdc_cuts_6gev.param | 22 -
PARAM/HMS/DC/GEOM/hdc_geom_6gev.param | 132 ----
PARAM/HMS/DC/{CALIB => }/hdc_calib.param | 0
PARAM/HMS/DC/{CUTS => }/hdc_cuts.param | 0
PARAM/HMS/DC/{GEOM => }/hdc_geom.param | 0
.../DC/{CALIB => }/hdc_tzero_per_wire.param | 0
.../KPP_Spring_2017/hhodo_calib_303.param | 172 -----
.../CUTS/KPP_Spring_2017/hhodo_cuts.param | 43 --
PARAM/HMS/HODO/hhodo_3of4trigger.param | 191 -----
PARAM/HMS/HODO/hhodo_4of4trigger.param | 191 -----
PARAM/HMS/HODO/{CALIB => }/hhodo_calib.param | 0
PARAM/HMS/HODO/{CUTS => }/hhodo_cuts.param | 0
PARAM/HMS/HODO/{GEOM => }/hhodo_geom.param | 0
PARAM/HMS/HODO/{CALIB => }/htofcalib.param | 0
PARAM/SHMS/AERO/CALIB/paero_calib.param | 1 -
...ero_calib_1585.param => paero_calib.param} | 0
PARAM/SHMS/AERO/{CUTS => }/paero_cuts.param | 0
PARAM/SHMS/AERO/{GEOM => }/paero_geom.param | 0
.../Fall_Comm_2017/pcal_calib_1585.param | 18 -
.../Fall_Comm_2017/pcal_calib_1586.param | 18 -
.../Fall_Comm_2017/pcal_calib_1969.param | 18 -
.../KPP_Spring_2017/pcal_calib_464.param | 18 -
.../KPP_Spring_2017/pcal_calib_475.param | 18 -
.../KPP_Spring_2017/pcal_calib_478.param | 18 -
.../KPP_Spring_2017/pcal_calib_479.param | 25 -
.../KPP_Spring_2017/pcal_calib_480.param | 18 -
.../KPP_Spring_2017/pcal_calib_481.param | 18 -
.../KPP_Spring_2017/pcal_calib_488.param | 18 -
PARAM/SHMS/CAL/CALIB/pcal_calib.param | 1 -
PARAM/SHMS/CAL/pcal_calib.param | 18 +
PARAM/SHMS/CAL/{CUTS => }/pcal_cuts.param | 0
PARAM/SHMS/CAL/{GEOM => }/pcal_geom.param | 0
PARAM/SHMS/DC/CALIB/pdc_calib.param | 175 -----
PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param | 88 ---
PARAM/SHMS/DC/pdc_calib.param | 175 +++++
PARAM/SHMS/DC/{CUTS => }/pdc_cuts.param | 0
PARAM/SHMS/DC/{GEOM => }/pdc_geom.param | 0
PARAM/SHMS/DC/pdc_tzero_per_wire.param | 88 +++
.../KPP_Spring_2017/phgcer_calib_483.param | 2 -
.../KPP_Spring_2017/phgcer_calib_484.param | 2 -
.../KPP_Spring_2017/phgcer_calib_486.param | 2 -
.../KPP_Spring_2017/phgcer_calib_487.param | 2 -
.../KPP_Spring_2017/phgcer_calib_488.param | 2 -
PARAM/SHMS/HGCER/CALIB/phgcer_calib.param | 1 -
...er_calib_1583.param => phgcer_calib.param} | 0
PARAM/SHMS/HGCER/{CUTS => }/phgcer_cuts.param | 0
PARAM/SHMS/HGCER/{GEOM => }/phgcer_geom.param | 0
.../CUTS/KPP_Spring_2017/phodo_cuts.param | 46 --
PARAM/SHMS/HODO/{CALIB => }/phodo_calib.param | 0
PARAM/SHMS/HODO/{CUTS => }/phodo_cuts.param | 0
PARAM/SHMS/HODO/{GEOM => }/phodo_geom.param | 0
PARAM/SHMS/HODO/{CALIB => }/ptofcalib.param | 0
.../KPP_Spring_2017/pngcer_calib_483.param | 2 -
.../KPP_Spring_2017/pngcer_calib_487.param | 2 -
.../KPP_Spring_2017/pngcer_calib_488.param | 2 -
.../SHMS/NGCER/{CALIB => }/pngcer_calib.param | 0
PARAM/SHMS/NGCER/{CUTS => }/pngcer_cuts.param | 0
PARAM/SHMS/NGCER/{GEOM => }/pngcer_geom.param | 0
.../replay_production_coin_hElec_pProt.C | 100 ++-
.../replay_production_coin_pElec_hProt.C | 99 ++-
.../COIN/PRODUCTION/replay_production_ep.C | 253 -------
SCRIPTS/COIN/SCALERS/replay_coin_scalers.C | 25 +-
SCRIPTS/HMS/MACROS/hhodo_analysis.C | 140 ----
.../PRODUCTION/replay_production_all_hms.C | 48 +-
.../HMS/PRODUCTION/replay_production_hms.C | 94 ++-
.../PRODUCTION/replay_production_hms_coin.C | 94 ++-
.../PRODUCTION/replay_production_hms_kpp.C | 151 ----
SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C | 48 +-
SCRIPTS/HMS/SCALERS/replay_hms_scalers.C | 20 +-
SCRIPTS/HMS/STACK/replay_hms.C | 124 ----
.../HMS/TEST_STANDS/replay_hcal_test_stand.C | 36 +-
.../HMS/TEST_STANDS/replay_hcer_test_stand.C | 34 +-
.../HMS/TEST_STANDS/replay_hdc_test_stand.C | 40 +-
.../HMS/TEST_STANDS/replay_hhodo_test_stand.C | 38 +-
.../HMS/TEST_STANDS/replay_htrig_test_stand.C | 35 +-
.../SHMS/EXAMPLES/replay_workshop_example.C | 113 ---
SCRIPTS/SHMS/GEM/replay_gem_shms.C | 17 +-
SCRIPTS/SHMS/MACROS/shw_pshw.C | 152 ----
.../PRODUCTION/replay_production_all_shms.C | 45 +-
.../SHMS/PRODUCTION/replay_production_shms.C | 56 +-
.../PRODUCTION/replay_production_shms_coin.C | 64 +-
.../PRODUCTION/replay_production_shms_kpp.C | 160 ----
.../SHMS/RASTER/replay_shms_raster_simple.C | 45 +-
SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C | 18 +-
SCRIPTS/SHMS/STACK/replay_shms.C | 130 ----
.../TEST_STANDS/replay_paero_test_stand.C | 40 +-
.../SHMS/TEST_STANDS/replay_pcal_test_stand.C | 48 +-
.../SHMS/TEST_STANDS/replay_pdc_test_stand.C | 41 +-
.../TEST_STANDS/replay_phgcer_test_stand.C | 37 +-
.../TEST_STANDS/replay_phodo_test_stand.C | 38 +-
.../TEST_STANDS/replay_pngcer_test_stand.C | 37 +-
.../TEST_STANDS/replay_ptrig_test_stand.C | 37 +-
TEMPLATES/DETEC/dcana.template | 49 --
.../hstackana_production_kpp.template | 484 -------------
TEMPLATES/HMS/STACK/hstackana.template | 177 -----
TEMPLATES/HMS/STACK/hstackana_6gev.template | 68 --
TEMPLATES/SHMS/STACK/pstackana.template | 328 ---------
.../COIN/MONITOR => UTIL-CT}/Bean_counter.C | 2 +-
.../MONITOR => UTIL-CT}/Bean_counter_carbon.C | 0
.../COIN/MONITOR => UTIL-CT}/coin_histo.C | 0
.../MONITOR => UTIL-CT}/coin_monitor.README | 0
.../MONITOR => UTIL-CT}/coin_monitor_calc.C | 0
.../coin_monitor_calc_batch.sh | 0
.../MONITOR => UTIL-CT}/coin_monitor_graph.C | 0
.../MONITOR => UTIL-CT}/coin_monitor_init.C | 0
.../PED_MON/hms_coin_ped.C | 8 +-
.../PED_MON/hms_ped.C | 8 +-
.../PED_MON/shms_coin_ped.C | 8 +-
.../PED_MON/shms_ped.C | 8 +-
.../HMS => UTIL-OL/REP_MON}/readout_hms.py | 4 +-
.../SHMS => UTIL-OL/REP_MON}/readout_shms.py | 4 +-
UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C | 156 ----
UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C | 158 ----
UTIL/SHELL/full_coin_shms.sh | 103 ---
UTIL/SHELL/full_shms.sh | 98 ---
UTIL/SHELL/run_all_shms.sh | 61 --
UTIL/SHELL/run_beancounter.sh | 33 -
UTIL/SHELL/run_coin.sh | 101 ---
UTIL/SHELL/run_coin_ep.sh | 101 ---
UTIL/SHELL/run_coin_hElec_pProt.C | 101 ---
UTIL/SHELL/run_coin_monitor.sh | 43 --
UTIL/SHELL/run_coin_shms.sh | 123 ----
UTIL/SHELL/run_shms.sh | 150 ----
full_coin_hms.sh | 1 -
full_coin_shms.sh | 1 -
full_hms.sh | 1 -
full_shms.sh | 1 -
run_all_shms.sh | 1 -
run_beancounter.sh | 1 -
run_coin.sh | 1 -
run_coin_ep.sh | 1 -
run_coin_hms.sh | 1 -
run_coin_monitor.sh | 1 -
run_coin_shms.sh | 1 -
run_hms.sh | 1 -
run_shms.sh | 1 -
244 files changed, 1082 insertions(+), 10277 deletions(-)
delete mode 100644 DBASE/COIN/GEN/default_det_calib_files.param
delete mode 100644 DBASE/COIN/GEN/general.param
delete mode 100644 DBASE/COIN/STD/ep.database
delete mode 100644 DBASE/COIN/STD/ep.kinematics
delete mode 100644 DBASE/COIN/STD/standard.database
create mode 100644 DBASE/COIN/general.param
create mode 100644 DBASE/COIN/standard.database
rename DBASE/COIN/{STD => }/standard.kinematics (71%)
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1130.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1136.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1178.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1179.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1180.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1212.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1213.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1214.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1235.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/calib_1249.param
delete mode 100644 DBASE/HMS/GEN/Fall_Comm_2017/general.param
delete mode 100644 DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param
delete mode 100644 DBASE/HMS/GEN/KPP_Spring_2017/general.param
delete mode 100644 DBASE/HMS/GEN/default_det_calib_files.param
delete mode 100644 DBASE/HMS/GEN/general.param
delete mode 100644 DBASE/HMS/STD/standard.database
create mode 100644 DBASE/HMS/general.param
create mode 100644 DBASE/HMS/standard.database
rename DBASE/HMS/{STD => }/standard.kinematics (100%)
delete mode 100644 DBASE/SHMS/GEN/Fall_Comm_2017/calib_1583.param
delete mode 100644 DBASE/SHMS/GEN/Fall_Comm_2017/calib_1585.param
delete mode 100644 DBASE/SHMS/GEN/Fall_Comm_2017/calib_1586.param
delete mode 100644 DBASE/SHMS/GEN/Fall_Comm_2017/general.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_486.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_487.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/calib_488.param
delete mode 100644 DBASE/SHMS/GEN/KPP_Spring_2017/general.param
delete mode 100644 DBASE/SHMS/GEN/default_det_calib_files.param
delete mode 100644 DBASE/SHMS/GEN/general.param
delete mode 100644 DBASE/SHMS/STD/standard.database
create mode 100644 DBASE/SHMS/general.param
create mode 100644 DBASE/SHMS/standard.database
rename DBASE/SHMS/{STD => }/standard.kinematics (100%)
delete mode 100644 DBASE/db_run.dat
delete mode 100644 DEF-files/HMS/STACK/AERO/haero_histos.def
delete mode 100644 DEF-files/HMS/STACK/BLOCK/hblock_vars.def
delete mode 100644 DEF-files/HMS/STACK/CAL/hcal_histos.def
delete mode 100644 DEF-files/HMS/STACK/CER/hcer_histos.def
delete mode 100644 DEF-files/HMS/STACK/DC/hdc_6gev_histos.def
delete mode 100644 DEF-files/HMS/STACK/DC/hdc_histos.def
delete mode 100644 DEF-files/HMS/STACK/HODO/hhodo_histos.def
delete mode 100644 DEF-files/HMS/STACK/TRIG/htrig_histos.def
delete mode 100644 DEF-files/HMS/STACK/hstack_include.def
delete mode 100644 DEF-files/HMS/STACK/hstackana.def
delete mode 100644 DEF-files/HMS/STACK/hstackana_6gev_cuts.def
delete mode 100644 DEF-files/HMS/STACK/hstackana_cuts.def
delete mode 100644 DEF-files/HMS/STACK/merge_def_files.py
delete mode 100644 DEF-files/HMS/STACK/merge_list.txt
delete mode 100644 DEF-files/SHMS/EXAMPLES/workshop_example.def
delete mode 100644 DEF-files/SHMS/STACK/AERO/paero_histos.def
delete mode 100644 DEF-files/SHMS/STACK/BLOCK/pblock_vars.def
delete mode 100644 DEF-files/SHMS/STACK/CAL/pcal_histos.def
delete mode 100644 DEF-files/SHMS/STACK/DC/pdc_histos.def
delete mode 100644 DEF-files/SHMS/STACK/HGCER/phgcer_histos.def
delete mode 100644 DEF-files/SHMS/STACK/HODO/phodo_histos.def
delete mode 100644 DEF-files/SHMS/STACK/NGCER/pngcer_histos.def
delete mode 100644 DEF-files/SHMS/STACK/TRIG/ptrig_histos.def
delete mode 100644 DEF-files/SHMS/STACK/merge_def_files.py
delete mode 100644 DEF-files/SHMS/STACK/merge_list.txt
delete mode 100644 DEF-files/SHMS/STACK/pstackana.def
delete mode 100644 DEF-files/SHMS/STACK/pstackana_cuts.def
rename PARAM/HMS/AERO/{CALIB => }/haero_calib.param (100%)
rename PARAM/HMS/AERO/{CUTS => }/haero_cuts.param (100%)
rename PARAM/HMS/AERO/{GEOM => }/haero_geom.param (100%)
create mode 100644 PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param
create mode 100644 PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param
delete mode 100644 PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1136.param
delete mode 100644 PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1249.param
delete mode 100644 PARAM/HMS/CAL/CALIB/KPP_Spring_2017/hcal_calib_303.param
delete mode 120000 PARAM/HMS/CAL/CALIB/hcal_calib.param
rename PARAM/HMS/CAL/{CALIB/Fall_Comm_2017/hcal_calib_1235.param => hcal_calib.param} (100%)
rename PARAM/HMS/CAL/{CUTS => }/hcal_cuts.param (100%)
rename PARAM/HMS/CAL/{GEOM => }/hcal_geom.param (100%)
delete mode 100644 PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1130.param
delete mode 100644 PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1136.param
delete mode 100644 PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1178.param
delete mode 100644 PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1179.param
delete mode 100644 PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1180.param
delete mode 100644 PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1213.param
delete mode 100644 PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1214.param
delete mode 100644 PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib.param
delete mode 100644 PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib_303.param
delete mode 120000 PARAM/HMS/CER/CALIB/hcer_calib.param
rename PARAM/HMS/CER/{CALIB/Fall_Comm_2017/hcer_calib_1212.param => hcer_calib.param} (100%)
rename PARAM/HMS/CER/{CUTS => }/hcer_cuts.param (100%)
rename PARAM/HMS/CER/{GEOM => }/hcer_geom.param (100%)
delete mode 100644 PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_303.param
delete mode 100644 PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_6gev.param
delete mode 100644 PARAM/HMS/DC/CUTS/KPP_Spring_2017/hdc_cuts_6gev.param
delete mode 100644 PARAM/HMS/DC/GEOM/hdc_geom_6gev.param
rename PARAM/HMS/DC/{CALIB => }/hdc_calib.param (100%)
rename PARAM/HMS/DC/{CUTS => }/hdc_cuts.param (100%)
rename PARAM/HMS/DC/{GEOM => }/hdc_geom.param (100%)
rename PARAM/HMS/DC/{CALIB => }/hdc_tzero_per_wire.param (100%)
delete mode 100644 PARAM/HMS/HODO/CALIB/KPP_Spring_2017/hhodo_calib_303.param
delete mode 100644 PARAM/HMS/HODO/CUTS/KPP_Spring_2017/hhodo_cuts.param
delete mode 100644 PARAM/HMS/HODO/hhodo_3of4trigger.param
delete mode 100644 PARAM/HMS/HODO/hhodo_4of4trigger.param
rename PARAM/HMS/HODO/{CALIB => }/hhodo_calib.param (100%)
rename PARAM/HMS/HODO/{CUTS => }/hhodo_cuts.param (100%)
rename PARAM/HMS/HODO/{GEOM => }/hhodo_geom.param (100%)
rename PARAM/HMS/HODO/{CALIB => }/htofcalib.param (100%)
delete mode 120000 PARAM/SHMS/AERO/CALIB/paero_calib.param
rename PARAM/SHMS/AERO/{CALIB/Fall_Comm_2017/paero_calib_1585.param => paero_calib.param} (100%)
rename PARAM/SHMS/AERO/{CUTS => }/paero_cuts.param (100%)
rename PARAM/SHMS/AERO/{GEOM => }/paero_geom.param (100%)
delete mode 100644 PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1585.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1586.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1969.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param
delete mode 100644 PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param
delete mode 120000 PARAM/SHMS/CAL/CALIB/pcal_calib.param
create mode 100644 PARAM/SHMS/CAL/pcal_calib.param
rename PARAM/SHMS/CAL/{CUTS => }/pcal_cuts.param (100%)
rename PARAM/SHMS/CAL/{GEOM => }/pcal_geom.param (100%)
delete mode 100644 PARAM/SHMS/DC/CALIB/pdc_calib.param
delete mode 100644 PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param
create mode 100644 PARAM/SHMS/DC/pdc_calib.param
rename PARAM/SHMS/DC/{CUTS => }/pdc_cuts.param (100%)
rename PARAM/SHMS/DC/{GEOM => }/pdc_geom.param (100%)
create mode 100644 PARAM/SHMS/DC/pdc_tzero_per_wire.param
delete mode 100644 PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param
delete mode 100644 PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param
delete mode 100644 PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param
delete mode 100644 PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param
delete mode 100644 PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param
delete mode 120000 PARAM/SHMS/HGCER/CALIB/phgcer_calib.param
rename PARAM/SHMS/HGCER/{CALIB/Fall_Comm_2017/phgcer_calib_1583.param => phgcer_calib.param} (100%)
rename PARAM/SHMS/HGCER/{CUTS => }/phgcer_cuts.param (100%)
rename PARAM/SHMS/HGCER/{GEOM => }/phgcer_geom.param (100%)
delete mode 100644 PARAM/SHMS/HODO/CUTS/KPP_Spring_2017/phodo_cuts.param
rename PARAM/SHMS/HODO/{CALIB => }/phodo_calib.param (100%)
rename PARAM/SHMS/HODO/{CUTS => }/phodo_cuts.param (100%)
rename PARAM/SHMS/HODO/{GEOM => }/phodo_geom.param (100%)
rename PARAM/SHMS/HODO/{CALIB => }/ptofcalib.param (100%)
delete mode 100644 PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param
delete mode 100644 PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param
delete mode 100644 PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param
rename PARAM/SHMS/NGCER/{CALIB => }/pngcer_calib.param (100%)
rename PARAM/SHMS/NGCER/{CUTS => }/pngcer_cuts.param (100%)
rename PARAM/SHMS/NGCER/{GEOM => }/pngcer_geom.param (100%)
delete mode 100644 SCRIPTS/COIN/PRODUCTION/replay_production_ep.C
delete mode 100644 SCRIPTS/HMS/MACROS/hhodo_analysis.C
delete mode 100644 SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C
delete mode 100644 SCRIPTS/HMS/STACK/replay_hms.C
delete mode 100644 SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C
delete mode 100644 SCRIPTS/SHMS/MACROS/shw_pshw.C
delete mode 100644 SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C
delete mode 100644 SCRIPTS/SHMS/STACK/replay_shms.C
delete mode 100644 TEMPLATES/DETEC/dcana.template
delete mode 100644 TEMPLATES/HMS/PRODUCTION/hstackana_production_kpp.template
delete mode 100644 TEMPLATES/HMS/STACK/hstackana.template
delete mode 100644 TEMPLATES/HMS/STACK/hstackana_6gev.template
delete mode 100644 TEMPLATES/SHMS/STACK/pstackana.template
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/Bean_counter.C (99%)
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/Bean_counter_carbon.C (100%)
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/coin_histo.C (100%)
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/coin_monitor.README (100%)
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/coin_monitor_calc.C (100%)
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/coin_monitor_calc_batch.sh (100%)
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/coin_monitor_graph.C (100%)
rename {SCRIPTS/COIN/MONITOR => UTIL-CT}/coin_monitor_init.C (100%)
rename UTIL/PEDESTAL_MON/COIN/PRODUCTION/hms_ped.C => UTIL-OL/PED_MON/hms_coin_ped.C (93%)
rename UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C.Feb18 => UTIL-OL/PED_MON/hms_ped.C (92%)
rename UTIL/PEDESTAL_MON/COIN/PRODUCTION/shms_ped.C => UTIL-OL/PED_MON/shms_coin_ped.C (93%)
rename UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C.Feb18 => UTIL-OL/PED_MON/shms_ped.C (93%)
rename {UTIL/REPORT_MON/HMS => UTIL-OL/REP_MON}/readout_hms.py (85%)
rename {UTIL/REPORT_MON/SHMS => UTIL-OL/REP_MON}/readout_shms.py (85%)
delete mode 100644 UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C
delete mode 100644 UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C
delete mode 100755 UTIL/SHELL/full_coin_shms.sh
delete mode 100755 UTIL/SHELL/full_shms.sh
delete mode 100755 UTIL/SHELL/run_all_shms.sh
delete mode 100755 UTIL/SHELL/run_beancounter.sh
delete mode 100755 UTIL/SHELL/run_coin.sh
delete mode 100755 UTIL/SHELL/run_coin_ep.sh
delete mode 100755 UTIL/SHELL/run_coin_hElec_pProt.C
delete mode 100755 UTIL/SHELL/run_coin_monitor.sh
delete mode 100755 UTIL/SHELL/run_coin_shms.sh
delete mode 100755 UTIL/SHELL/run_shms.sh
delete mode 120000 full_coin_hms.sh
delete mode 120000 full_coin_shms.sh
delete mode 120000 full_hms.sh
delete mode 120000 full_shms.sh
delete mode 120000 run_all_shms.sh
delete mode 120000 run_beancounter.sh
delete mode 120000 run_coin.sh
delete mode 120000 run_coin_ep.sh
delete mode 120000 run_coin_hms.sh
delete mode 120000 run_coin_monitor.sh
delete mode 120000 run_coin_shms.sh
delete mode 120000 run_hms.sh
delete mode 120000 run_shms.sh
diff --git a/.gitignore b/.gitignore
index c4ab6bc5..c140bbb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@ HISTOGRAMS/*
REPORT_OUTPUT
REPORT_OUTPUT/*
log/*
+full_hms.sh
+full_shms.sh
onlineGUI/Config/kpp_*
*.d
*.so
diff --git a/DBASE/COIN/GEN/default_det_calib_files.param b/DBASE/COIN/GEN/default_det_calib_files.param
deleted file mode 100644
index d4bb7871..00000000
--- a/DBASE/COIN/GEN/default_det_calib_files.param
+++ /dev/null
@@ -1,8 +0,0 @@
-; SHMS default calibration parameter files
-#include "PARAM/SHMS/NGCER/CALIB/pngcer_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param"
-#include "PARAM/SHMS/HODO/CALIB/phodo_calib.param"
-#include "PARAM/SHMS/HGCER/CALIB/phgcer_calib.param"
-#include "PARAM/SHMS/AERO/CALIB/paero_calib.param"
-#include "PARAM/SHMS/CAL/CALIB/pcal_calib.param"
diff --git a/DBASE/COIN/GEN/general.param b/DBASE/COIN/GEN/general.param
deleted file mode 100644
index 4c0dafa5..00000000
--- a/DBASE/COIN/GEN/general.param
+++ /dev/null
@@ -1,72 +0,0 @@
-#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"
-#include "PARAM/GEN/gscalers.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.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.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.param"
-#include "PARAM/HMS/DC/CALIB/hdc_tzero_per_wire.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"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS default geometry parameter files
-#include "PARAM/SHMS/NGCER/GEOM/pngcer_geom.param"
-#include "PARAM/SHMS/DC/GEOM/pdc_geom.param"
-#include "PARAM/SHMS/HODO/GEOM/phodo_geom.param"
-#include "PARAM/SHMS/HGCER/GEOM/phgcer_geom.param"
-#include "PARAM/SHMS/AERO/GEOM/paero_geom.param"
-#include "PARAM/SHMS/CAL/GEOM/pcal_geom.param"
-
-; SHMS default cut parameter files
-#include "PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param"
-#include "PARAM/SHMS/DC/CUTS/pdc_cuts.param"
-#include "PARAM/SHMS/HODO/CUTS/phodo_cuts.param"
-#include "PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param"
-#include "PARAM/SHMS/AERO/CUTS/paero_cuts.param"
-#include "PARAM/SHMS/CAL/CUTS/pcal_cuts.param"
-
-; SHMS default calibration parameter files
-#include "PARAM/SHMS/NGCER/CALIB/pngcer_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param"
-#include "PARAM/SHMS/HODO/CALIB/phodo_calib.param"
-#include "PARAM/SHMS/HGCER/CALIB/phgcer_calib.param"
-#include "PARAM/SHMS/AERO/CALIB/paero_calib.param"
-#include "PARAM/SHMS/CAL/CALIB/pcal_calib.param"
\ No newline at end of file
diff --git a/DBASE/COIN/STD/ep.database b/DBASE/COIN/STD/ep.database
deleted file mode 100644
index 4d163981..00000000
--- a/DBASE/COIN/STD/ep.database
+++ /dev/null
@@ -1,4 +0,0 @@
-0-99999
-g_ctp_parm_filename ="DBASE/COIN/GEN/general.param"
-g_ctp_kinematics_filename ="DBASE/COIN/STD/ep.kinematics"
-g_ctp_calib_filename ="DBASE/COIN/GEN/default_det_calib_files.param"
diff --git a/DBASE/COIN/STD/ep.kinematics b/DBASE/COIN/STD/ep.kinematics
deleted file mode 100644
index 35a23bad..00000000
--- a/DBASE/COIN/STD/ep.kinematics
+++ /dev/null
@@ -1,277 +0,0 @@
-# COIN
-# Need to set htheta_lab to a NEGATIVE value
-# Need to set ptheta_lab to a POSITIVE value
-# 1H gtargmass_amu = 1.00794
-# 12C gtargmass_amu = 12.0107
-# 27Al gtargmass_amu = 26.98
-#
-
-0-99999
-gpbeam = 6.4
-gtargmass_amu=12.0107
-htheta_lab = -15.
-ptheta_lab = 15.
-hpcentral = 3.
-ppcentral = 3.
-hpartmass = 0.00051099
-ppartmass = 0.00051099
-
-1711-1722
-gpbeam=2.221
-hpartmass = 0.938272
-ppartmass = 0.00051099
-
-1711-1712
-hpcentral = 0.957
-ppcentral = 1.816
-htheta_lab = -53.33
-ptheta_lab = 25.01
-
-1711
-gtargmass_amu = 1.00794
-
-1712
-gtargmass_amu = 26.98
-
-1713-1716
-hpcentral = 1.136
-ppcentral = 1.816
-htheta_lab = -47.9
-ptheta_lab = 30.0
-
-1713
-gtargmass_amu = 1.00794
-
-1714-1715
-gtargmass_amu = 26.98
-
-1716
-gtargmass_amu = 1.00794
-
-1717-1718
-hpcentral = 1.136
-ppcentral = 1.686
-htheta_lab = -47.9
-ptheta_lab = 30.0
-
-1717
-gtargmass_amu = 26.98
-
-1718
-gtargmass_amu = 1.00794
-
-1719-1720
-hpcentral = 1.136
-ppcentral = 1.555
-htheta_lab = -47.9
-ptheta_lab = 30.0
-
-1719
-gtargmass_amu = 1.00794
-
-1720
-gtargmass_amu = 26.98
-
-1721-1722
-hpcentral = 0.936
-ppcentral = 2.012
-htheta_lab = -65.1
-ptheta_lab = 25.0
-
-1721
-gtargmass_amu = 26.98
-
-1722
-gtargmass_amu = 1.00794
-
-1851-1867
-gpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -27.5
-ptheta_lab = 27.6
-hpcentral = 3.609
-ppcentral = 3.609*0.985
-hpartmass = 0.93827231
-ppartmass = 0.00051099
-
-1884-1892
-gpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -20.0
-ptheta_lab = 20.0
-hpcentral = 3.609
-ppcentral = 2.5*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-1893-1901
-gpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -27.54
-ptheta_lab = 27.50
-hpcentral = 3.609
-ppcentral = 3.609*0.985
-hpartmass = 0.93827231
-ppartmass = 0.00051099
-
-1902-1903
-gpbeam = 6.405
-gtargmass_amu = 12.0107
-htheta_lab = -27.54
-ptheta_lab = 27.50
-hpcentral = 3.609
-ppcentral = 3.609*0.985
-hpartmass = 0.93827231
-ppartmass = 0.00051099
-
-
-1904-1905
-gpbeam = 6.405
-gtargmass_amu = 12.0107
-htheta_lab = -22.0
-ptheta_lab = 22.0
-hpcentral = 3.2
-ppcentral = 3.2*0.985
-hpartmass = 0.93827231
-ppartmass = 0.00051099
-
-
-1906-1918
-gpbeam = 6.405
-gtargmass_amu = 12.0107
-htheta_lab = -25.01
-ptheta_lab = 30.08
-hpcentral = 2.6
-ppcentral = 2.0*0.985
-hpartmass = 0.93827231
-ppartmass = 0.00051099
-
-
-1919
-gpbeam = 6.405
-gtargmass_amu = 12.0107
-htheta_lab = -22.01
-ptheta_lab = 22.06
-hpcentral = 3.2
-ppcentral = 3.2*0.985
-hpartmass = 0.93827231
-ppartmass = 0.00051099
-
-1920
-gpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -22.01
-ptheta_lab = 33.06
-hpcentral = 4.284
-ppcentral = 2.925*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-1921-1926
-junk run
-
-1927
-gpbeam = 6.405
-gtargmass_amu = 12.0107
-htheta_lab = -22.01
-ptheta_lab = 33.07
-hpcentral = 4.284
-ppcentral = 2.925*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-
-1928
-gpbeam = 6.405
-gtargmass_amu = 12.0107
-htheta_lab = -35.0
-ptheta_lab = 22.05
-hpcentral = 2.869
-ppcentral = 4.38*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-1929
-gpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -22.01
-ptheta_lab = 33.07
-hpcentral = 4.284
-ppcentral = 2.925*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-1930
-Junk Run
-
-1931
-EDTM Test
-
-1932
-Junk Run
-
-1933 - 1949
-EDTM Run
-
-1950
-Junk Run
-
-1951 - 1952
-gpbeam = 6.405
-gtarggpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -50.0
-ptheta_lab = 15.03
-hpcentral = 1.864
-ppcentral = 5.41*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-1953
-mass_amu = 1.00794
-htheta_lab = -50.0
-ptheta_lab = 15.38
-hpcentral = 1.864
-ppcentral = 5.41*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-2022 - 2024
-gpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -45.1
-ptheta_lab = 17.1
-hpcentral = 2.131
-ppcentral = 5.122*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-2042
-gpbeam = 6.405
-gtargmass_amu = 12.0107
-htheta_lab = -15.02
-ptheta_lab = 17.09
-hpcentral = 2.131
-ppcentral = 3.0*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-2043-2044
-gpbeam = 6.405
-gtargmass_amu = 26.98
-htheta_lab = -15.02
-ptheta_lab = 17.12
-hpcentral = 2.131
-ppcentral = 3.0*0.985
-ppartmass = 0.93827231
-hpartmass = 0.00051099
-
-2045-2047
-gpbeam = 6.405
-gtargmass_amu = 1.00794
-htheta_lab = -45.1
-ptheta_lab = 17.12
-hpcentral = 2.131
-ppcentral = 5.122
-ppartmass = 0.93827231
-hpartmass = 0.00051099
\ No newline at end of file
diff --git a/DBASE/COIN/STD/standard.database b/DBASE/COIN/STD/standard.database
deleted file mode 100644
index a7712bc8..00000000
--- a/DBASE/COIN/STD/standard.database
+++ /dev/null
@@ -1,4 +0,0 @@
-0-99999
-g_ctp_parm_filename ="DBASE/COIN/GEN/general.param"
-g_ctp_kinematics_filename ="DBASE/COIN/STD/standard.kinematics"
-g_ctp_calib_filename ="DBASE/COIN/GEN/default_det_calib_files.param"
diff --git a/DBASE/COIN/general.param b/DBASE/COIN/general.param
new file mode 100644
index 00000000..24914187
--- /dev/null
+++ b/DBASE/COIN/general.param
@@ -0,0 +1,72 @@
+#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"
+#include "PARAM/GEN/gscalers.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/hcer_geom.param"
+#include "PARAM/HMS/DC/hdc_geom.param"
+#include "PARAM/HMS/HODO/hhodo_geom.param"
+#include "PARAM/HMS/AERO/haero_geom.param"
+#include "PARAM/HMS/CAL/hcal_geom.param"
+
+; HMS default cut parameter files
+#include "PARAM/HMS/CER/hcer_cuts.param"
+#include "PARAM/HMS/DC/hdc_cuts.param"
+#include "PARAM/HMS/HODO/hhodo_cuts.param"
+#include "PARAM/HMS/AERO/haero_cuts.param"
+#include "PARAM/HMS/CAL/hcal_cuts.param"
+
+; HMS default calibration parameter files
+#include "PARAM/HMS/CER/hcer_calib.param"
+#include "PARAM/HMS/DC/hdc_calib.param"
+#include "PARAM/HMS/DC/hdc_tzero_per_wire.param"
+#include "PARAM/HMS/HODO/hhodo_calib.param"
+#include "PARAM/HMS/AERO/haero_calib.param"
+#include "PARAM/HMS/CAL/hcal_calib.param"
+
+; General SHMS parameter files
+; Note: shmsflags.param includes spectrometer offsets and options.
+#include "PARAM/SHMS/GEN/pcana.param"
+#include "PARAM/SHMS/GEN/pdebug.param"
+#include "PARAM/SHMS/GEN/shmsflags.param"
+#include "PARAM/SHMS/GEN/ptracking.param"
+
+; SHMS default geometry parameter files
+#include "PARAM/SHMS/NGCER/pngcer_geom.param"
+#include "PARAM/SHMS/DC/pdc_geom.param"
+#include "PARAM/SHMS/HODO/phodo_geom.param"
+#include "PARAM/SHMS/HGCER/phgcer_geom.param"
+#include "PARAM/SHMS/AERO/paero_geom.param"
+#include "PARAM/SHMS/CAL/pcal_geom.param"
+
+; SHMS default cut parameter files
+#include "PARAM/SHMS/NGCER/pngcer_cuts.param"
+#include "PARAM/SHMS/DC/pdc_cuts.param"
+#include "PARAM/SHMS/HODO/phodo_cuts.param"
+#include "PARAM/SHMS/HGCER/phgcer_cuts.param"
+#include "PARAM/SHMS/AERO/paero_cuts.param"
+#include "PARAM/SHMS/CAL/pcal_cuts.param"
+
+; SHMS default calibration parameter files
+#include "PARAM/SHMS/NGCER/pngcer_calib.param"
+#include "PARAM/SHMS/DC/pdc_calib.param"
+#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
+#include "PARAM/SHMS/HODO/phodo_calib.param"
+#include "PARAM/SHMS/HGCER/phgcer_calib.param"
+#include "PARAM/SHMS/AERO/paero_calib.param"
+#include "PARAM/SHMS/CAL/pcal_calib.param"
\ No newline at end of file
diff --git a/DBASE/COIN/standard.database b/DBASE/COIN/standard.database
new file mode 100644
index 00000000..0b15e342
--- /dev/null
+++ b/DBASE/COIN/standard.database
@@ -0,0 +1,3 @@
+0-99999
+g_ctp_parm_filename = "DBASE/COIN/general.param"
+g_ctp_kinematics_filename = "DBASE/COIN/standard.kinematics"
\ No newline at end of file
diff --git a/DBASE/COIN/STD/standard.kinematics b/DBASE/COIN/standard.kinematics
similarity index 71%
rename from DBASE/COIN/STD/standard.kinematics
rename to DBASE/COIN/standard.kinematics
index 4f791f04..449f64a6 100644
--- a/DBASE/COIN/STD/standard.kinematics
+++ b/DBASE/COIN/standard.kinematics
@@ -6,7 +6,7 @@
# 27Al gtargmass_amu = 26.98
#
-0-1710
+0-99999
gpbeam = 6.430
gtargmass_amu=12.0107
htheta_lab = -15.
@@ -418,7 +418,7 @@ ppartmass = 0.93827231
hpartmass = 0.0005109
#Color Transparency --Feb 14/H coincidence run
-2406-2418
+2406-9999
gpbeam = 10.600
gtargmass_amu = 1.00794
htheta_lab = -39.280
@@ -426,136 +426,4 @@ ptheta_lab = 12.800
hpcentral = 2.982
ppcentral = 8.505*0.985
ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 15/H coincidence run
-2419-2419
-gpbeam = 10.600
-gtargmass_amu = 1.00794
-htheta_lab = -39.280
-ptheta_lab = 12.800
-hpcentral = 2.982
-ppcentral = 8.505*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 16/H coincidence run
-2420-2429
-gpbeam = 10.600
-gtargmass_amu = 1.00794
-htheta_lab = -39.280
-ptheta_lab = 12.800
-hpcentral = 2.982
-ppcentral = 8.505*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 17/H coincidence run
-2430-2435
-gpbeam = 10.600
-gtargmass_amu = 1.00794
-htheta_lab = -39.280
-ptheta_lab = 12.800
-hpcentral = 2.982
-ppcentral = 8.505*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 17/H singles run
-2436-2437
-gpbeam = 10.600
-gtargmass_amu = 1.00794
-htheta_lab = -39.280
-ptheta_lab = 12.800
-hpcentral = 2.982
-ppcentral = 8.505*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 17/Al coincidence run
-2438-2438
-gpbeam = 10.600
-gtargmass_amu = 26.98
-htheta_lab = -39.280
-ptheta_lab = 12.800
-hpcentral = 2.982
-ppcentral = 8.505*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 17/C singles
-2439-2440
-gpbeam = 10.600
-gtargmass_amu = 12.0107
-htheta_lab = -39.280
-ptheta_lab = 12.800
-hpcentral = 2.982
-ppcentral = 8.505*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 17/C coincidence run
-2441-2445
-gpbeam = 10.600
-gtargmass_amu = 12.0107
-htheta_lab = -28.505
-ptheta_lab = 17.830
-hpcentral = 4.278
-ppcentral = 7.001*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 18/C coincidence run
-2446-2451
-gpbeam = 10.600
-gtargmass_amu = 12.0107
-htheta_lab = -28.505
-ptheta_lab = 17.830
-hpcentral = 4.478
-ppcentral = 7.001*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 18/H coincidence run
-2452-2454
-gpbeam = 10.600
-gtargmass_amu = 1.00794
-htheta_lab = -28.505
-ptheta_lab = 17.830
-hpcentral = 4.478
-ppcentral = 7.001*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 18/Al coincidence run
-2455
-gpbeam = 10.600
-gtargmass_amu = 26.98
-htheta_lab = -28.505
-ptheta_lab = 17.830
-hpcentral = 4.478
-ppcentral = 7.001*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 18/C coincidence run
-2456-2463
-gpbeam = 10.600
-gtargmass_amu = 12.0107
-htheta_lab = -28.505
-ptheta_lab = 17.830
-hpcentral = 4.478
-ppcentral = 7.001*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
-
-#Color Transparency --Feb 18/C coincidence run
-2464-2464
-gpbeam = 10.600
-gtargmass_amu = 12.0107
-htheta_lab = -28.505
-ptheta_lab = 17.830
-hpcentral = 4.478
-ppcentral = 7.001*0.985
-ppartmass = 0.93827231
-hpartmass = 0.0005109
+hpartmass = 0.0005109
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1130.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1130.param
deleted file mode 100644
index e60dafcb..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1130.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1130
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1130.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1136.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1136.param
deleted file mode 100644
index dd08cabf..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1136.param
+++ /dev/null
@@ -1,3 +0,0 @@
-; HMS calibration files for run 1136
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1136.param"
-#include "/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1136.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1178.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1178.param
deleted file mode 100644
index e8c378ad..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1178.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1178
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1178.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1179.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1179.param
deleted file mode 100644
index 0db463ec..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1179.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1179
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1179.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1180.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1180.param
deleted file mode 100644
index 1269d2e7..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1180.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1180
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1180.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1212.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1212.param
deleted file mode 100644
index 88157d17..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1212.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1212
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1212.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1213.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1213.param
deleted file mode 100644
index 8601f869..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1213.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1213
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1213.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1214.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1214.param
deleted file mode 100644
index 53f3dc95..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1214.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1214
-#include "/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1214.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1235.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1235.param
deleted file mode 100644
index 1eedb895..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1235.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1235
-#include "/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1235.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1249.param b/DBASE/HMS/GEN/Fall_Comm_2017/calib_1249.param
deleted file mode 100644
index f59be789..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/calib_1249.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; HMS calibration files for run 1249
-#include "/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1249.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/Fall_Comm_2017/general.param b/DBASE/HMS/GEN/Fall_Comm_2017/general.param
deleted file mode 100644
index ce8d05fd..00000000
--- a/DBASE/HMS/GEN/Fall_Comm_2017/general.param
+++ /dev/null
@@ -1,40 +0,0 @@
-#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"
-#include "PARAM/GEN/gscalers.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.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.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.param"
-#include "PARAM/HMS/DC/CALIB/hdc_tzero_per_wire.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/GEN/KPP_Spring_2017/calib_303.param b/DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param
deleted file mode 100644
index b278a65b..00000000
--- a/DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param
+++ /dev/null
@@ -1,5 +0,0 @@
-; HMS calibration files for run 303
-#include "PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib_303.param"
-#include "PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_303.param"
-#include "PARAM/HMS/HODO/CALIB/KPP_Spring_2017/hhodo_calib_303.param"
-#include "PARAM/HMS/CAL/CALIB/KPP_Spring_2017/hcal_calib_303.param"
diff --git a/DBASE/HMS/GEN/KPP_Spring_2017/general.param b/DBASE/HMS/GEN/KPP_Spring_2017/general.param
deleted file mode 100644
index b0857584..00000000
--- a/DBASE/HMS/GEN/KPP_Spring_2017/general.param
+++ /dev/null
@@ -1,39 +0,0 @@
-#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"
-#include "PARAM/GEN/gscalers.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/KPP_Spring_2017/hdc_cuts_6gev.param"
-#include "PARAM/HMS/HODO/CUTS/KPP_Spring_2017/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/KPP_Spring_2017/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"
diff --git a/DBASE/HMS/GEN/default_det_calib_files.param b/DBASE/HMS/GEN/default_det_calib_files.param
deleted file mode 100644
index 4a5bfd97..00000000
--- a/DBASE/HMS/GEN/default_det_calib_files.param
+++ /dev/null
@@ -1,7 +0,0 @@
-; Default calibration files in general.param
-#include "PARAM/HMS/DC/CALIB/hdc_calib.param"
-#include "PARAM/HMS/DC/CALIB/hdc_tzero_per_wire.param"
-#include "PARAM/HMS/HODO/CALIB/hhodo_calib.param"'
-#include "PARAM/HMS/HODO/CALIB/htofcalib.param"
-#include "PARAM/HMS/CER/CALIB/hcer_calib.param"
-#include "PARAM/HMS/CAL/CALIB/hcal_calib.param"
\ No newline at end of file
diff --git a/DBASE/HMS/GEN/general.param b/DBASE/HMS/GEN/general.param
deleted file mode 100644
index ce8d05fd..00000000
--- a/DBASE/HMS/GEN/general.param
+++ /dev/null
@@ -1,40 +0,0 @@
-#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"
-#include "PARAM/GEN/gscalers.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.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.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.param"
-#include "PARAM/HMS/DC/CALIB/hdc_tzero_per_wire.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
deleted file mode 100644
index 278bf539..00000000
--- a/DBASE/HMS/STD/standard.database
+++ /dev/null
@@ -1,41 +0,0 @@
-0-99999
-g_ctp_parm_filename ="DBASE/HMS/GEN/general.param"
-g_ctp_kinematics_filename ="DBASE/HMS/STD/standard.kinematics"
-g_ctp_calib_filename ="DBASE/HMS/GEN/default_det_calib_files.param"
-
-303-303
-g_ctp_parm_filename ="DBASE/HMS/GEN/KPP_Spring_2017/general.param"
-g_ctp_calib_filename ="DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param"
-
-1116-1277
-g_ctp_parm_filename ="DBASE/HMS/GEN/Fall_Comm_2017/general.param"
-
-1130-1130
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1130.param"
-
-1136-1136
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1136.param"
-
-1178-1178
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1178.param"
-
-1179-1179
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1179.param"
-
-1180-1180
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1180.param"
-
-1212-1212
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1212.param"
-
-1213-1213
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1213.param"
-
-1214-1214
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1214.param"
-
-1235-1235
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1235.param"
-
-1249-1249
-g_ctp_calib_filename ="DBASE/HMS/GEN/Fall_Comm_2017/calib_1249.param"
\ No newline at end of file
diff --git a/DBASE/HMS/general.param b/DBASE/HMS/general.param
new file mode 100644
index 00000000..6b916a13
--- /dev/null
+++ b/DBASE/HMS/general.param
@@ -0,0 +1,40 @@
+#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"
+#include "PARAM/GEN/gscalers.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/hcer_geom.param"
+#include "PARAM/HMS/DC/hdc_geom.param"
+#include "PARAM/HMS/HODO/hhodo_geom.param"
+#include "PARAM/HMS/AERO/haero_geom.param"
+#include "PARAM/HMS/CAL/hcal_geom.param"
+
+; HMS default cut parameter files
+#include "PARAM/HMS/CER/hcer_cuts.param"
+#include "PARAM/HMS/DC/hdc_cuts.param"
+#include "PARAM/HMS/HODO/hhodo_cuts.param"
+#include "PARAM/HMS/AERO/haero_cuts.param"
+#include "PARAM/HMS/CAL/hcal_cuts.param"
+
+; HMS default calibration parameter files
+#include "PARAM/HMS/CER/hcer_calib.param"
+#include "PARAM/HMS/DC/hdc_calib.param"
+#include "PARAM/HMS/DC/hdc_tzero_per_wire.param"
+#include "PARAM/HMS/HODO/hhodo_calib.param"
+#include "PARAM/HMS/AERO/haero_calib.param"
+#include "PARAM/HMS/CAL/hcal_calib.param"
\ No newline at end of file
diff --git a/DBASE/HMS/standard.database b/DBASE/HMS/standard.database
new file mode 100644
index 00000000..47802e1d
--- /dev/null
+++ b/DBASE/HMS/standard.database
@@ -0,0 +1,3 @@
+0-99999
+g_ctp_parm_filename = "DBASE/HMS/general.param"
+g_ctp_kinematics_filename = "DBASE/HMS/standard.kinematics"
\ No newline at end of file
diff --git a/DBASE/HMS/STD/standard.kinematics b/DBASE/HMS/standard.kinematics
similarity index 100%
rename from DBASE/HMS/STD/standard.kinematics
rename to DBASE/HMS/standard.kinematics
diff --git a/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1583.param b/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1583.param
deleted file mode 100644
index 9ffb7b13..00000000
--- a/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1583.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 1583
-#include "/PARAM/SHMS/HGCER/CALIB/Fall_Comm_2017/phgcer_calib_1583.param"
\ No newline at end of file
diff --git a/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1585.param b/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1585.param
deleted file mode 100644
index 1db5a731..00000000
--- a/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1585.param
+++ /dev/null
@@ -1,3 +0,0 @@
-; SHMS calibration files for run 1585
-#include "/PARAM/SHMS/AERO/CALIB/Fall_Comm_2017/paero_calib_1585.param"
-#include "/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1585.param"
\ No newline at end of file
diff --git a/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1586.param b/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1586.param
deleted file mode 100644
index bbe4a6f8..00000000
--- a/DBASE/SHMS/GEN/Fall_Comm_2017/calib_1586.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 1586
-#include "/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1586.param"
\ No newline at end of file
diff --git a/DBASE/SHMS/GEN/Fall_Comm_2017/general.param b/DBASE/SHMS/GEN/Fall_Comm_2017/general.param
deleted file mode 100644
index afff83d0..00000000
--- a/DBASE/SHMS/GEN/Fall_Comm_2017/general.param
+++ /dev/null
@@ -1,43 +0,0 @@
-#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"
-#include "PARAM/GEN/gscalers.param"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS default geometry parameter files
-#include "PARAM/SHMS/NGCER/GEOM/pngcer_geom.param"
-#include "PARAM/SHMS/DC/GEOM/pdc_geom.param"
-#include "PARAM/SHMS/HODO/GEOM/phodo_geom.param"
-#include "PARAM/SHMS/HGCER/GEOM/phgcer_geom.param"
-#include "PARAM/SHMS/AERO/GEOM/paero_geom.param"
-#include "PARAM/SHMS/CAL/GEOM/pcal_geom.param"
-
-; SHMS default cut parameter files
-#include "PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param"
-#include "PARAM/SHMS/DC/CUTS/pdc_cuts.param"
-#include "PARAM/SHMS/HODO/CUTS/phodo_cuts.param"
-#include "PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param"
-#include "PARAM/SHMS/AERO/CUTS/paero_cuts.param"
-#include "PARAM/SHMS/CAL/CUTS/pcal_cuts.param"
-
-; SHMS default calibration parameter files
-#include "PARAM/SHMS/NGCER/CALIB/pngcer_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param"
-#include "PARAM/SHMS/HODO/CALIB/phodo_calib.param"
-#include "PARAM/SHMS/HGCER/CALIB/phgcer_calib.param"
-#include "PARAM/SHMS/AERO/CALIB/paero_calib.param"
-#include "PARAM/SHMS/CAL/CALIB/pcal_calib.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param
deleted file mode 100644
index c9d571e7..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 464
-#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param"
\ No newline at end of file
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param
deleted file mode 100644
index d9c47054..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param
+++ /dev/null
@@ -1 +0,0 @@
-; SHMS calibration files for run 469
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param
deleted file mode 100644
index 25666a9d..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 475
-#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param
deleted file mode 100644
index 7605b7b8..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 478
-#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param
deleted file mode 100644
index 659cd604..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 479
-#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param
deleted file mode 100644
index 89bdeb22..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 480
-#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param"
\ No newline at end of file
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param
deleted file mode 100644
index b8b0e9aa..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 481
-#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param
deleted file mode 100644
index 701ba9f1..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param
+++ /dev/null
@@ -1,3 +0,0 @@
-; SHMS calibration files for run 483
-#include "PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param"
-#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param
deleted file mode 100644
index c2ad1d6a..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 484
-#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_486.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_486.param
deleted file mode 100644
index 6d069e04..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_486.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; SHMS calibration files for run 486
-#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_487.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_487.param
deleted file mode 100644
index e93fa8ed..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_487.param
+++ /dev/null
@@ -1,3 +0,0 @@
-; SHMS calibration files for run 487
-#include "PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param"
-#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_488.param b/DBASE/SHMS/GEN/KPP_Spring_2017/calib_488.param
deleted file mode 100644
index 62555456..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/calib_488.param
+++ /dev/null
@@ -1,4 +0,0 @@
-; SHMS calibration files for run 488
-#include "PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param"
-#include "PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param"
-#include "PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param"
diff --git a/DBASE/SHMS/GEN/KPP_Spring_2017/general.param b/DBASE/SHMS/GEN/KPP_Spring_2017/general.param
deleted file mode 100644
index efb31a6c..00000000
--- a/DBASE/SHMS/GEN/KPP_Spring_2017/general.param
+++ /dev/null
@@ -1,43 +0,0 @@
-#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"
-#include "PARAM/GEN/gscalers.param"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS default geometry parameter files
-#include "PARAM/SHMS/NGCER/GEOM/pngcer_geom.param"
-#include "PARAM/SHMS/DC/GEOM/pdc_geom.param"
-#include "PARAM/SHMS/HODO/GEOM/phodo_geom.param"
-#include "PARAM/SHMS/HGCER/GEOM/phgcer_geom.param"
-#include "PARAM/SHMS/AERO/GEOM/paero_geom.param"
-#include "PARAM/SHMS/CAL/GEOM/pcal_geom.param"
-
-; SHMS default cut parameter files
-#include "PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param"
-#include "PARAM/SHMS/DC/CUTS/pdc_cuts.param"
-#include "PARAM/SHMS/HODO/CUTS/KPP_Spring_2017/phodo_cuts.param"
-#include "PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param"
-#include "PARAM/SHMS/AERO/CUTS/paero_cuts.param"
-#include "PARAM/SHMS/CAL/CUTS/pcal_cuts.param"
-
-; SHMS default calibration parameter files
-#include "PARAM/SHMS/NGCER/CALIB/pngcer_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param"
-#include "PARAM/SHMS/HODO/CALIB/phodo_calib.param"
-#include "PARAM/SHMS/HGCER/CALIB/phgcer_calib.param"
-#include "PARAM/SHMS/AERO/CALIB/paero_calib.param"
-#include "PARAM/SHMS/CAL/CALIB/pcal_calib.param"
diff --git a/DBASE/SHMS/GEN/default_det_calib_files.param b/DBASE/SHMS/GEN/default_det_calib_files.param
deleted file mode 100644
index d4bb7871..00000000
--- a/DBASE/SHMS/GEN/default_det_calib_files.param
+++ /dev/null
@@ -1,8 +0,0 @@
-; SHMS default calibration parameter files
-#include "PARAM/SHMS/NGCER/CALIB/pngcer_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param"
-#include "PARAM/SHMS/HODO/CALIB/phodo_calib.param"
-#include "PARAM/SHMS/HGCER/CALIB/phgcer_calib.param"
-#include "PARAM/SHMS/AERO/CALIB/paero_calib.param"
-#include "PARAM/SHMS/CAL/CALIB/pcal_calib.param"
diff --git a/DBASE/SHMS/GEN/general.param b/DBASE/SHMS/GEN/general.param
deleted file mode 100644
index afff83d0..00000000
--- a/DBASE/SHMS/GEN/general.param
+++ /dev/null
@@ -1,43 +0,0 @@
-#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"
-#include "PARAM/GEN/gscalers.param"
-
-; General SHMS parameter files
-; Note: shmsflags.param includes spectrometer offsets and options.
-#include "PARAM/SHMS/GEN/pcana.param"
-#include "PARAM/SHMS/GEN/pdebug.param"
-#include "PARAM/SHMS/GEN/shmsflags.param"
-#include "PARAM/SHMS/GEN/ptracking.param"
-
-; SHMS default geometry parameter files
-#include "PARAM/SHMS/NGCER/GEOM/pngcer_geom.param"
-#include "PARAM/SHMS/DC/GEOM/pdc_geom.param"
-#include "PARAM/SHMS/HODO/GEOM/phodo_geom.param"
-#include "PARAM/SHMS/HGCER/GEOM/phgcer_geom.param"
-#include "PARAM/SHMS/AERO/GEOM/paero_geom.param"
-#include "PARAM/SHMS/CAL/GEOM/pcal_geom.param"
-
-; SHMS default cut parameter files
-#include "PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param"
-#include "PARAM/SHMS/DC/CUTS/pdc_cuts.param"
-#include "PARAM/SHMS/HODO/CUTS/phodo_cuts.param"
-#include "PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param"
-#include "PARAM/SHMS/AERO/CUTS/paero_cuts.param"
-#include "PARAM/SHMS/CAL/CUTS/pcal_cuts.param"
-
-; SHMS default calibration parameter files
-#include "PARAM/SHMS/NGCER/CALIB/pngcer_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_calib.param"
-#include "PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param"
-#include "PARAM/SHMS/HODO/CALIB/phodo_calib.param"
-#include "PARAM/SHMS/HGCER/CALIB/phgcer_calib.param"
-#include "PARAM/SHMS/AERO/CALIB/paero_calib.param"
-#include "PARAM/SHMS/CAL/CALIB/pcal_calib.param"
diff --git a/DBASE/SHMS/STD/standard.database b/DBASE/SHMS/STD/standard.database
deleted file mode 100644
index 1b2d3358..00000000
--- a/DBASE/SHMS/STD/standard.database
+++ /dev/null
@@ -1,55 +0,0 @@
-0-99999
-g_ctp_parm_filename ="DBASE/SHMS/GEN/general.param"
-g_ctp_kinematics_filename ="DBASE/SHMS/STD/standard.kinematics"
-g_ctp_calib_filename ="DBASE/SHMS/GEN/default_det_calib_files.param"
-
-464-488
-g_ctp_parm_filename ="DBASE/SHMS/GEN/KPP_Spring_2017/general.param"
-
-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"
-
-1158-1704
-g_ctp_parm_filename ="DBASE/SHMS/GEN/Fall_Comm_2017/general.param"
-
-1583-1583
-g_ctp_calib_filename ="DBASE/SHMS/GEN/Fall_Comm_2017/calib_1583.param"
-
-1585-1585
-g_ctp_calib_filename ="DBASE/SHMS/GEN/Fall_Comm_2017/calib_1585.param"
-
-1586-1586
-g_ctp_calib_filename ="DBASE/SHMS/GEN/Fall_Comm_2017/calib_1586.param"
diff --git a/DBASE/SHMS/general.param b/DBASE/SHMS/general.param
new file mode 100644
index 00000000..1377a7a2
--- /dev/null
+++ b/DBASE/SHMS/general.param
@@ -0,0 +1,43 @@
+#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"
+#include "PARAM/GEN/gscalers.param"
+
+; General SHMS parameter files
+; Note: shmsflags.param includes spectrometer offsets and options.
+#include "PARAM/SHMS/GEN/pcana.param"
+#include "PARAM/SHMS/GEN/pdebug.param"
+#include "PARAM/SHMS/GEN/shmsflags.param"
+#include "PARAM/SHMS/GEN/ptracking.param"
+
+; SHMS default geometry parameter files
+#include "PARAM/SHMS/NGCER/pngcer_geom.param"
+#include "PARAM/SHMS/DC/pdc_geom.param"
+#include "PARAM/SHMS/HODO/phodo_geom.param"
+#include "PARAM/SHMS/HGCER/phgcer_geom.param"
+#include "PARAM/SHMS/AERO/paero_geom.param"
+#include "PARAM/SHMS/CAL/pcal_geom.param"
+
+; SHMS default cut parameter files
+#include "PARAM/SHMS/NGCER/pngcer_cuts.param"
+#include "PARAM/SHMS/DC/pdc_cuts.param"
+#include "PARAM/SHMS/HODO/phodo_cuts.param"
+#include "PARAM/SHMS/HGCER/phgcer_cuts.param"
+#include "PARAM/SHMS/AERO/paero_cuts.param"
+#include "PARAM/SHMS/CAL/pcal_cuts.param"
+
+; SHMS default calibration parameter files
+#include "PARAM/SHMS/NGCER/pngcer_calib.param"
+#include "PARAM/SHMS/DC/pdc_calib.param"
+#include "PARAM/SHMS/DC/pdc_tzero_per_wire.param"
+#include "PARAM/SHMS/HODO/phodo_calib.param"
+#include "PARAM/SHMS/HGCER/phgcer_calib.param"
+#include "PARAM/SHMS/AERO/paero_calib.param"
+#include "PARAM/SHMS/CAL/pcal_calib.param"
diff --git a/DBASE/SHMS/standard.database b/DBASE/SHMS/standard.database
new file mode 100644
index 00000000..e76e93d8
--- /dev/null
+++ b/DBASE/SHMS/standard.database
@@ -0,0 +1,3 @@
+0-99999
+g_ctp_parm_filename = "DBASE/SHMS/general.param"
+g_ctp_kinematics_filename = "DBASE/SHMS/standard.kinematics"
\ No newline at end of file
diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/standard.kinematics
similarity index 100%
rename from DBASE/SHMS/STD/standard.kinematics
rename to DBASE/SHMS/standard.kinematics
diff --git a/DBASE/db_run.dat b/DBASE/db_run.dat
deleted file mode 100644
index b45726f2..00000000
--- a/DBASE/db_run.dat
+++ /dev/null
@@ -1,7 +0,0 @@
-# d2n run database
-
---------[ 2015-01-01 01:00:00 ]
-
-# 2015 SHMS Drift Chamber test sin ESB
-ebeam = 6.0
-
diff --git a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
index 51a3cb48..b7f5620d 100644
--- a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
@@ -53,6 +53,6 @@ TH2D htrig6rate_vs_time 'HMS Trig6 Rate vs. Time; 1 MHz Clock Time (s); hTRIG6 R
#HMS Trigger ADC Pulse pedestals
#--------------------------------
-TH1F htrig_hpreShwr_adc_pped 'HMS Pre-Shower Pulse Pedestal; Pulse Pedestal (mV); Counts / 0.25 mV;' T.hms.hPSHWR_adcPed 4000 0 1000 T.hms.hPSHWR_adcPed>0.0
-TH1F htrig_hshwr_adc_pped 'HMS Shower Pulse Pedestal; Pulse Pedestal (mV); Counts / 0.25 mV;' T.hms.hSHWR_adcPed 4000 0 1000 T.hms.hSHWR_adcPed>0.0
-TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 0.25 mV;' T.hms.hCER_adcPed 4000 0 1000 T.hms.hCER_adcPed>0.0
+TH1F htrig_hpreShwr_adc_pped 'HMS Pre-Shower Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hPSHWR_adcPed 500 0 1000 T.hms.hPSHWR_adcPed>0.0
+TH1F htrig_hshwr_adc_pped 'HMS Shower Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hSHWR_adcPed 500 0 1000 T.hms.hSHWR_adcPed>0.0
+TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (mV); Counts / 2 mV;' T.hms.hCER_adcPed 500 0 1000 T.hms.hCER_adcPed>0.0
diff --git a/DEF-files/HMS/STACK/AERO/haero_histos.def b/DEF-files/HMS/STACK/AERO/haero_histos.def
deleted file mode 100644
index 3ba092df..00000000
--- a/DEF-files/HMS/STACK/AERO/haero_histos.def
+++ /dev/null
@@ -1,43 +0,0 @@
-#***************
-# HMS AEROGEL *
-#***************
-
-#----------------------------------------------
-# HMS AEROGEL GOOD Occupancy and Multiplicity
-#----------------------------------------------
-
-TH1F haero_good_occ_pos 'HMS Aero+ Good Occupancy; PMT Number; Number of Good +ADC Hits' H.aero.numGoodPosAdcHits 8 0.5 8.5
-TH1F haero_good_occ_neg 'HMS Aero- Good Occupancy; PMT Number; Number of Good -ADC Hits' H.aero.numGoodNegAdcHits 8 0.5 8.5
-TH1F haero_good_mult_pos 'HMS Aero+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.aero.totNumGoodPosAdcHits 8 0.5 8.5
-TH1F haero_good_mult_neg 'HMS Aero- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.aero.totNumGoodNegAdcHits 8 0.5 8.5
-TH1F haero_good_mult 'HMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.aero.totnumGoodAdcHits 16 0.5 16.5
-
-#-------------------------------
-# HMS AERO TOTAL NUMBER OF P.E.
-#-------------------------------
-
-TH1F haero_tot_npe_pos 'HMS Aero+ Total Number of Photoelectrons; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.aero.posNpeSum 200 0 100 H.aero.posNpeSum>0.0
-TH1F haero_tot_npe_neg 'HMS Aero- Total Number of Photoelectrons; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.aero.negNpeSum 200 0 100 H.aero.negNpeSum>0.0
-TH1F haero_tot_npe 'HMS Aero Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.aero.npeSum 200 0 100 H.aero.npeSum>0.0
-
-#--------------------------------
-# HMS AERO Number of P.E. / PMT
-#--------------------------------
-
-TH2F haero_npe_pos 'HMS Aero+ Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] H.aero.posNpe 8 0.5 8.5 200 0 100 P.aero.posNpe>0.0
-TH2F haero_npe_neg 'HMS Aero- Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] H.aero.negNpe 8 0.5 8.5 200 0 100 P.aero.negNpe>0.0
-
-#------------------------------------------------------------------------------
-# HMS AERO GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#------------------------------------------------------------------------------
-
-TH2F haero_good_pped_vs_pmt_pos 'HMS Aero+ Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] H.aero.goodPosAdcPed 7 0.5 7.5 400 300 700 H.aero.goodPosAdcPed>0.0
-TH2F haero_good_pi_vs_pmt_pos 'HMS Aero+ Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] H.aero.goodPosAdcPulseInt 7 0.5 7.5 600 0 30000 H.aero.goodPosAdcPulseInt>0.0
-TH2F haero_good_pamp_vs_pmt_pos 'HMS Aero+ Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] H.aero.goodPosAdcPulseAmp 7 0.5 7.5 200 0 4000 H.aero.goodPosAdcPulseAmp>0.0
-TH2F haero_good_ptime_vs_pmt_pos 'HMS Aero+ Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] H.aero.goodPosAdcPulseTime 7 0.5 7.5 350 0 3500 H.aero.goodPosAdcPulseTime>0.0
-
-TH2F haero_good_pped_vs_pmt_neg 'HMS Aero- Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] H.aero.goodNegAdcPed 7 0.5 7.5 400 300 700 H.aero.goodNegAdcPed>0.0
-TH2F haero_good_pi_vs_pmt_neg 'HMS Aero- Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] H.aero.goodNegAdcPulseInt 7 0.5 7.5 600 0 30000 H.aero.goodNegAdcPulseInt>0.0
-TH2F haero_good_pamp_vs_pmt_neg 'HMS Aero- Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] H.aero.goodNegAdcPulseAmp 7 0.5 7.5 200 0 4000 H.aero.goodNegAdcPulseAmp>0.0
-TH2F haero_good_ptime_vs_pmt_neg 'HMS Aero- Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] H.aero.goodNegAdcPulseTime 7 0.5 7.5 350 0 3500 H.aero.goodNegAdcPulseTime>0.0
diff --git a/DEF-files/HMS/STACK/BLOCK/hblock_vars.def b/DEF-files/HMS/STACK/BLOCK/hblock_vars.def
deleted file mode 100644
index 44d4aa99..00000000
--- a/DEF-files/HMS/STACK/BLOCK/hblock_vars.def
+++ /dev/null
@@ -1,12 +0,0 @@
-#********************
-# Block Definitions *
-#********************
-
-block T.hms.*
-block H.cer.*
-block H.dc.*
-block H.tr.*
-block H.hod.*
-block H.aero.*
-block H.cal.*
-block H.gtr.*
diff --git a/DEF-files/HMS/STACK/CAL/hcal_histos.def b/DEF-files/HMS/STACK/CAL/hcal_histos.def
deleted file mode 100644
index eedbc997..00000000
--- a/DEF-files/HMS/STACK/CAL/hcal_histos.def
+++ /dev/null
@@ -1,106 +0,0 @@
-#******************
-# HMS CALORIMETER
-#******************
-
-#------------------------
-# HMS CAL Good Occupancy
-#------------------------
-
-TH1F hcal_hA_good_occ_pos 'HMS hA+ Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_occ_neg 'HMS hA- Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_occ_pos 'HMS hB+ Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_occ_neg 'HMS hB- Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hC_good_occ_pos 'HMS hC+ Good Occupancy; PMT Number; Number of Entries' H.cal.3ta.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hD_good_occ_pos 'HMS hD+ Good Occupancy; PMT Number; Number of Entries' H.cal.4ta.numGoodPosAdcHits 13 0.5 13.5
-
-#---------------------------
-# HMS CAL Good Multiplicity
-#---------------------------
-
-TH1F hcal_hA_good_mult_pos 'HMS hA+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.1pr.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_mult_neg 'HMS hA- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.1pr.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_mult 'HMS hA Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.1pr.totnumGoodAdcHits 26 0.5 26.5
-
-TH1F hcal_hB_good_mult_pos 'HMS hB+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.2ta.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_mult_neg 'HMS hB- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.2ta.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_mult 'HMS hB Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.2ta.totnumGoodAdcHits 26 0.5 26.5
-
-TH1F hcal_hC_good_mult_pos 'HMS hC+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.3ta.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hD_good_mult_pos 'HMS hD+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.4ta.totNumGoodPosAdcHits 13 0.5 13.5
-
-#-------------------------------
-# HMS CAL Good Pulse Pedestals
-#-------------------------------
-
-TH2F hcal_hA_good_pped_vs_pmt_pos 'HMS hA+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.1pr.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.1pr.goodPosAdcPed>0.0
-TH2F hcal_hA_good_pped_vs_pmt_neg 'HMS hA- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.1pr.goodNegAdcPed 13 0.5 13.5 400 300 700 H.cal.1pr.goodNegAdcPed>0.0
-TH2F hcal_hB_good_pped_vs_pmt_pos 'HMS hB+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.2ta.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.2ta.goodPosAdcPed>0.0
-TH2F hcal_hB_good_pped_vs_pmt_neg 'HMS hB- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.2ta.goodNegAdcPed 13 0.5 13.5 400 300 700 H.cal.2ta.goodNegAdcPed>0.0
-TH2F hcal_hC_good_pped_vs_pmt_pos 'HMS hC+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.3ta.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.3ta.goodPosAdcPed>0.0
-TH2F hcal_hD_good_pped_vs_pmt_pos 'HMS hD+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.4ta.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.4ta.goodPosAdcPed>0.0
-
-#-------------------------------
-# HMS CAL Good Pulse Integrals
-#-------------------------------
-
-TH2F hcal_hA_good_pi_vs_pmt_pos 'HMS hA+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.1pr.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.1pr.goodPosAdcPulseInt>0.0
-TH2F hcal_hA_good_pi_vs_pmt_neg 'HMS hA- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.1pr.goodNegAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.1pr.goodNegAdcPulseInt>0.0
-TH2F hcal_hB_good_pi_vs_pmt_pos 'HMS hB+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.2ta.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.2ta.goodPosAdcPulseInt>0.0
-TH2F hcal_hB_good_pi_vs_pmt_neg 'HMS hB- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.2ta.goodNegAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.2ta.goodNegAdcPulseInt>0.0
-TH2F hcal_hC_good_pi_vs_pmt_pos 'HMS hC+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.3ta.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.3ta.goodPosAdcPulseInt>0.0
-TH2F hcal_hD_good_pi_vs_pmt_pos 'HMS hD+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.4ta.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.4ta.goodPosAdcPulseInt>0.0
-
-#-------------------------------
-# HMS CAL Good Pulse Amplitudes
-#-------------------------------
-
-TH2F hcal_hA_good_pamp_vs_pmt_pos 'HMS hA+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.1pr.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.1pr.goodPosAdcPulseAmp>0.0
-TH2F hcal_hA_good_pamp_vs_pmt_neg 'HMS hA- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.1pr.goodNegAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.1pr.goodNegAdcPulseAmp>0.0
-TH2F hcal_hB_good_pamp_vs_pmt_pos 'HMS hB+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.2ta.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.2ta.goodPosAdcPulseAmp>0.0
-TH2F hcal_hB_good_pamp_vs_pmt_neg 'HMS hB- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.2ta.goodNegAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.2ta.goodNegAdcPulseAmp>0.0
-TH2F hcal_hC_good_pamp_vs_pmt_pos 'HMS hC+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.3ta.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.3ta.goodPosAdcPulseAmp>0.0
-TH2F hcal_hD_good_pamp_vs_pmt_pos 'HMS hD+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.4ta.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.4ta.goodPosAdcPulseAmp>0.0
-
-#---------------------------
-# HMS CAL Good Pulse Times
-#---------------------------
-
-TH2F hcal_hA_good_ptime_vs_pmt_pos 'HMS hA+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.1pr.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.1pr.goodPosAdcPulseTime>0.0
-TH2F hcal_hA_good_ptime_vs_pmt_neg 'HMS hA- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.1pr.goodNegAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.1pr.goodNegAdcPulseTime>0.0
-TH2F hcal_hB_good_ptime_vs_pmt_pos 'HMS hB+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.2ta.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.2ta.goodPosAdcPulseTime>0.0
-TH2F hcal_hB_good_ptime_vs_pmt_neg 'HMS hB- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.2ta.goodNegAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.2ta.goodNegAdcPulseTime>0.0
-TH2F hcal_hC_good_ptime_vs_pmt_pos 'HMS hC+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.3ta.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.3ta.goodPosAdcPulseTime>0.0
-TH2F hcal_hD_good_ptime_vs_pmt_pos 'HMS hD+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.4ta.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.4ta.goodPosAdcPulseTime>0.0
-
-#-----------------------------------------------
-# HMS CAL ENERGY DEPOSITION vs. PMT HISTOGRAMS
-# (calib consts (GAIN) are in GeV/ADC units )
-#-----------------------------------------------
-
-TH2F hA_Epos_vs_pmt 'HMS hA+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.epos 13 0.5 13.5 200 0 2 H.cal.1pr.epos>0.0
-TH2F hA_Eneg_vs_pmt 'HMS hA- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.eneg 13 0.5 13.5 200 0 2 H.cal.1pr.eneg>0.0
-TH2F hA_Emean_vs_pmt 'HMS hA Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.emean 13 0.5 13.5 300 0 3 H.cal.1pr.emean>0.0
-
-
-TH2F hB_Epos_vs_pmt 'HMS hB+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.epos 13 0.5 13.5 200 0 2 H.cal.2ta.epos>0.0
-TH2F hB_Eneg_vs_pmt 'HMS hB- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.eneg 13 0.5 13.5 200 0 2 H.cal.2ta.eneg>0.0
-TH2F hB_Emean_vs_pmt 'HMS hB Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.emean 13 0.5 13.5 300 0 3 H.cal.2ta.emean>0.0
-
-TH2F hC_Epos_vs_pmt 'HMS hC+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.3ta.epos 13 0.5 13.5 200 0 2 H.cal.3ta.epos>0.0
-TH2F hD_Epos_vs_pmt 'HMS hD+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.4ta.epos 13 0.5 13.5 200 0 2 H.cal.4ta.epos>0.0
-
-#------------------------------------
-# HMS CAL ENERGY DEPOSITION / Plane
-#------------------------------------
-
-TH1F hcal_hA_Eplane_pos 'HMS hA+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane_pos 200 0 2 H.cal.1pr.eplane_pos>0.0
-TH1F hcal_hA_Eplane_neg 'HMS hA- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane_neg 200 0 2 H.cal.1pr.eplane_neg>0.0
-TH1F hcal_hA_Eplane 'HMS hA Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane 300 0 3 H.cal.1pr.eplane>0.0
-
-TH1F hcal_hB_Eplane_pos 'HMS hB+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.2ta.eplane_pos 200 0 2 H.cal.2ta.eplane_pos>0.0
-TH1F hcal_hB_Eplane_neg 'HMS hB- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.2ta.eplane_neg 200 0 2 H.cal.2ta.eplane_neg>0.0
-TH1F hcal_hB_Eplane 'HMS hB Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.2ta.eplane 300 0 3 H.cal.2ta.eplane>0.0
-
-TH1F hcal_hC_Eplane_pos 'HMS hC+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.3ta.eplane_pos 200 0 2 H.cal.3ta.eplane_pos>0.0
-TH1F hcal_hD_Eplane_pos 'HMS hD+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.4ta.eplane_pos 200 0 2 H.cal.4ta.eplane_pos>0.0
-
diff --git a/DEF-files/HMS/STACK/CER/hcer_histos.def b/DEF-files/HMS/STACK/CER/hcer_histos.def
deleted file mode 100644
index 7f9d3dbf..00000000
--- a/DEF-files/HMS/STACK/CER/hcer_histos.def
+++ /dev/null
@@ -1,41 +0,0 @@
-#********************
-# HMS Gas Cherenkov *
-#********************
-
-#-----------------------------------------
-# HMS Gas CER GOOD Occupancy and Multiplicity
-#-----------------------------------------
-
-TH1F hcer_good_occ 'HMS Cherenkov Good Occupancy; PMT Number; Number of Entries' H.cer.numGoodAdcHits 2 0.5 2.5
-TH1F hcer_good_mult 'HMS Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cer.totNumGoodAdcHits 2 0.5 2.5
-
-#-------------------------------------------------------------------------------
-# HMS Gas CER GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#-------------------------------------------------------------------------------
-
-TH2F hcer_good_pped_vs_pmt 'HMS Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] H.cer.goodAdcPed 2 0.5 2.5 400 300 700
-TH2F hcer_good_pi_vs_pmt 'HMS Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] H.cer.goodAdcPulseInt 2 0.5 2.5 600 0 30000 H.cer.goodAdcPulseInt>0.0
-TH2F hcer_good_pamp_vs_pmt 'HMS Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] H.cer.goodAdcPulseAmp 2 0.5 2.5 200 0 4000 H.cer.goodAdcPulseAmp>0.0
-TH2F hcer_good_ptime_vs_pmt 'HMS Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] H.cer.goodAdcPulseTime 2 0.5 2.5 350 0 3500 H.cer.goodAdcPulseTime>0.0
-
-#-----------------------------------
-# HMS Gas CER Number of P.E. / PMT
-#-----------------------------------
-
-TH2F hcer_npe 'HMS Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] H.cer.npe 2 0.5 2.5 200 0 100 H.cer.npe>0.0
-
-
-#----------------------------------
-# HMS Gas CER TOTAL NUMBER OF P.E.
-#----------------------------------
-
-TH1F hcer_tot_npe 'HMS Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.cer.npeSum 200 0 100 H.cer.npeSum>0.0
-
-#--------------------------
-# HMS Gas CER TRACK MATCHING
-#--------------------------
-
-TH1F hcer_trk_match 'HMS Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' H.cer.numTracksMatched 2 0.5 2.5
-TH1F hcer_trk_fired 'HMS Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' H.cer.numTracksFired 2 0.5 2.5
-
diff --git a/DEF-files/HMS/STACK/DC/hdc_6gev_histos.def b/DEF-files/HMS/STACK/DC/hdc_6gev_histos.def
deleted file mode 100644
index 1f7b515b..00000000
--- a/DEF-files/HMS/STACK/DC/hdc_6gev_histos.def
+++ /dev/null
@@ -1,122 +0,0 @@
-#***************************
-# HMS 6 GeV Drift Chambers *
-#***************************
-
-#-----------------
-# HMS DC WIREMAP
-#-----------------
-
-TH1F hdc1x1_wirenum 'HMS DC 1X1 Wiremap; Wire Number; Number of Entries' H.dc.1x1.wirenum 113 0.5 113.5
-TH1F hdc1y1_wirenum 'HMS DC 1Y1 Wiremap; Wire Number; Number of Entries' H.dc.1y1.wirenum 52 0.5 52.5
-TH1F hdc1u1_wirenum 'HMS DC 1U1 Wiremap; Wire Number; Number of Entries' H.dc.1u1.wirenum 107 0.5 107.5
-TH1F hdc1v1_wirenum 'HMS DC 1V1 Wiremap; Wire Number; Number of Entries' H.dc.1v1.wirenum 107 0.5 107.5
-TH1F hdc1y2_wirenum 'HMS DC 1Y2 Wiremap; Wire Number; Number of Entries' H.dc.1y2.wirenum 52 0.5 52.5
-TH1F hdc1x2_wirenum 'HMS DC 1X2 Wiremap; Wire Number; Number of Entries' H.dc.1x2.wirenum 113 0.5 113.5
-
-TH1F hdc2x1_wirenum 'HMS DC 2X1 Wiremap; Wire Number; Number of Entries' H.dc.2x1.wirenum 113 0.5 113.5
-TH1F hdc2y1_wirenum 'HMS DC 2Y1 Wiremap; Wire Number; Number of Entries' H.dc.2y1.wirenum 52 0.5 52.5
-TH1F hdc2u1_wirenum 'HMS DC 2U1 Wiremap; Wire Number; Number of Entries' H.dc.2u1.wirenum 107 0.5 107.5
-TH1F hdc2v1_wirenum 'HMS DC 2V1 Wiremap; Wire Number; Number of Entries' H.dc.2v1.wirenum 107 0.5 107.5
-TH1F hdc2y2_wirenum 'HMS DC 2Y2 Wiremap; Wire Number; Number of Entries' H.dc.2y2.wirenum 52 0.5 52.5
-TH1F hdc2x2_wirenum 'HMS DC 2X2 Wiremap; Wire Number; Number of Entries' H.dc.2x2.wirenum 113 0.5 113.5
-
-#-----------------------------
-# HMS DC DRIFT TIME PER PLANE
-#-----------------------------
-
-TH1F hdc1x1_drifttime 'HMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x1.time 400 -50 350
-TH1F hdc1y1_drifttime 'HMS DC 1Y1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1y1.time 400 -50 350
-TH1F hdc1u1_drifttime 'HMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1u1.time 400 -50 350
-TH1F hdc1v1_drifttime 'HMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1v1.time 400 -50 350
-TH1F hdc1y2_drifttime 'HMS DC 1Y2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1y2.time 400 -50 350
-TH1F hdc1x2_drifttime 'HMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x2.time 400 -50 350
-
-TH1F hdc2x1_drifttime 'HMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x1.time 400 -50 350
-TH1F hdc2y1_drifttime 'HMS DC 2Y1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2y1.time 400 -50 350
-TH1F hdc2u1_drifttime 'HMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2u1.time 400 -50 350
-TH1F hdc2v1_drifttime 'HMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2v1.time 400 -50 350
-TH1F hdc2y2_drifttime 'HMS DC 2Y2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2y2.time 400 -50 350
-TH1F hdc2x2_drifttime 'HMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x2.time 400 -50 350
-
-#----------------------------------
-# HMS DC DRIFT TIME VS. WIRENUMBER
-#----------------------------------
-
-TH2F hdc1x1_drifttime_vs_wirenum 'HMS DC 1X1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1x1.wirenum H.dc.1x1.time 113 0.5 113.5 600 -100 500
-TH2F hdc1y1_drifttime_vs_wirenum 'HMS DC 1Y1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1y1.wirenum H.dc.1y1.time 52 0.5 52.5 600 -100 500
-TH2F hdc1u1_drifttime_vs_wirenum 'HMS DC 1U1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1u1.wirenum H.dc.1u1.time 107 0.5 107.5 600 -100 500
-TH2F hdc1v1_drifttime_vs_wirenum 'HMS DC 1V1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1v1.wirenum H.dc.1v1.time 107 0.5 107.5 600 -100 500
-TH2F hdc1y2_drifttime_vs_wirenum 'HMS DC 1Y2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1y2.wirenum H.dc.1y2.time 52 0.5 52.5 600 -100 500
-TH2F hdc1x2_drifttime_vs_wirenum 'HMS DC 1X2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1x2.wirenum H.dc.1x2.time 113 0.5 113.5 600 -100 500
-
-TH2F hdc2x1_drifttime_vs_wirenum 'HMS DC 2X1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2x1.wirenum H.dc.2x1.time 113 0.5 113.5 600 -100 500
-TH2F hdc2y1_drifttime_vs_wirenum 'HMS DC 2Y1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2y1.wirenum H.dc.2y1.time 52 0.5 52.5 600 -100 500
-TH2F hdc2u1_drifttime_vs_wirenum 'HMS DC 2U1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2u1.wirenum H.dc.2u1.time 107 0.5 107.5 600 -100 500
-TH2F hdc2v1_drifttime_vs_wirenum 'HMS DC 2V1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2v1.wirenum H.dc.2v1.time 107 0.5 107.5 600 -100 500
-TH2F hdc2y2_drifttime_vs_wirenum 'HMS DC 2Y2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2y2.wirenum H.dc.2y2.time 52 0.5 52.5 600 -100 500
-TH2F hdc2x2_drifttime_vs_wirenum 'HMS DC 2X2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2x2.wirenum H.dc.2x2.time 113 0.5 113.5 600 -100 500
-
-#---------------------------------
-# HMS DC Drift Distance Per Plane
-#---------------------------------
-
-TH1F hdc1x1_ddist 'HMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x1.dist 28 -0.1 0.6
-TH1F hdc1y1_ddist 'HMS 1Y1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1y1.dist 28 -0.1 0.6
-TH1F hdc1u1_ddist 'HMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1u1.dist 28 -0.1 0.6
-TH1F hdc1v1_ddist 'HMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1v1.dist 28 -0.1 0.6
-TH1F hdc1y2_ddist 'HMS 1Y2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1y2.dist 28 -0.1 0.6
-TH1F hdc1x2_ddist 'HMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x2.dist 28 -0.1 0.6
-
-TH1F hdc2x1_ddist 'HMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x1.dist 28 -0.1 0.6
-TH1F hdc2y1_ddist 'HMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2y1.dist 28 -0.1 0.6
-TH1F hdc2u1_ddist 'HMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2u1.dist 28 -0.1 0.6
-TH1F hdc2v1_ddist 'HMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2v1.dist 28 -0.1 0.6
-TH1F hdc2y2_ddist 'HMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2y2.dist 28 -0.1 0.6
-TH1F hdc2x2_ddist 'HMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x2.dist 28 -0.1 0.6
-
-#--------------------------------------
-# HMS DC DRIFT DISTANCE VS. WIRENUMBER
-#--------------------------------------
-
-TH2F hdc1x1_wirenum_vs_ddist 'HMS DC 1X1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1x1.wirenum H.dc.1x1.dist 113 0.5 113.5 300 -0.1 0.6
-TH2F hdc1y1_wirenum_vs_ddist 'HMS DC 1Y1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1y1.wirenum H.dc.1y1.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc1u1_wirenum_vs_ddist 'HMS DC 1U1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1u1.wirenum H.dc.1u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc1v1_wirenum_vs_ddist 'HMS DC 1V1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1v1.wirenum H.dc.1v1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc1y2_wirenum_vs_ddist 'HMS DC 1Y2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1y2.wirenum H.dc.1y2.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc1x2_wirenum_vs_ddist 'HMS DC 1X2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1x2.wirenum H.dc.1x2.dist 113 0.5 113.5 300 -0.1 0.6
-
-TH2F hdc2x1_wirenum_vs_ddist 'HMS DC 2X1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2x1.wirenum H.dc.2x1.dist 113 0.5 113.5 300 -0.1 0.6
-TH2F hdc2y1_wirenum_vs_ddist 'HMS DC 2Y1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2y1.wirenum H.dc.2y1.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc2u1_wirenum_vs_ddist 'HMS DC 2U1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2u1.wirenum H.dc.2u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc2v1_wirenum_vs_ddist 'HMS DC 2V1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2v1.wirenum H.dc.2v1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc2y2_wirenum_vs_ddist 'HMS DC 2Y2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2y2.wirenum H.dc.2y2.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc2x2_wirenum_vs_ddist 'HMS DC 2X2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2x2.wirenum H.dc.2x2.dist 113 0.5 113.5 300 -0.1 0.6
-
-#----------------------------
-# HMS DC RESIDUALS PER PLANE
-#----------------------------
-
-TH1F hdc1x1_residuals 'HMS 1X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[0] 200 -1.0 1.0
-TH1F hdc1y1_residuals 'HMS 1Y1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[1] 200 -1.0 1.0
-TH1F hdc1u1_residuals 'HMS 1U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[2] 200 -1.0 1.0
-TH1F hdc1v1_residuals 'HMS 1V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[3] 200 -1.0 1.0
-TH1F hdc1y2_residuals 'HMS 1Y2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[4] 200 -1.0 1.0
-TH1F hdc1x2_residuals 'HMS 1X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[5] 200 -1.0 1.0
-
-TH1F hdc2x1_residuals 'HMS 2X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[6] 200 -1.0 1.0
-TH1F hdc2y1_residuals 'HMS 2Y1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[7] 200 -1.0 1.0
-TH1F hdc2u1_residuals 'HMS 2U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[8] 200 -1.0 1.0
-TH1F hdc2v1_residuals 'HMS 2V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[9] 200 -1.0 1.0
-TH1F hdc2y2_residuals 'HMS 2Y2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[10] 200 -1.0 1.0
-TH1F hdc2x2_residuals 'HMS 2X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[11] 200 -1.0 1.0
-
-#-------------------------------------------
-# HMS DC TRACKING VARIABLES AT FOCAL PLANE
-#-------------------------------------------
-
-TH1F hdc_trk_mom 'HMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6
-TH1F hdc_trk_beta 'HMS DC Track Beta; Beta (GeV); Number of Entires' H.tr.beta 300 -1.5 1.5
-TH2F hdc_xfp_vs_yxp 'HMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' H.dc.y_fp H.dc.x_fp 100 -50 50 100 -50 50
-TH2F hdc_xpfp_vs_ypfp 'HMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' H.dc.yp_fp H.dc.xp_fp 100 -.1 .1 100 -.1 .1
-TH2F hdc_xfp_vs_ypfp 'HMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.yp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
-TH2F hdc_xfp_vs_xpfp 'HMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.xp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
diff --git a/DEF-files/HMS/STACK/DC/hdc_histos.def b/DEF-files/HMS/STACK/DC/hdc_histos.def
deleted file mode 100644
index 2d14945f..00000000
--- a/DEF-files/HMS/STACK/DC/hdc_histos.def
+++ /dev/null
@@ -1,69 +0,0 @@
-# See $ANALYZER/examples/output_example.def for examples
-#
-block H.dc.*
-block T.hms.*
-#block H.scin.*
-
-#SIMPLE DEF FILE TO TEST 12 GeV CHAMBERS: Will need to get updated after tests
-
-#HMS Drift Chamber 1
-
-TH1F hdc1u1_wm 'HDC 1U1 Wiremap' H.dc.1u1.wirenum 96 0.5 96.5
-TH1F hdc1u2_wm 'HDC 1U2 Wiremap' H.dc.1u2.wirenum 96 0.5 96.5
-TH1F hdc1x1_wm 'HDC 1X1 Wiremap' H.dc.1x1.wirenum 102 0.5 102.5
-TH1F hdc1x2_wm 'HDC 1X2 Wiremap' H.dc.1x2.wirenum 102 0.5 102.5
-TH1F hdc1v1_wm 'HDC 1V1 Wiremap' H.dc.1v1.wirenum 96 0.5 96.5
-TH1F hdc1v2_wm 'HDC 1V2 Wiremap' H.dc.1v2.wirenum 96 0.5 96.5
-
-TH1F hdc1u1_rawt 'HDC 1U1 Raw TDC' H.dc.1u1.rawtdc 500 0 2000
-TH1F hdc1u2_rawt 'HDC 1U2 Raw TDC' H.dc.1u2.rawtdc 500 0 2000
-TH1F hdc1x1_rawt 'HDC 1X1 Raw TDC' H.dc.1x1.rawtdc 500 0 2000
-TH1F hdc1x2_rawt 'HDC 1X2 Raw TDC' H.dc.1x2.rawtdc 500 0 2000
-TH1F hdc1v1_rawt 'HDC 1V1 Raw TDC' H.dc.1v1.rawtdc 500 0 2000
-TH1F hdc1v2_rawt 'HDC 1V2 Raw TDC' H.dc.1v2.rawtdc 500 0 2000
-
-
-TH1F hdc1u1_dt 'HDC 1U1 Drift Time' H.dc.1u1.time 200 -1000 1000
-TH1F hdc1u2_dt 'HDC 1U2 Drift Time' H.dc.1u2.time 200 -1000 1000
-TH1F hdc1x1_dt 'HDC 1X1 Drift Time' H.dc.1x1.time 200 -1000 1000
-TH1F hdc1x2_dt 'HDC 1X2 Drift Time' H.dc.1x2.time 200 -1000 1000
-TH1F hdc1v1_dt 'HDC 1V1 Drift Time' H.dc.1v1.time 200 -1000 1000
-TH1F hdc1v2_dt 'HDC 1V2 Drift Time' H.dc.1v2.time 200 -1000 1000
-
-TH1F hdc1u1_dd 'HDC 1U1 Drift Distance' H.dc.1u1.dist 300 -0.1 0.6
-TH1F hdc1u2_dd 'HDC 1U2 Drift Distance' H.dc.1u2.dist 300 -0.1 0.6
-TH1F hdc1x1_dd 'HDC 1X1 Drift Distance' H.dc.1x1.dist 300 -0.1 0.6
-TH1F hdc1x2_dd 'HDC 1X2 Drift Distance' H.dc.1x2.dist 300 -0.1 0.6
-TH1F hdc1v1_dd 'HDC 1V1 Drift Distance' H.dc.1v1.dist 300 -0.1 0.6
-TH1F hdc1v2_dd 'HDC 1V2 Drift Distance' H.dc.1v2.dist 300 -0.1 0.6
-
-#HMS Drift Chamber 2
-
-TH1F hdc2u1_wm 'HDC 2U1 Wiremap' H.dc.2u1.wirenum 96 0.5 96.5
-TH1F hdc2u2_wm 'HDC 2U2 Wiremap' H.dc.2u2.wirenum 96 0.5 96.5
-TH1F hdc2x1_wm 'HDC 2X1 Wiremap' H.dc.2x1.wirenum 102 0.5 102.5
-TH1F hdc2x2_wm 'HDC 2X2 Wiremap' H.dc.2x2.wirenum 102 0.5 102.5
-TH1F hdc2v1_wm 'HDC 2V1 Wiremap' H.dc.2v1.wirenum 96 0.5 96.5
-TH1F hdc2v2_wm 'HDC 2V2 Wiremap' H.dc.2v2.wirenum 96 0.5 96.5
-
-TH1F hdc2u1_rawt 'HDC 2U1 Raw TDC' H.dc.2u1.rawtdc 500 0 2000
-TH1F hdc2u2_rawt 'HDC 2U2 Raw TDC' H.dc.2u2.rawtdc 500 0 2000
-TH1F hdc2x1_rawt 'HDC 2X1 Raw TDC' H.dc.2x1.rawtdc 500 0 2000
-TH1F hdc2x2_rawt 'HDC 2X2 Raw TDC' H.dc.2x2.rawtdc 500 0 2000
-TH1F hdc2v1_rawt 'HDC 2V1 Raw TDC' H.dc.2v1.rawtdc 500 0 2000
-TH1F hdc2v2_rawt 'HDC 2V2 Raw TDC' H.dc.2v2.rawtdc 500 0 2000
-
-
-TH1F hdc2u1_dt 'HDC 2U1 Drift Time' H.dc.2u1.time 200 -1000 1000
-TH1F hdc2u2_dt 'HDC 2U2 Drift Time' H.dc.2u2.time 200 -1000 1000
-TH1F hdc2x1_dt 'HDC 2X1 Drift Time' H.dc.2x1.time 200 -1000 1000
-TH1F hdc2x2_dt 'HDC 2X2 Drift Time' H.dc.2x2.time 200 -1000 1000
-TH1F hdc2v1_dt 'HDC 2V1 Drift Time' H.dc.2v1.time 200 -1000 1000
-TH1F hdc2v2_dt 'HDC 2V2 Drift Time' H.dc.2v2.time 200 -1000 1000
-
-TH1F hdc2u1_dd 'HDC 2U1 Drift Distance' H.dc.2u1.dist 300 -0.1 0.6
-TH1F hdc2u2_dd 'HDC 2U2 Drift Distance' H.dc.2u2.dist 300 -0.1 0.6
-TH1F hdc2x1_dd 'HDC 2X1 Drift Distance' H.dc.2x1.dist 300 -0.1 0.6
-TH1F hdc2x2_dd 'HDC 2X2 Drift Distance' H.dc.2x2.dist 300 -0.1 0.6
-TH1F hdc2v1_dd 'HDC 2V1 Drift Distance' H.dc.2v1.dist 300 -0.1 0.6
-TH1F hdc2v2_dd 'HDC 2V2 Drift Distance' H.dc.2v2.dist 300 -0.1 0.6
\ No newline at end of file
diff --git a/DEF-files/HMS/STACK/HODO/hhodo_histos.def b/DEF-files/HMS/STACK/HODO/hhodo_histos.def
deleted file mode 100644
index f0b7df31..00000000
--- a/DEF-files/HMS/STACK/HODO/hhodo_histos.def
+++ /dev/null
@@ -1,178 +0,0 @@
-#*****************
-# HMS HODOSCOPES *
-#*****************
-
-#-----------------------------------
-# HMS HODO GOOD ADC Multiplicities
-#-----------------------------------
-
-TH1F hhodo_1x_good_adc_mult_pos 'HMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1x.totNumGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult_pos 'HMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1y.totNumGoodPosAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult_pos 'HMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2x.totNumGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult_pos 'HMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2y.totNumGoodPosAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_mult_neg 'HMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1x.totNumGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult_neg 'HMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1y.totNumGoodNegAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult_neg 'HMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2x.totNumGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult_neg 'HMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2y.totNumGoodNegAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_mult 'HMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1x.totNumGoodAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult 'HMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1y.totNumGoodAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult 'HMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2x.totNumGoodAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult 'HMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2y.totNumGoodAdcHits 10 0.5 10.5
-
-#-----------------------------------
-# HMS HODO Good TDC Multiplicities
-#-----------------------------------
-
-TH1F hhodo_1x_good_tdc_mult_pos 'HMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1x.totNumGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult_pos 'HMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1y.totNumGoodPosTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult_pos 'HMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2x.totNumGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult_pos 'HMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2y.totNumGoodPosTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_mult_neg 'HMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1x.totNumGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult_neg 'HMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1y.totNumGoodNegTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult_neg 'HMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2x.totNumGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult_neg 'HMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2y.totNumGoodNegTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_mult 'HMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1x.totNumGoodTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult 'HMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1y.totNumGoodTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult 'HMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2x.totNumGoodTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult 'HMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2y.totNumGoodTdcHits 10 0.5 10.5
-
-#---------------------------------
-# HMS HODO GOOD ADC OCCUPANCIES
-#---------------------------------
-
-TH1F hhodo_1x_good_adc_occ_pos 'HMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1x.numGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_occ_pos 'HMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1y.numGoodPosAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_occ_pos 'HMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2x.numGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_occ_pos 'HMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2y.numGoodPosAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_occ_neg 'HMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1x.numGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_occ_neg 'HMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1y.numGoodNegAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_occ_neg 'HMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2x.numGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_occ_neg 'HMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2y.numGoodNegAdcHits 10 0.5 10.5
-
-#--------------------------------
-# HMS HODO GOOD TDC OCCUPANCIES
-#--------------------------------
-
-TH1F hhodo_1x_good_tdc_occ_pos 'HMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1x.numGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_occ_pos 'HMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1y.numGoodPosTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_occ_pos 'HMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2x.numGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_occ_pos 'HMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2y.numGoodPosTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_occ_neg 'HMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1x.numGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_occ_neg 'HMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1y.numGoodNegTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_occ_neg 'HMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2x.numGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_occ_neg 'HMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2y.numGoodNegTdcHits 10 0.5 10.5
-
-#------------------------------
-# HMS HODO Good PULSE PEDESTAL
-#------------------------------
-
-TH2F hhodo_1x_good_pped_vs_pmt_pos 'HMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1x.GoodPosAdcPed 16 0.5 16.5 400 300 700 H.hod.1x.GoodPosAdcPed>0.0
-TH2F hhodo_1y_good_pped_vs_pmt_pos 'HMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1y.GoodPosAdcPed 10 0.5 10.5 400 300 700 H.hod.1y.GoodPosAdcPed>0.0
-TH2F hhodo_2x_good_pped_vs_pmt_pos 'HMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2x.GoodPosAdcPed 16 0.5 16.5 400 300 700 H.hod.2x.GoodPosAdcPed>0.0
-TH2F hhodo_2y_good_pped_vs_pmt_pos 'HMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2y.GoodPosAdcPed 10 0.5 10.5 400 300 700 H.hod.2y.GoodPosAdcPed>0.0
-
-TH2F hhodo_1x_good_pped_vs_pmt_neg 'HMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1x.GoodNegAdcPed 16 0.5 16.5 400 300 700 H.hod.1x.GoodNegAdcPed>0.0
-TH2F hhodo_1y_good_pped_vs_pmt_neg 'HMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1y.GoodNegAdcPed 10 0.5 10.5 400 300 700 H.hod.1y.GoodNegAdcPed>0.0
-TH2F hhodo_2x_good_pped_vs_pmt_neg 'HMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2x.GoodNegAdcPed 16 0.5 16.5 400 300 700 H.hod.2x.GoodNegAdcPed>0.0
-TH2F hhodo_2y_good_pped_vs_pmt_neg 'HMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2y.GoodNegAdcPed 10 0.5 10.5 400 300 700 H.hod.2y.GoodNegAdcPed>0.0
-
-#------------------------------
-# HMS HODO Good PULSE INTEGRAL
-#------------------------------
-
-TH2F hhodo_1x_good_pi_vs_pmt_pos 'HMS 1X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1x.GoodPosAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.1x.GoodPosAdcPulseInt>0.0
-TH2F hhodo_1y_good_pi_vs_pmt_pos 'HMS 1Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1y.GoodPosAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.1y.GoodPosAdcPulseInt>0.0
-TH2F hhodo_2x_good_pi_vs_pmt_pos 'HMS 2X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2x.GoodPosAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.2x.GoodPosAdcPulseInt>0.0
-TH2F hhodo_2y_good_pi_vs_pmt_pos 'HMS 2Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2y.GoodPosAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.2y.GoodPosAdcPulseInt>0.0
-
-TH2F hhodo_1x_good_pi_vs_pmt_neg 'HMS 1X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1x.GoodNegAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.1x.GoodNegAdcPulseInt>0.0
-TH2F hhodo_1y_good_pi_vs_pmt_neg 'HMS 1Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1y.GoodNegAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.1y.GoodNegAdcPulseInt>0.0
-TH2F hhodo_2x_good_pi_vs_pmt_neg 'HMS 2X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2x.GoodNegAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.2x.GoodNegAdcPulseInt>0.0
-TH2F hhodo_2y_good_pi_vs_pmt_neg 'HMS 2Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2y.GoodNegAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.2y.GoodNegAdcPulseInt>0.0
-
-#-------------------------------
-# HMS HODO Good PULSE AMPLITUDE
-#-------------------------------
-
-TH2F hhodo_1x_good_pamp_vs_pmt_pos 'HMS 1X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1x.GoodPosAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.1x.GoodPosAdcPulseAmp>0.0
-TH2F hhodo_1y_good_pamp_vs_pmt_pos 'HMS 1Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1y.GoodPosAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.1y.GoodPosAdcPulseAmp>0.0
-TH2F hhodo_2x_good_pamp_vs_pmt_pos 'HMS 2X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2x.GoodPosAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.2x.GoodPosAdcPulseAmp>0.0
-TH2F hhodo_2y_good_pamp_vs_pmt_pos 'HMS 2Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2y.GoodPosAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.2y.GoodPosAdcPulseAmp>0.0
-
-TH2F hhodo_1x_good_pamp_vs_pmt_neg 'HMS 1X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1x.GoodNegAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.1x.GoodNegAdcPulseAmp>0.0
-TH2F hhodo_1y_good_pamp_vs_pmt_neg 'HMS 1Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1y.GoodNegAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.1y.GoodNegAdcPulseAmp>0.0
-TH2F hhodo_2x_good_pamp_vs_pmt_neg 'HMS 2X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2x.GoodNegAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.2x.GoodNegAdcPulseAmp>0.0
-TH2F hhodo_2y_good_pamp_vs_pmt_neg 'HMS 2Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2y.GoodNegAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.2y.GoodNegAdcPulseAmp>0.0
-
-#------------------------------
-# HMS HODO Good ADC PULSE TIME
-#------------------------------
-
-TH2F hhodo_1x_good_ptime_vs_pmt_pos 'HMS 1X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1x.GoodPosAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.1x.GoodPosAdcPulseTime>0.0
-TH2F hhodo_1y_good_ptime_vs_pmt_pos 'HMS 1Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1y.GoodPosAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.1y.GoodPosAdcPulseTime>0.0
-TH2F hhodo_2x_good_ptime_vs_pmt_pos 'HMS 2X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2x.GoodPosAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.2x.GoodPosAdcPulseTime>0.0
-TH2F hhodo_2y_good_ptime_vs_pmt_pos 'HMS 2Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2y.GoodPosAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.2y.GoodPosAdcPulseTime>0.0
-
-TH2F hhodo_1x_good_ptime_vs_pmt_neg 'HMS 1X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1x.GoodNegAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.1x.GoodNegAdcPulseTime>0.0
-TH2F hhodo_1y_good_ptime_vs_pmt_neg 'HMS 1Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1y.GoodNegAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.1y.GoodNegAdcPulseTime>0.0
-TH2F hhodo_2x_good_ptime_vs_pmt_neg 'HMS 2X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2x.GoodNegAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.2x.GoodNegAdcPulseTime>0.0
-TH2F hhodo_2y_good_ptime_vs_pmt_neg 'HMS 2Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2y.GoodNegAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.2y.GoodNegAdcPulseTime>0.0
-
-#-------------------------------------------------------------------
-# HMS HODO Good TDC TIME UNCORRECTED (uncorrected for time offsets)
-#-------------------------------------------------------------------
-
-TH2F hhodo_1x_good_tdctime_uncorr_vs_pmt_pos 'HMS 1X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodPosTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodPosTdcTimeUnCorr>0.0
-TH2F hhodo_1y_good_tdctime_uncorr_vs_pmt_pos 'HMS 1Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodPosTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodPosTdcTimeUnCorr>0.0
-TH2F hhodo_2x_good_tdctime_uncorr_vs_pmt_pos 'HMS 2X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodPosTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodPosTdcTimeUnCorr>0.0
-TH2F hhodo_2y_good_tdctime_uncorr_vs_pmt_pos 'HMS 2Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodPosTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodPosTdcTimeUnCorr>0.0
-
-TH2F hhodo_1x_good_tdctime_uncorr_vs_pmt_neg 'HMS 1X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodNegTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodNegTdcTimeUnCorr>0.0
-TH2F hhodo_1y_good_tdctime_uncorr_vs_pmt_neg 'HMS 1Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodNegTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodNegTdcTimeUnCorr>0.0
-TH2F hhodo_2x_good_tdctime_uncorr_vs_pmt_neg 'HMS 2X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodNegTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodNegTdcTimeUnCorr>0.0
-TH2F hhodo_2y_good_tdctime_uncorr_vs_pmt_neg 'HMS 2Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodNegTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodNegTdcTimeUnCorr>0.0
-
-#---------------------------------------------------------------
-# HMS HODO Good TDC TIME CORRECTED (corrected for time offsets)
-#---------------------------------------------------------------
-
-TH2F hhodo_1x_good_tdctime_corr_vs_pmt_pos 'HMS 1X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodPosTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodPosTdcTimeCorr>0.0
-TH2F hhodo_1y_good_tdctime_corr_vs_pmt_pos 'HMS 1Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodPosTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodPosTdcTimeCorr>0.0
-TH2F hhodo_2x_good_tdctime_corr_vs_pmt_pos 'HMS 2X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodPosTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodPosTdcTimeCorr>0.0
-TH2F hhodo_2y_good_tdctime_corr_vs_pmt_pos 'HMS 2Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodPosTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodPosTdcTimeCorr>0.0
-
-TH2F hhodo_1x_good_tdctime_corr_vs_pmt_neg 'HMS 1X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodNegTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodNegTdcTimeCorr>0.0
-TH2F hhodo_1y_good_tdctime_corr_vs_pmt_neg 'HMS 1Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodNegTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodNegTdcTimeCorr>0.0
-TH2F hhodo_2x_good_tdctime_corr_vs_pmt_neg 'HMS 2X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodNegTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodNegTdcTimeCorr>0.0
-TH2F hhodo_2y_good_tdctime_corr_vs_pmt_neg 'HMS 2Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodNegTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodNegTdcTimeCorr>0.0
-
-#--------------------------------------------------------------------
-# HMS HODO Good TDC TIME TOF CORRECTED (corrected for time of flight)
-#--------------------------------------------------------------------
-
-TH2F hhodo_1x_good_tdctime_tofcorr_vs_pmt_pos 'HMS 1X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodPosTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodPosTdcTimeTOFCorr>0.0
-TH2F hhodo_1y_good_tdctime_tofcorr_vs_pmt_pos 'HMS 1Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodPosTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodPosTdcTimeTOFCorr>0.0
-TH2F hhodo_2x_good_tdctime_tofcorr_vs_pmt_pos 'HMS 2X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodPosTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodPosTdcTimeTOFCorr>0.0
-TH2F hhodo_2y_good_tdctime_tofcorr_vs_pmt_pos 'HMS 2Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodPosTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodPosTdcTimeTOFCorr>0.0
-
-TH2F hhodo_1x_good_tdctime_tofcorr_vs_pmt_neg 'HMS 1X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodNegTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodNegTdcTimeTOFCorr>0.0
-TH2F hhodo_1y_good_tdctime_tofcorr_vs_pmt_neg 'HMS 1Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodNegTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodNegTdcTimeTOFCorr>0.0
-TH2F hhodo_2x_good_tdctime_tofcorr_vs_pmt_neg 'HMS 2X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodNegTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodNegTdcTimeTOFCorr>0.0
-TH2F hhodo_2y_good_tdctime_tofcorr_vs_pmt_neg 'HMS 2Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodNegTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodNegTdcTimeTOFCorr>0.0
-
-#----------------------------------------------------------------
-# HMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
-#----------------------------------------------------------------
-
-TH1F hhodo_beta_notrack 'HMS Hodo Calculated Beta Without Track Info; Beta; Number of Entries / 0.02' H.hod.betanotrack 100 0 2.0 H.hod.betanotrack>0.0
-TH1F hhodo_beta 'HMS Hodo Beta; Beta; Number of Entries / 0.02' H.hod.beta 100 0 2.0 H.hod.beta>0.0
-TH1F hhodo_fpHitsTime 'HMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' H.hod.fpHitsTime 90 0 90
-TH1F hhodo_starttime 'HMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' H.hod.starttime 90 0 90
-TH1F hhodo_good_startime 'HMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' H.hod.goodstarttime 90 0 90
-TH2F hhodo_xhod_vs_yhod 'HMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' H.hod.y_hodo H.hod.x_hodo 1000 -50 50 1000 -50 50
\ No newline at end of file
diff --git a/DEF-files/HMS/STACK/TRIG/htrig_histos.def b/DEF-files/HMS/STACK/TRIG/htrig_histos.def
deleted file mode 100644
index 8b9f07b2..00000000
--- a/DEF-files/HMS/STACK/TRIG/htrig_histos.def
+++ /dev/null
@@ -1,130 +0,0 @@
-#********************
-# Trigger Apparatus *
-#********************
-
-#---------------------------
-# HMS Raw Hodo TRIG TDC Time
-#---------------------------
-
-TH1F htrig_h1x_tdc 'HMS h1X TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h1X_tdcTimeRaw 1500 0 1500
-TH1F htrig_h1y_tdc 'HMS h1Y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h1Y_tdcTimeRaw 1500 0 1500
-TH1F htrig_h2x_tdc 'HMS h2X TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h2X_tdcTimeRaw 1500 0 1500
-TH1F htrig_h2y_tdc 'HMS h2Y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h2Y_tdcTimeRaw 1500 0 1500
-
-TH1F htrig_h1T_tdc 'HMS h1X/h1Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h1T_tdcTimeRaw 1500 0 1500
-TH1F htrig_h2T_tdc 'HMS h2X/h2Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h2T_tdcTimeRaw 1500 0 1500
-
-TH1F htrig_hT1_tdc 'HMS h1X/h1Y/h2X/h2Y Coincidence TDC Time (Slot 2); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hT1_tdcTimeRaw 1500 0 1500
-TH1F htrig_hT2_tdc 'HMS h1X/h1Y/h2X/h2Y Coincidence TDC Time (Slot 20); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hT2_tdcTimeRaw 1500 0 1500
-
-#----------------------------
-# HMS Raw DC Reference Time
-#----------------------------
-
-TH1F htrig_hdc_ref1 'HMS DC Reference Time 1; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF1_tdcTimeRaw 15000 0 15000
-TH1F htrig_hdc_ref2 'HMS DC Reference Time 2; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF2_tdcTimeRaw 15000 0 15000
-TH1F htrig_hdc_ref3 'HMS DC Reference Time 3; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF3_tdcTimeRaw 15000 0 15000
-TH1F htrig_hdc_ref4 'HMS DC Reference Time 4; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF4_tdcTimeRaw 15000 0 15000
-
-
-TH1F hdc_refdiff_1m2 'HDC Reference time 1 minus 2; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF1_tdcTime-T.hms.hDCREF2_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_1m3 'HDC Reference time 1 minus 3; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF1_tdcTime-T.hms.hDCREF3_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_1m4 'HDC Reference time 1 minus 4; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF1_tdcTime-T.hms.hDCREF4_tdcTime 2000 -1000 1000
-
-TH1F hdc_refdiff_2m3 'HDC Reference time 2 minus 3; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF2_tdcTime-T.hms.hDCREF3_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_2m4 'HDC Reference time 2 minus 4; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF2_tdcTime-T.hms.hDCREF4_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_3m4 'HDC Reference time 3 minus 4; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF3_tdcTime-T.hms.hDCREF4_tdcTime 2000 -1000 1000
-
-
-#--------------------------------------------
-# HMS Calo Layers TRIG Pulse Profile
-#--------------------------------------------
-
-TH1F htrig_hasum_adc_pped 'HMS hAsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hASUM_adcPed 5000 0 5000
-TH1F htrig_hasum_adc_pi 'HMS hAsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hASUM_adcPulseInt 800 0 40000
-TH1F htrig_hasum_adc_pamp 'HMS hAsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hASUM_adcPulseAmp 205 0 4100
-TH1F htrig_hasum_tdc 'HMS hAsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hASUM_tdcTime 4000 0 40000
-
-TH1F htrig_hbsum_adc_pped 'HMS hBsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hBSUM_adcPed 5000 0 5000
-TH1F htrig_hbsum_adc_pi 'HMS hBsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hBSUM_adcPulseInt 800 0 40000
-TH1F htrig_hbsum_adc_pamp 'HMS hBsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hBSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hbsum_tdc 'HMS hBsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hBSUM_tdcTime 4000 0 40000
-
-TH1F htrig_hcsum_adc_pped 'HMS hCsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCSUM_adcPed 5000 0 5000
-TH1F htrig_hcsum_adc_pi 'HMS hCsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCSUM_adcPulseInt 800 0 40000
-TH1F htrig_hcsum_adc_pamp 'HMS hCsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hcsum_tdc 'HMS hCsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCSUM_tdcTime 4000 0 40000
-
-TH1F htrig_hdsum_adc_pped 'HMS hDsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hDSUM_adcPed 5000 0 5000
-TH1F htrig_hdsum_adc_pi 'HMS hDsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hDSUM_adcPulseInt 800 0 40000
-TH1F htrig_hdsum_adc_pamp 'HMS hDsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hDSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hdsum_tdc 'HMS hDsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDSUM_tdcTime 4000 0 40000
-
-#----------------------------------
-# HMS PreShower TRIG Pulse Profile
-#----------------------------------
-
-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
-
-#-----------------------------
-# HMS PreShower TRIG LOW/HIGH
-#-----------------------------
-
-TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRLO_tdcTimeRaw 4000 0 40000
-TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRHI_tdcTimeRaw 4000 0 40000
-
-
-#----------------------------------
-# HMS Shower TRIG Pulse Profile
-#----------------------------------
-
-TH1F htrig_hshwr_adc_pped 'HMS Shower Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hSHWR_adcPed 5000 0 5000
-TH1F htrig_hshwr_adc_pi 'HMS Shower Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hSHWR_adcPulseInt 800 0 40000
-TH1F htrig_hshwr_adc_pamp 'HMS Shower Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hSHWR_adcPulseAmp 205 0 4100
-TH1F htrig_hshwr_tdc 'HMS Shower TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hSHWR_tdcTime 4000 0 40000
-
-#---------------------------------------
-# HMS Gas Cherenkov TRIG Pulse Profile
-#---------------------------------------
-
-TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCER_adcPed 5000 0 5000
-TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCER_adcPulseInt 800 0 40000
-TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCER_adcPulseAmp 205 0 4100
-TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCER_tdcTime 4000 0 40000
-
-
-#------------------------------------------
-# HMS Aerogel TRIG Pulse Profile
-#------------------------------------------
-
-TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hAER_adcPed 5000 0 5000
-TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAER_adcPulseInt 800 0 40000
-TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hAER_adcPulseAmp 205 0 4100
-TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAER_tdcTime 4000 0 40000
-
-
-#-------------
-# Fast Raster
-#-------------
-
-# 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.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.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.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.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.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/hstack_include.def b/DEF-files/HMS/STACK/hstack_include.def
deleted file mode 100644
index 236ba2d3..00000000
--- a/DEF-files/HMS/STACK/hstack_include.def
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "DEF-files/HMS/STACK/BLOCK/hblock_vars.def"
-#include "DEF-files/HMS/STACK/DC/hdc_histos.def"
-#include "DEF-files/HMS/STACK/HODO/hhodo_histos.def"
-#include "DEF-files/HMS/STACK/CER/hcer_histos.def"
-#include "DEF-files/HMS/STACK/CAL/hcal_histos.def"
-#include "DEF-files/HMS/STACK/TRIG/htrig_histos.def"
diff --git a/DEF-files/HMS/STACK/hstackana.def b/DEF-files/HMS/STACK/hstackana.def
deleted file mode 100644
index 9cfee44b..00000000
--- a/DEF-files/HMS/STACK/hstackana.def
+++ /dev/null
@@ -1,600 +0,0 @@
-
-
-#********************
-# Block Definitions *
-#********************
-
-block T.hms.*
-block H.cer.*
-block H.dc.*
-block H.tr.*
-block H.hod.*
-block H.aero.*
-block H.cal.*
-block H.gtr.*
-
-
-#********************
-# HMS Gas Cherenkov *
-#********************
-
-#-----------------------------------------
-# HMS Gas CER GOOD Occupancy and Multiplicity
-#-----------------------------------------
-
-TH1F hcer_good_occ 'HMS Cherenkov Good Occupancy; PMT Number; Number of Entries' H.cer.numGoodAdcHits 2 0.5 2.5
-TH1F hcer_good_mult 'HMS Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cer.totNumGoodAdcHits 2 0.5 2.5
-
-#-------------------------------------------------------------------------------
-# HMS Gas CER GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#-------------------------------------------------------------------------------
-
-TH2F hcer_good_pped_vs_pmt 'HMS Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] H.cer.goodAdcPed 2 0.5 2.5 400 300 700
-TH2F hcer_good_pi_vs_pmt 'HMS Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] H.cer.goodAdcPulseInt 2 0.5 2.5 600 0 30000 H.cer.goodAdcPulseInt>0.0
-TH2F hcer_good_pamp_vs_pmt 'HMS Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] H.cer.goodAdcPulseAmp 2 0.5 2.5 200 0 4000 H.cer.goodAdcPulseAmp>0.0
-TH2F hcer_good_ptime_vs_pmt 'HMS Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] H.cer.goodAdcPulseTime 2 0.5 2.5 350 0 3500 H.cer.goodAdcPulseTime>0.0
-
-#-----------------------------------
-# HMS Gas CER Number of P.E. / PMT
-#-----------------------------------
-
-TH2F hcer_npe 'HMS Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] H.cer.npe 2 0.5 2.5 200 0 100 H.cer.npe>0.0
-
-
-#----------------------------------
-# HMS Gas CER TOTAL NUMBER OF P.E.
-#----------------------------------
-
-TH1F hcer_tot_npe 'HMS Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.cer.npeSum 200 0 100 H.cer.npeSum>0.0
-
-#--------------------------
-# HMS Gas CER TRACK MATCHING
-#--------------------------
-
-TH1F hcer_trk_match 'HMS Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' H.cer.numTracksMatched 2 0.5 2.5
-TH1F hcer_trk_fired 'HMS Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' H.cer.numTracksFired 2 0.5 2.5
-
-
-
-#***************************
-# HMS 6 GeV Drift Chambers *
-#***************************
-
-#-----------------
-# HMS DC WIREMAP
-#-----------------
-
-TH1F hdc1x1_wirenum 'HMS DC 1X1 Wiremap; Wire Number; Number of Entries' H.dc.1x1.wirenum 113 0.5 113.5
-TH1F hdc1y1_wirenum 'HMS DC 1Y1 Wiremap; Wire Number; Number of Entries' H.dc.1y1.wirenum 52 0.5 52.5
-TH1F hdc1u1_wirenum 'HMS DC 1U1 Wiremap; Wire Number; Number of Entries' H.dc.1u1.wirenum 107 0.5 107.5
-TH1F hdc1v1_wirenum 'HMS DC 1V1 Wiremap; Wire Number; Number of Entries' H.dc.1v1.wirenum 107 0.5 107.5
-TH1F hdc1y2_wirenum 'HMS DC 1Y2 Wiremap; Wire Number; Number of Entries' H.dc.1y2.wirenum 52 0.5 52.5
-TH1F hdc1x2_wirenum 'HMS DC 1X2 Wiremap; Wire Number; Number of Entries' H.dc.1x2.wirenum 113 0.5 113.5
-
-TH1F hdc2x1_wirenum 'HMS DC 2X1 Wiremap; Wire Number; Number of Entries' H.dc.2x1.wirenum 113 0.5 113.5
-TH1F hdc2y1_wirenum 'HMS DC 2Y1 Wiremap; Wire Number; Number of Entries' H.dc.2y1.wirenum 52 0.5 52.5
-TH1F hdc2u1_wirenum 'HMS DC 2U1 Wiremap; Wire Number; Number of Entries' H.dc.2u1.wirenum 107 0.5 107.5
-TH1F hdc2v1_wirenum 'HMS DC 2V1 Wiremap; Wire Number; Number of Entries' H.dc.2v1.wirenum 107 0.5 107.5
-TH1F hdc2y2_wirenum 'HMS DC 2Y2 Wiremap; Wire Number; Number of Entries' H.dc.2y2.wirenum 52 0.5 52.5
-TH1F hdc2x2_wirenum 'HMS DC 2X2 Wiremap; Wire Number; Number of Entries' H.dc.2x2.wirenum 113 0.5 113.5
-
-#-----------------------------
-# HMS DC DRIFT TIME PER PLANE
-#-----------------------------
-
-TH1F hdc1x1_drifttime 'HMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x1.time 400 -50 350
-TH1F hdc1y1_drifttime 'HMS DC 1Y1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1y1.time 400 -50 350
-TH1F hdc1u1_drifttime 'HMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1u1.time 400 -50 350
-TH1F hdc1v1_drifttime 'HMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1v1.time 400 -50 350
-TH1F hdc1y2_drifttime 'HMS DC 1Y2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1y2.time 400 -50 350
-TH1F hdc1x2_drifttime 'HMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.1x2.time 400 -50 350
-
-TH1F hdc2x1_drifttime 'HMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x1.time 400 -50 350
-TH1F hdc2y1_drifttime 'HMS DC 2Y1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2y1.time 400 -50 350
-TH1F hdc2u1_drifttime 'HMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2u1.time 400 -50 350
-TH1F hdc2v1_drifttime 'HMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2v1.time 400 -50 350
-TH1F hdc2y2_drifttime 'HMS DC 2Y2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2y2.time 400 -50 350
-TH1F hdc2x2_drifttime 'HMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' H.dc.2x2.time 400 -50 350
-
-#----------------------------------
-# HMS DC DRIFT TIME VS. WIRENUMBER
-#----------------------------------
-
-TH2F hdc1x1_drifttime_vs_wirenum 'HMS DC 1X1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1x1.wirenum H.dc.1x1.time 113 0.5 113.5 600 -100 500
-TH2F hdc1y1_drifttime_vs_wirenum 'HMS DC 1Y1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1y1.wirenum H.dc.1y1.time 52 0.5 52.5 600 -100 500
-TH2F hdc1u1_drifttime_vs_wirenum 'HMS DC 1U1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1u1.wirenum H.dc.1u1.time 107 0.5 107.5 600 -100 500
-TH2F hdc1v1_drifttime_vs_wirenum 'HMS DC 1V1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1v1.wirenum H.dc.1v1.time 107 0.5 107.5 600 -100 500
-TH2F hdc1y2_drifttime_vs_wirenum 'HMS DC 1Y2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1y2.wirenum H.dc.1y2.time 52 0.5 52.5 600 -100 500
-TH2F hdc1x2_drifttime_vs_wirenum 'HMS DC 1X2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.1x2.wirenum H.dc.1x2.time 113 0.5 113.5 600 -100 500
-
-TH2F hdc2x1_drifttime_vs_wirenum 'HMS DC 2X1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2x1.wirenum H.dc.2x1.time 113 0.5 113.5 600 -100 500
-TH2F hdc2y1_drifttime_vs_wirenum 'HMS DC 2Y1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2y1.wirenum H.dc.2y1.time 52 0.5 52.5 600 -100 500
-TH2F hdc2u1_drifttime_vs_wirenum 'HMS DC 2U1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2u1.wirenum H.dc.2u1.time 107 0.5 107.5 600 -100 500
-TH2F hdc2v1_drifttime_vs_wirenum 'HMS DC 2V1 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2v1.wirenum H.dc.2v1.time 107 0.5 107.5 600 -100 500
-TH2F hdc2y2_drifttime_vs_wirenum 'HMS DC 2Y2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2y2.wirenum H.dc.2y2.time 52 0.5 52.5 600 -100 500
-TH2F hdc2x2_drifttime_vs_wirenum 'HMS DC 2X2 Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' H.dc.2x2.wirenum H.dc.2x2.time 113 0.5 113.5 600 -100 500
-
-#---------------------------------
-# HMS DC Drift Distance Per Plane
-#---------------------------------
-
-TH1F hdc1x1_ddist 'HMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x1.dist 28 -0.1 0.6
-TH1F hdc1y1_ddist 'HMS 1Y1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1y1.dist 28 -0.1 0.6
-TH1F hdc1u1_ddist 'HMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1u1.dist 28 -0.1 0.6
-TH1F hdc1v1_ddist 'HMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1v1.dist 28 -0.1 0.6
-TH1F hdc1y2_ddist 'HMS 1Y2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1y2.dist 28 -0.1 0.6
-TH1F hdc1x2_ddist 'HMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.1x2.dist 28 -0.1 0.6
-
-TH1F hdc2x1_ddist 'HMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x1.dist 28 -0.1 0.6
-TH1F hdc2y1_ddist 'HMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2y1.dist 28 -0.1 0.6
-TH1F hdc2u1_ddist 'HMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2u1.dist 28 -0.1 0.6
-TH1F hdc2v1_ddist 'HMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2v1.dist 28 -0.1 0.6
-TH1F hdc2y2_ddist 'HMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2y2.dist 28 -0.1 0.6
-TH1F hdc2x2_ddist 'HMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' H.dc.2x2.dist 28 -0.1 0.6
-
-#--------------------------------------
-# HMS DC DRIFT DISTANCE VS. WIRENUMBER
-#--------------------------------------
-
-TH2F hdc1x1_wirenum_vs_ddist 'HMS DC 1X1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1x1.wirenum H.dc.1x1.dist 113 0.5 113.5 300 -0.1 0.6
-TH2F hdc1y1_wirenum_vs_ddist 'HMS DC 1Y1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1y1.wirenum H.dc.1y1.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc1u1_wirenum_vs_ddist 'HMS DC 1U1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1u1.wirenum H.dc.1u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc1v1_wirenum_vs_ddist 'HMS DC 1V1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1v1.wirenum H.dc.1v1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc1y2_wirenum_vs_ddist 'HMS DC 1Y2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1y2.wirenum H.dc.1y2.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc1x2_wirenum_vs_ddist 'HMS DC 1X2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.1x2.wirenum H.dc.1x2.dist 113 0.5 113.5 300 -0.1 0.6
-
-TH2F hdc2x1_wirenum_vs_ddist 'HMS DC 2X1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2x1.wirenum H.dc.2x1.dist 113 0.5 113.5 300 -0.1 0.6
-TH2F hdc2y1_wirenum_vs_ddist 'HMS DC 2Y1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2y1.wirenum H.dc.2y1.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc2u1_wirenum_vs_ddist 'HMS DC 2U1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2u1.wirenum H.dc.2u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc2v1_wirenum_vs_ddist 'HMS DC 2V1 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2v1.wirenum H.dc.2v1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F hdc2y2_wirenum_vs_ddist 'HMS DC 2Y2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2y2.wirenum H.dc.2y2.dist 52 0.5 52.5 300 -0.1 0.6
-TH2F hdc2x2_wirenum_vs_ddist 'HMS DC 2X2 Drift Distance vs. Wire Number; Wire Number; Drift Distance (cm)' H.dc.2x2.wirenum H.dc.2x2.dist 113 0.5 113.5 300 -0.1 0.6
-
-#----------------------------
-# HMS DC RESIDUALS PER PLANE
-#----------------------------
-
-TH1F hdc1x1_residuals 'HMS 1X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[0] 200 -1.0 1.0
-TH1F hdc1y1_residuals 'HMS 1Y1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[1] 200 -1.0 1.0
-TH1F hdc1u1_residuals 'HMS 1U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[2] 200 -1.0 1.0
-TH1F hdc1v1_residuals 'HMS 1V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[3] 200 -1.0 1.0
-TH1F hdc1y2_residuals 'HMS 1Y2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[4] 200 -1.0 1.0
-TH1F hdc1x2_residuals 'HMS 1X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[5] 200 -1.0 1.0
-
-TH1F hdc2x1_residuals 'HMS 2X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[6] 200 -1.0 1.0
-TH1F hdc2y1_residuals 'HMS 2Y1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[7] 200 -1.0 1.0
-TH1F hdc2u1_residuals 'HMS 2U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[8] 200 -1.0 1.0
-TH1F hdc2v1_residuals 'HMS 2V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[9] 200 -1.0 1.0
-TH1F hdc2y2_residuals 'HMS 2Y2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[10] 200 -1.0 1.0
-TH1F hdc2x2_residuals 'HMS 2X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' H.dc.residual[11] 200 -1.0 1.0
-
-#-------------------------------------------
-# HMS DC TRACKING VARIABLES AT FOCAL PLANE
-#-------------------------------------------
-
-TH1F hdc_trk_mom 'HMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6
-TH1F hdc_trk_beta 'HMS DC Track Beta; Beta (GeV); Number of Entires' H.tr.beta 300 -1.5 1.5
-TH2F hdc_xfp_vs_yxp 'HMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' H.dc.y_fp H.dc.x_fp 100 -50 50 100 -50 50
-TH2F hdc_xpfp_vs_ypfp 'HMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' H.dc.yp_fp H.dc.xp_fp 100 -.1 .1 100 -.1 .1
-TH2F hdc_xfp_vs_ypfp 'HMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.yp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
-TH2F hdc_xfp_vs_xpfp 'HMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' H.dc.xp_fp H.dc.x_fp 100 -.1 .1 100 -50 50
-
-
-#*****************
-# HMS HODOSCOPES *
-#*****************
-
-#-----------------------------------
-# HMS HODO GOOD ADC Multiplicities
-#-----------------------------------
-
-TH1F hhodo_1x_good_adc_mult_pos 'HMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1x.totNumGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult_pos 'HMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.1y.totNumGoodPosAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult_pos 'HMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2x.totNumGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult_pos 'HMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' H.hod.2y.totNumGoodPosAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_mult_neg 'HMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1x.totNumGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult_neg 'HMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.1y.totNumGoodNegAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult_neg 'HMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2x.totNumGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult_neg 'HMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' H.hod.2y.totNumGoodNegAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_mult 'HMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1x.totNumGoodAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_mult 'HMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.1y.totNumGoodAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_mult 'HMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2x.totNumGoodAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_mult 'HMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' H.hod.2y.totNumGoodAdcHits 10 0.5 10.5
-
-#-----------------------------------
-# HMS HODO Good TDC Multiplicities
-#-----------------------------------
-
-TH1F hhodo_1x_good_tdc_mult_pos 'HMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1x.totNumGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult_pos 'HMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.1y.totNumGoodPosTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult_pos 'HMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2x.totNumGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult_pos 'HMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' H.hod.2y.totNumGoodPosTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_mult_neg 'HMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1x.totNumGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult_neg 'HMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.1y.totNumGoodNegTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult_neg 'HMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2x.totNumGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult_neg 'HMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' H.hod.2y.totNumGoodNegTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_mult 'HMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1x.totNumGoodTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_mult 'HMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.1y.totNumGoodTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_mult 'HMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2x.totNumGoodTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_mult 'HMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' H.hod.2y.totNumGoodTdcHits 10 0.5 10.5
-
-#---------------------------------
-# HMS HODO GOOD ADC OCCUPANCIES
-#---------------------------------
-
-TH1F hhodo_1x_good_adc_occ_pos 'HMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1x.numGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_occ_pos 'HMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.1y.numGoodPosAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_occ_pos 'HMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2x.numGoodPosAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_occ_pos 'HMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' H.hod.2y.numGoodPosAdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_adc_occ_neg 'HMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1x.numGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_adc_occ_neg 'HMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.1y.numGoodNegAdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_adc_occ_neg 'HMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2x.numGoodNegAdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_adc_occ_neg 'HMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' H.hod.2y.numGoodNegAdcHits 10 0.5 10.5
-
-#--------------------------------
-# HMS HODO GOOD TDC OCCUPANCIES
-#--------------------------------
-
-TH1F hhodo_1x_good_tdc_occ_pos 'HMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1x.numGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_occ_pos 'HMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.1y.numGoodPosTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_occ_pos 'HMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2x.numGoodPosTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_occ_pos 'HMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' H.hod.2y.numGoodPosTdcHits 10 0.5 10.5
-
-TH1F hhodo_1x_good_tdc_occ_neg 'HMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1x.numGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_1y_good_tdc_occ_neg 'HMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.1y.numGoodNegTdcHits 10 0.5 10.5
-TH1F hhodo_2x_good_tdc_occ_neg 'HMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2x.numGoodNegTdcHits 16 0.5 16.5
-TH1F hhodo_2y_good_tdc_occ_neg 'HMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' H.hod.2y.numGoodNegTdcHits 10 0.5 10.5
-
-#------------------------------
-# HMS HODO Good PULSE PEDESTAL
-#------------------------------
-
-TH2F hhodo_1x_good_pped_vs_pmt_pos 'HMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1x.GoodPosAdcPed 16 0.5 16.5 400 300 700 H.hod.1x.GoodPosAdcPed>0.0
-TH2F hhodo_1y_good_pped_vs_pmt_pos 'HMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1y.GoodPosAdcPed 10 0.5 10.5 400 300 700 H.hod.1y.GoodPosAdcPed>0.0
-TH2F hhodo_2x_good_pped_vs_pmt_pos 'HMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2x.GoodPosAdcPed 16 0.5 16.5 400 300 700 H.hod.2x.GoodPosAdcPed>0.0
-TH2F hhodo_2y_good_pped_vs_pmt_pos 'HMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2y.GoodPosAdcPed 10 0.5 10.5 400 300 700 H.hod.2y.GoodPosAdcPed>0.0
-
-TH2F hhodo_1x_good_pped_vs_pmt_neg 'HMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1x.GoodNegAdcPed 16 0.5 16.5 400 300 700 H.hod.1x.GoodNegAdcPed>0.0
-TH2F hhodo_1y_good_pped_vs_pmt_neg 'HMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.1y.GoodNegAdcPed 10 0.5 10.5 400 300 700 H.hod.1y.GoodNegAdcPed>0.0
-TH2F hhodo_2x_good_pped_vs_pmt_neg 'HMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2x.GoodNegAdcPed 16 0.5 16.5 400 300 700 H.hod.2x.GoodNegAdcPed>0.0
-TH2F hhodo_2y_good_pped_vs_pmt_neg 'HMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] H.hod.2y.GoodNegAdcPed 10 0.5 10.5 400 300 700 H.hod.2y.GoodNegAdcPed>0.0
-
-#------------------------------
-# HMS HODO Good PULSE INTEGRAL
-#------------------------------
-
-TH2F hhodo_1x_good_pi_vs_pmt_pos 'HMS 1X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1x.GoodPosAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.1x.GoodPosAdcPulseInt>0.0
-TH2F hhodo_1y_good_pi_vs_pmt_pos 'HMS 1Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1y.GoodPosAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.1y.GoodPosAdcPulseInt>0.0
-TH2F hhodo_2x_good_pi_vs_pmt_pos 'HMS 2X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2x.GoodPosAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.2x.GoodPosAdcPulseInt>0.0
-TH2F hhodo_2y_good_pi_vs_pmt_pos 'HMS 2Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2y.GoodPosAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.2y.GoodPosAdcPulseInt>0.0
-
-TH2F hhodo_1x_good_pi_vs_pmt_neg 'HMS 1X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1x.GoodNegAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.1x.GoodNegAdcPulseInt>0.0
-TH2F hhodo_1y_good_pi_vs_pmt_neg 'HMS 1Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.1y.GoodNegAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.1y.GoodNegAdcPulseInt>0.0
-TH2F hhodo_2x_good_pi_vs_pmt_neg 'HMS 2X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2x.GoodNegAdcPulseInt 16 0.5 16.5 600 0 30000 H.hod.2x.GoodNegAdcPulseInt>0.0
-TH2F hhodo_2y_good_pi_vs_pmt_neg 'HMS 2Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.hod.2y.GoodNegAdcPulseInt 10 0.5 10.5 600 0 30000 H.hod.2y.GoodNegAdcPulseInt>0.0
-
-#-------------------------------
-# HMS HODO Good PULSE AMPLITUDE
-#-------------------------------
-
-TH2F hhodo_1x_good_pamp_vs_pmt_pos 'HMS 1X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1x.GoodPosAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.1x.GoodPosAdcPulseAmp>0.0
-TH2F hhodo_1y_good_pamp_vs_pmt_pos 'HMS 1Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1y.GoodPosAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.1y.GoodPosAdcPulseAmp>0.0
-TH2F hhodo_2x_good_pamp_vs_pmt_pos 'HMS 2X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2x.GoodPosAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.2x.GoodPosAdcPulseAmp>0.0
-TH2F hhodo_2y_good_pamp_vs_pmt_pos 'HMS 2Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2y.GoodPosAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.2y.GoodPosAdcPulseAmp>0.0
-
-TH2F hhodo_1x_good_pamp_vs_pmt_neg 'HMS 1X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1x.GoodNegAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.1x.GoodNegAdcPulseAmp>0.0
-TH2F hhodo_1y_good_pamp_vs_pmt_neg 'HMS 1Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.1y.GoodNegAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.1y.GoodNegAdcPulseAmp>0.0
-TH2F hhodo_2x_good_pamp_vs_pmt_neg 'HMS 2X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2x.GoodNegAdcPulseAmp 16 0.5 16.5 205 0 4100 H.hod.2x.GoodNegAdcPulseAmp>0.0
-TH2F hhodo_2y_good_pamp_vs_pmt_neg 'HMS 2Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.hod.2y.GoodNegAdcPulseAmp 10 0.5 10.5 205 0 4100 H.hod.2y.GoodNegAdcPulseAmp>0.0
-
-#------------------------------
-# HMS HODO Good ADC PULSE TIME
-#------------------------------
-
-TH2F hhodo_1x_good_ptime_vs_pmt_pos 'HMS 1X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1x.GoodPosAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.1x.GoodPosAdcPulseTime>0.0
-TH2F hhodo_1y_good_ptime_vs_pmt_pos 'HMS 1Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1y.GoodPosAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.1y.GoodPosAdcPulseTime>0.0
-TH2F hhodo_2x_good_ptime_vs_pmt_pos 'HMS 2X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2x.GoodPosAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.2x.GoodPosAdcPulseTime>0.0
-TH2F hhodo_2y_good_ptime_vs_pmt_pos 'HMS 2Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2y.GoodPosAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.2y.GoodPosAdcPulseTime>0.0
-
-TH2F hhodo_1x_good_ptime_vs_pmt_neg 'HMS 1X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1x.GoodNegAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.1x.GoodNegAdcPulseTime>0.0
-TH2F hhodo_1y_good_ptime_vs_pmt_neg 'HMS 1Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.1y.GoodNegAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.1y.GoodNegAdcPulseTime>0.0
-TH2F hhodo_2x_good_ptime_vs_pmt_neg 'HMS 2X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2x.GoodNegAdcPulseTime 16 0.5 16.5 410 0 4100 H.hod.2x.GoodNegAdcPulseTime>0.0
-TH2F hhodo_2y_good_ptime_vs_pmt_neg 'HMS 2Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.hod.2y.GoodNegAdcPulseTime 10 0.5 10.5 410 0 4100 H.hod.2y.GoodNegAdcPulseTime>0.0
-
-#-------------------------------------------------------------------
-# HMS HODO Good TDC TIME UNCORRECTED (uncorrected for time offsets)
-#-------------------------------------------------------------------
-
-TH2F hhodo_1x_good_tdctime_uncorr_vs_pmt_pos 'HMS 1X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodPosTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodPosTdcTimeUnCorr>0.0
-TH2F hhodo_1y_good_tdctime_uncorr_vs_pmt_pos 'HMS 1Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodPosTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodPosTdcTimeUnCorr>0.0
-TH2F hhodo_2x_good_tdctime_uncorr_vs_pmt_pos 'HMS 2X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodPosTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodPosTdcTimeUnCorr>0.0
-TH2F hhodo_2y_good_tdctime_uncorr_vs_pmt_pos 'HMS 2Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodPosTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodPosTdcTimeUnCorr>0.0
-
-TH2F hhodo_1x_good_tdctime_uncorr_vs_pmt_neg 'HMS 1X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodNegTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodNegTdcTimeUnCorr>0.0
-TH2F hhodo_1y_good_tdctime_uncorr_vs_pmt_neg 'HMS 1Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodNegTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodNegTdcTimeUnCorr>0.0
-TH2F hhodo_2x_good_tdctime_uncorr_vs_pmt_neg 'HMS 2X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodNegTdcTimeUnCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodNegTdcTimeUnCorr>0.0
-TH2F hhodo_2y_good_tdctime_uncorr_vs_pmt_neg 'HMS 2Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodNegTdcTimeUnCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodNegTdcTimeUnCorr>0.0
-
-#---------------------------------------------------------------
-# HMS HODO Good TDC TIME CORRECTED (corrected for time offsets)
-#---------------------------------------------------------------
-
-TH2F hhodo_1x_good_tdctime_corr_vs_pmt_pos 'HMS 1X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodPosTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodPosTdcTimeCorr>0.0
-TH2F hhodo_1y_good_tdctime_corr_vs_pmt_pos 'HMS 1Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodPosTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodPosTdcTimeCorr>0.0
-TH2F hhodo_2x_good_tdctime_corr_vs_pmt_pos 'HMS 2X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodPosTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodPosTdcTimeCorr>0.0
-TH2F hhodo_2y_good_tdctime_corr_vs_pmt_pos 'HMS 2Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodPosTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodPosTdcTimeCorr>0.0
-
-TH2F hhodo_1x_good_tdctime_corr_vs_pmt_neg 'HMS 1X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodNegTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodNegTdcTimeCorr>0.0
-TH2F hhodo_1y_good_tdctime_corr_vs_pmt_neg 'HMS 1Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodNegTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodNegTdcTimeCorr>0.0
-TH2F hhodo_2x_good_tdctime_corr_vs_pmt_neg 'HMS 2X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodNegTdcTimeCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodNegTdcTimeCorr>0.0
-TH2F hhodo_2y_good_tdctime_corr_vs_pmt_neg 'HMS 2Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodNegTdcTimeCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodNegTdcTimeCorr>0.0
-
-#--------------------------------------------------------------------
-# HMS HODO Good TDC TIME TOF CORRECTED (corrected for time of flight)
-#--------------------------------------------------------------------
-
-TH2F hhodo_1x_good_tdctime_tofcorr_vs_pmt_pos 'HMS 1X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodPosTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodPosTdcTimeTOFCorr>0.0
-TH2F hhodo_1y_good_tdctime_tofcorr_vs_pmt_pos 'HMS 1Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodPosTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodPosTdcTimeTOFCorr>0.0
-TH2F hhodo_2x_good_tdctime_tofcorr_vs_pmt_pos 'HMS 2X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodPosTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodPosTdcTimeTOFCorr>0.0
-TH2F hhodo_2y_good_tdctime_tofcorr_vs_pmt_pos 'HMS 2Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodPosTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodPosTdcTimeTOFCorr>0.0
-
-TH2F hhodo_1x_good_tdctime_tofcorr_vs_pmt_neg 'HMS 1X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1x.GoodNegTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.1x.GoodNegTdcTimeTOFCorr>0.0
-TH2F hhodo_1y_good_tdctime_tofcorr_vs_pmt_neg 'HMS 1Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.1y.GoodNegTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.1y.GoodNegTdcTimeTOFCorr>0.0
-TH2F hhodo_2x_good_tdctime_tofcorr_vs_pmt_neg 'HMS 2X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2x.GoodNegTdcTimeTOFCorr 16 0.5 16.5 120 0 120 H.hod.2x.GoodNegTdcTimeTOFCorr>0.0
-TH2F hhodo_2y_good_tdctime_tofcorr_vs_pmt_neg 'HMS 2Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] H.hod.2y.GoodNegTdcTimeTOFCorr 10 0.5 10.5 120 0 120 H.hod.2y.GoodNegTdcTimeTOFCorr>0.0
-
-#----------------------------------------------------------------
-# HMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
-#----------------------------------------------------------------
-
-TH1F hhodo_beta_notrack 'HMS Hodo Calculated Beta Without Track Info; Beta; Number of Entries / 0.02' H.hod.betanotrack 100 0 2.0 H.hod.betanotrack>0.0
-TH1F hhodo_beta 'HMS Hodo Beta; Beta; Number of Entries / 0.02' H.hod.beta 100 0 2.0 H.hod.beta>0.0
-TH1F hhodo_fpHitsTime 'HMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' H.hod.fpHitsTime 90 0 90
-TH1F hhodo_starttime 'HMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' H.hod.starttime 90 0 90
-TH1F hhodo_good_startime 'HMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' H.hod.goodstarttime 90 0 90
-TH2F hhodo_xhod_vs_yhod 'HMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' H.hod.y_hodo H.hod.x_hodo 1000 -50 50 1000 -50 50
-
-#******************
-# HMS CALORIMETER
-#******************
-
-#------------------------
-# HMS CAL Good Occupancy
-#------------------------
-
-TH1F hcal_hA_good_occ_pos 'HMS hA+ Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_occ_neg 'HMS hA- Good Occupancy; PMT Number; Number of Entries' H.cal.1pr.numGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_occ_pos 'HMS hB+ Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_occ_neg 'HMS hB- Good Occupancy; PMT Number; Number of Entries' H.cal.2ta.numGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hC_good_occ_pos 'HMS hC+ Good Occupancy; PMT Number; Number of Entries' H.cal.3ta.numGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hD_good_occ_pos 'HMS hD+ Good Occupancy; PMT Number; Number of Entries' H.cal.4ta.numGoodPosAdcHits 13 0.5 13.5
-
-#---------------------------
-# HMS CAL Good Multiplicity
-#---------------------------
-
-TH1F hcal_hA_good_mult_pos 'HMS hA+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.1pr.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_mult_neg 'HMS hA- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.1pr.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_mult 'HMS hA Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.1pr.totnumGoodAdcHits 26 0.5 26.5
-
-TH1F hcal_hB_good_mult_pos 'HMS hB+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.2ta.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_mult_neg 'HMS hB- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.2ta.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_mult 'HMS hB Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.2ta.totnumGoodAdcHits 26 0.5 26.5
-
-TH1F hcal_hC_good_mult_pos 'HMS hC+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.3ta.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F hcal_hD_good_mult_pos 'HMS hD+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.4ta.totNumGoodPosAdcHits 13 0.5 13.5
-
-#-------------------------------
-# HMS CAL Good Pulse Pedestals
-#-------------------------------
-
-TH2F hcal_hA_good_pped_vs_pmt_pos 'HMS hA+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.1pr.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.1pr.goodPosAdcPed>0.0
-TH2F hcal_hA_good_pped_vs_pmt_neg 'HMS hA- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.1pr.goodNegAdcPed 13 0.5 13.5 400 300 700 H.cal.1pr.goodNegAdcPed>0.0
-TH2F hcal_hB_good_pped_vs_pmt_pos 'HMS hB+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.2ta.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.2ta.goodPosAdcPed>0.0
-TH2F hcal_hB_good_pped_vs_pmt_neg 'HMS hB- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.2ta.goodNegAdcPed 13 0.5 13.5 400 300 700 H.cal.2ta.goodNegAdcPed>0.0
-TH2F hcal_hC_good_pped_vs_pmt_pos 'HMS hC+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.3ta.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.3ta.goodPosAdcPed>0.0
-TH2F hcal_hD_good_pped_vs_pmt_pos 'HMS hD+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Units' [I+1] H.cal.4ta.goodPosAdcPed 13 0.5 13.5 400 300 700 H.cal.4ta.goodPosAdcPed>0.0
-
-#-------------------------------
-# HMS CAL Good Pulse Integrals
-#-------------------------------
-
-TH2F hcal_hA_good_pi_vs_pmt_pos 'HMS hA+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.1pr.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.1pr.goodPosAdcPulseInt>0.0
-TH2F hcal_hA_good_pi_vs_pmt_neg 'HMS hA- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.1pr.goodNegAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.1pr.goodNegAdcPulseInt>0.0
-TH2F hcal_hB_good_pi_vs_pmt_pos 'HMS hB+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.2ta.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.2ta.goodPosAdcPulseInt>0.0
-TH2F hcal_hB_good_pi_vs_pmt_neg 'HMS hB- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.2ta.goodNegAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.2ta.goodNegAdcPulseInt>0.0
-TH2F hcal_hC_good_pi_vs_pmt_pos 'HMS hC+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.3ta.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.3ta.goodPosAdcPulseInt>0.0
-TH2F hcal_hD_good_pi_vs_pmt_pos 'HMS hD+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] H.cal.4ta.goodPosAdcPulseInt 13 0.5 13.5 600 0 30000 H.cal.4ta.goodPosAdcPulseInt>0.0
-
-#-------------------------------
-# HMS CAL Good Pulse Amplitudes
-#-------------------------------
-
-TH2F hcal_hA_good_pamp_vs_pmt_pos 'HMS hA+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.1pr.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.1pr.goodPosAdcPulseAmp>0.0
-TH2F hcal_hA_good_pamp_vs_pmt_neg 'HMS hA- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.1pr.goodNegAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.1pr.goodNegAdcPulseAmp>0.0
-TH2F hcal_hB_good_pamp_vs_pmt_pos 'HMS hB+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.2ta.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.2ta.goodPosAdcPulseAmp>0.0
-TH2F hcal_hB_good_pamp_vs_pmt_neg 'HMS hB- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.2ta.goodNegAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.2ta.goodNegAdcPulseAmp>0.0
-TH2F hcal_hC_good_pamp_vs_pmt_pos 'HMS hC+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.3ta.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.3ta.goodPosAdcPulseAmp>0.0
-TH2F hcal_hD_good_pamp_vs_pmt_pos 'HMS hD+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] H.cal.4ta.goodPosAdcPulseAmp 13 0.5 13.5 200 0 4000 H.cal.4ta.goodPosAdcPulseAmp>0.0
-
-#---------------------------
-# HMS CAL Good Pulse Times
-#---------------------------
-
-TH2F hcal_hA_good_ptime_vs_pmt_pos 'HMS hA+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.1pr.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.1pr.goodPosAdcPulseTime>0.0
-TH2F hcal_hA_good_ptime_vs_pmt_neg 'HMS hA- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.1pr.goodNegAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.1pr.goodNegAdcPulseTime>0.0
-TH2F hcal_hB_good_ptime_vs_pmt_pos 'HMS hB+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.2ta.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.2ta.goodPosAdcPulseTime>0.0
-TH2F hcal_hB_good_ptime_vs_pmt_neg 'HMS hB- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.2ta.goodNegAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.2ta.goodNegAdcPulseTime>0.0
-TH2F hcal_hC_good_ptime_vs_pmt_pos 'HMS hC+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.3ta.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.3ta.goodPosAdcPulseTime>0.0
-TH2F hcal_hD_good_ptime_vs_pmt_pos 'HMS hD+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] H.cal.4ta.goodPosAdcPulseTime 13 0.5 13.5 350 0 3500 H.cal.4ta.goodPosAdcPulseTime>0.0
-
-#-----------------------------------------------
-# HMS CAL ENERGY DEPOSITION vs. PMT HISTOGRAMS
-# (calib consts (GAIN) are in GeV/ADC units )
-#-----------------------------------------------
-
-TH2F hA_Epos_vs_pmt 'HMS hA+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.epos 13 0.5 13.5 200 0 2 H.cal.1pr.epos>0.0
-TH2F hA_Eneg_vs_pmt 'HMS hA- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.eneg 13 0.5 13.5 200 0 2 H.cal.1pr.eneg>0.0
-TH2F hA_Emean_vs_pmt 'HMS hA Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.1pr.emean 13 0.5 13.5 300 0 3 H.cal.1pr.emean>0.0
-
-
-TH2F hB_Epos_vs_pmt 'HMS hB+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.epos 13 0.5 13.5 200 0 2 H.cal.2ta.epos>0.0
-TH2F hB_Eneg_vs_pmt 'HMS hB- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.eneg 13 0.5 13.5 200 0 2 H.cal.2ta.eneg>0.0
-TH2F hB_Emean_vs_pmt 'HMS hB Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.2ta.emean 13 0.5 13.5 300 0 3 H.cal.2ta.emean>0.0
-
-TH2F hC_Epos_vs_pmt 'HMS hC+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.3ta.epos 13 0.5 13.5 200 0 2 H.cal.3ta.epos>0.0
-TH2F hD_Epos_vs_pmt 'HMS hD+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] H.cal.4ta.epos 13 0.5 13.5 200 0 2 H.cal.4ta.epos>0.0
-
-#------------------------------------
-# HMS CAL ENERGY DEPOSITION / Plane
-#------------------------------------
-
-TH1F hcal_hA_Eplane_pos 'HMS hA+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane_pos 200 0 2 H.cal.1pr.eplane_pos>0.0
-TH1F hcal_hA_Eplane_neg 'HMS hA- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane_neg 200 0 2 H.cal.1pr.eplane_neg>0.0
-TH1F hcal_hA_Eplane 'HMS hA Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.1pr.eplane 300 0 3 H.cal.1pr.eplane>0.0
-
-TH1F hcal_hB_Eplane_pos 'HMS hB+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.2ta.eplane_pos 200 0 2 H.cal.2ta.eplane_pos>0.0
-TH1F hcal_hB_Eplane_neg 'HMS hB- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.2ta.eplane_neg 200 0 2 H.cal.2ta.eplane_neg>0.0
-TH1F hcal_hB_Eplane 'HMS hB Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.2ta.eplane 300 0 3 H.cal.2ta.eplane>0.0
-
-TH1F hcal_hC_Eplane_pos 'HMS hC+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.3ta.eplane_pos 200 0 2 H.cal.3ta.eplane_pos>0.0
-TH1F hcal_hD_Eplane_pos 'HMS hD+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' H.cal.4ta.eplane_pos 200 0 2 H.cal.4ta.eplane_pos>0.0
-
-
-
-#********************
-# Trigger Apparatus *
-#********************
-
-#---------------------------
-# HMS Raw Hodo TRIG TDC Time
-#---------------------------
-
-TH1F htrig_h1x_tdc 'HMS h1X TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h1X_tdcTimeRaw 1500 0 1500
-TH1F htrig_h1y_tdc 'HMS h1Y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h1Y_tdcTimeRaw 1500 0 1500
-TH1F htrig_h2x_tdc 'HMS h2X TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h2X_tdcTimeRaw 1500 0 1500
-TH1F htrig_h2y_tdc 'HMS h2Y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h2Y_tdcTimeRaw 1500 0 1500
-
-TH1F htrig_h1T_tdc 'HMS h1X/h1Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h1T_tdcTimeRaw 1500 0 1500
-TH1F htrig_h2T_tdc 'HMS h2X/h2Y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.h2T_tdcTimeRaw 1500 0 1500
-
-TH1F htrig_hT1_tdc 'HMS h1X/h1Y/h2X/h2Y Coincidence TDC Time (Slot 2); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hT1_tdcTimeRaw 1500 0 1500
-TH1F htrig_hT2_tdc 'HMS h1X/h1Y/h2X/h2Y Coincidence TDC Time (Slot 20); Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hT2_tdcTimeRaw 1500 0 1500
-
-#----------------------------
-# HMS Raw DC Reference Time
-#----------------------------
-
-TH1F htrig_hdc_ref1 'HMS DC Reference Time 1; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF1_tdcTimeRaw 15000 0 15000
-TH1F htrig_hdc_ref2 'HMS DC Reference Time 2; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF2_tdcTimeRaw 15000 0 15000
-TH1F htrig_hdc_ref3 'HMS DC Reference Time 3; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF3_tdcTimeRaw 15000 0 15000
-TH1F htrig_hdc_ref4 'HMS DC Reference Time 4; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDCREF4_tdcTimeRaw 15000 0 15000
-
-
-TH1F hdc_refdiff_1m2 'HDC Reference time 1 minus 2; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF1_tdcTime-T.hms.hDCREF2_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_1m3 'HDC Reference time 1 minus 3; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF1_tdcTime-T.hms.hDCREF3_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_1m4 'HDC Reference time 1 minus 4; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF1_tdcTime-T.hms.hDCREF4_tdcTime 2000 -1000 1000
-
-TH1F hdc_refdiff_2m3 'HDC Reference time 2 minus 3; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF2_tdcTime-T.hms.hDCREF3_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_2m4 'HDC Reference time 2 minus 4; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF2_tdcTime-T.hms.hDCREF4_tdcTime 2000 -1000 1000
-TH1F hdc_refdiff_3m4 'HDC Reference time 3 minus 4; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF3_tdcTime-T.hms.hDCREF4_tdcTime 2000 -1000 1000
-
-
-#--------------------------------------------
-# HMS Calo Layers TRIG Pulse Profile
-#--------------------------------------------
-
-TH1F htrig_hasum_adc_pped 'HMS hAsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hASUM_adcPed 5000 0 5000
-TH1F htrig_hasum_adc_pi 'HMS hAsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hASUM_adcPulseInt 800 0 40000
-TH1F htrig_hasum_adc_pamp 'HMS hAsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hASUM_adcPulseAmp 205 0 4100
-TH1F htrig_hasum_tdc 'HMS hAsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hASUM_tdcTime 4000 0 40000
-
-TH1F htrig_hbsum_adc_pped 'HMS hBsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hBSUM_adcPed 5000 0 5000
-TH1F htrig_hbsum_adc_pi 'HMS hBsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hBSUM_adcPulseInt 800 0 40000
-TH1F htrig_hbsum_adc_pamp 'HMS hBsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hBSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hbsum_tdc 'HMS hBsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hBSUM_tdcTime 4000 0 40000
-
-TH1F htrig_hcsum_adc_pped 'HMS hCsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCSUM_adcPed 5000 0 5000
-TH1F htrig_hcsum_adc_pi 'HMS hCsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCSUM_adcPulseInt 800 0 40000
-TH1F htrig_hcsum_adc_pamp 'HMS hCsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hcsum_tdc 'HMS hCsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCSUM_tdcTime 4000 0 40000
-
-TH1F htrig_hdsum_adc_pped 'HMS hDsum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hDSUM_adcPed 5000 0 5000
-TH1F htrig_hdsum_adc_pi 'HMS hDsum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hDSUM_adcPulseInt 800 0 40000
-TH1F htrig_hdsum_adc_pamp 'HMS hDsum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hDSUM_adcPulseAmp 205 0 4100
-TH1F htrig_hdsum_tdc 'HMS hDsum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hDSUM_tdcTime 4000 0 40000
-
-#----------------------------------
-# HMS PreShower TRIG Pulse Profile
-#----------------------------------
-
-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
-
-#-----------------------------
-# HMS PreShower TRIG LOW/HIGH
-#-----------------------------
-
-TH1F htrig_hpreShwrLow_tdc 'HMS hpreShwrLow TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRLO_tdcTimeRaw 4000 0 40000
-TH1F htrig_hpreShwrHigh_tdc 'HMS hpreShwrHigh TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hPRHI_tdcTimeRaw 4000 0 40000
-
-
-#----------------------------------
-# HMS Shower TRIG Pulse Profile
-#----------------------------------
-
-TH1F htrig_hshwr_adc_pped 'HMS Shower Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hSHWR_adcPed 5000 0 5000
-TH1F htrig_hshwr_adc_pi 'HMS Shower Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hSHWR_adcPulseInt 800 0 40000
-TH1F htrig_hshwr_adc_pamp 'HMS Shower Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hSHWR_adcPulseAmp 205 0 4100
-TH1F htrig_hshwr_tdc 'HMS Shower TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hSHWR_tdcTime 4000 0 40000
-
-#---------------------------------------
-# HMS Gas Cherenkov TRIG Pulse Profile
-#---------------------------------------
-
-TH1F htrig_hcersum_adc_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hCER_adcPed 5000 0 5000
-TH1F htrig_hcersum_adc_pi 'HMS Cherenkov Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hCER_adcPulseInt 800 0 40000
-TH1F htrig_hcersum_adc_pamp 'HMS Cherenkov Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hCER_adcPulseAmp 205 0 4100
-TH1F htrig_hcersum_tdc 'HMS Cherenkov Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hCER_tdcTime 4000 0 40000
-
-
-#------------------------------------------
-# HMS Aerogel TRIG Pulse Profile
-#------------------------------------------
-
-TH1F htrig_haersum_adc_pped 'HMS Aerogel Sum Pulse Pedestal; Pulse Pedestal (ADC Units); Counts / 1 ADC Units;' T.hms.hAER_adcPed 5000 0 5000
-TH1F htrig_haersum_adc_pi 'HMS Aerogel Sum Pulse Integral; Pulse Integral (ADC Units); Counts / 50 ADC Units;' T.hms.hAER_adcPulseInt 800 0 40000
-TH1F htrig_haersum_adc_pamp 'HMS Aerogel Sum Pulse Amplitude; Pulse Amplitude (ADC Units); Counts / 20 ADC Units;' T.hms.hAER_adcPulseAmp 205 0 4100
-TH1F htrig_haersum_tdc 'HMS Aerogel Sum TDC Time; TDC Time (TDC Units); Counts / 10 TDC Units;' T.hms.hAER_tdcTime 4000 0 40000
-
-
-#-------------
-# Fast Raster
-#-------------
-
-# 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.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.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.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.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.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_6gev_cuts.def b/DEF-files/HMS/STACK/hstackana_6gev_cuts.def
deleted file mode 100644
index 4fd8c884..00000000
--- a/DEF-files/HMS/STACK/hstackana_6gev_cuts.def
+++ /dev/null
@@ -1,199 +0,0 @@
-
-Block: RawDecode
-
-Pedestal_event g.evtyp == 99
-
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
-RawDecode_master 1
-
-Block: Decode
-
-hms_trigs HMS_event
-
-Decode_master HMS_event
-
-Block: CoarseTracking
-CoarseTracking_master HMS_event
-
-#add cuts to stricter times and apply them to drift distances (HMS 6 GeV Drift Chambers)
-time_cut1 H.dc.1x1.time > 0 && H.dc.1x1.time < 250
-time_cut2 H.dc.1y1.time > 0 && H.dc.1y1.time < 250
-time_cut3 H.dc.1u1.time > 0 && H.dc.1u1.time < 250
-time_cut4 H.dc.1v1.time > 0 && H.dc.1v1.time < 250
-time_cut5 H.dc.1y2.time > 0 && H.dc.1y2.time < 250
-time_cut6 H.dc.1x2.time > 0 && H.dc.1x2.time < 250
-time_cut7 H.dc.2x1.time > 0 && H.dc.2x1.time < 250
-time_cut8 H.dc.2y1.time > 0 && H.dc.1y1.time < 250
-time_cut9 H.dc.2u1.time > 0 && H.dc.2u1.time < 250
-time_cut10 H.dc.2v1.time > 0 && H.dc.2v1.time < 250
-time_cut11 H.dc.2y2.time > 0 && H.dc.2y2.time < 250
-time_cut12 H.dc.2x2.time > 0 && H.dc.2x2.time < 250
-
-
-
-hmsDC1Planes_large (H.dc.1x1.nhit+H.dc.1y1.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1y2.nhit) >20
-hmsDC2Planes_large (H.dc.2x1.nhit+H.dc.2y1.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2y2.nhit) >20
-
-hmsDC1_1hit_x1 H.dc.1x1.nhit == 1
-hmsDC1_1hit_y1 H.dc.1y1.nhit == 1
-hmsDC1_1hit_u1 H.dc.1u1.nhit == 1
-hmsDC1_1hit_v1 H.dc.1v1.nhit == 1
-hmsDC1_1hit_y2 H.dc.1y2.nhit == 1
-hmsDC1_1hit_x2 H.dc.1x2.nhit == 1
-
-hmsDC2_1hit_x1 H.dc.2x1.nhit == 1
-hmsDC2_1hit_y1 H.dc.2y1.nhit == 1
-hmsDC2_1hit_u1 H.dc.2u1.nhit == 1
-hmsDC2_1hit_v1 H.dc.2v1.nhit == 1
-hmsDC2_1hit_y2 H.dc.2y2.nhit == 1
-hmsDC2_1hit_x2 H.dc.2x2.nhit == 1
-
-h1hit1 H.dc.1x1.nhit >= 1
-h1hit2 H.dc.1y1.nhit >= 1
-h1hit3 H.dc.1u1.nhit >= 1
-h1hit4 H.dc.1v1.nhit >= 1
-h1hit5 H.dc.1y2.nhit >= 1
-h1hit6 H.dc.1x2.nhit >= 1
-
-h2hit1 H.dc.2x1.nhit >= 1
-h2hit2 H.dc.2y1.nhit >= 1
-h2hit3 H.dc.2u1.nhit >= 1
-h2hit4 H.dc.2v1.nhit >= 1
-h2hit5 H.dc.2y2.nhit >= 1
-h2hit6 H.dc.2x2.nhit >= 1
-
-hmsDC1Planes6hits (H.dc.1x1.nhit+H.dc.1y1.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1y2.nhit) ==6
-hmsDC2Planes6hits (H.dc.2x1.nhit+H.dc.2y1.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2y2.nhit )==6
-hmsDC1_5hits_x1 hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_6hits_x1 h1hit1&&hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_5hits_y1 hmsDC1_1hit_x1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_6hits_y1 h1hit2&&hmsDC1_1hit_x1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_5hits_u1 hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_6hits_u1 h1hit3&&hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_5hits_v1 hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_6hits_v1 h1hit4&&hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_x2&&hmsDC1_1hit_y2
-hmsDC1_5hits_x2 hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_y2
-hmsDC1_6hits_x2 h1hit6&&hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_y2
-hmsDC1_5hits_y2 hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2
-hmsDC1_6hits_y2 h1hit5&&hmsDC1_1hit_x1&&hmsDC1_1hit_y1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2
-
-hmsDC2_5hits_x1 hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_6hits_x1 h2hit1&&hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_5hits_y1 hmsDC2_1hit_x1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_6hits_y1 h2hit2&&hmsDC2_1hit_x1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_5hits_u1 hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_6hits_u1 h2hit3&&hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_5hits_v1 hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_6hits_v1 h2hit4&&hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_x2&&hmsDC2_1hit_y2
-hmsDC2_5hits_x2 hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_y2
-hmsDC2_6hits_x2 h2hit6&&hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_y2
-hmsDC2_5hits_y2 hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2
-hmsDC2_6hits_y2 h2hit5&&hmsDC2_1hit_x1&&hmsDC2_1hit_y1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2
-
-
-
-
-hms1HitsLt H.dc.Ch1.nhit <= H.dc.Ch1.maxhits && g.evtyp==1
-hms2HitsLt H.dc.Ch2.nhit <= H.dc.Ch2.maxhits && g.evtyp==1
-hmsHitsLt H.dc.Ch1.nhit <= H.dc.Ch1.maxhits && H.dc.Ch2.nhit <= H.dc.Ch2.maxhits && g.evtyp==1
-hmsDC1PlanesGT (h1hit1 + h1hit2 + h1hit3 + h1hit4 + h1hit5 + h1hit6 )>=5
-hmsDC2PlanesGT (h2hit1 + h2hit2 + h2hit3 + h2hit4 + h2hit5 + h2hit6 )>=5
-hmsPlanesGT hmsDC1PlanesGT && hmsDC2PlanesGT
-hmsHitsPlanes (H.dc.Ch1.nhit <= H.dc.Ch1.maxhits) && (H.dc.Ch2.nhit <= H.dc.Ch2.maxhits) && hmsPlanesGT
-hSpacePoints H.dc.Ch1.spacepoints >= 1 && H.dc.Ch2.spacepoints >=1
-hSpacePointsStub H.dc.stubtest==1 && H.dc.Ch1.spacepoints >=1 && H.dc.Ch2.spacepoints >=1
-hFoundTrack H.dc.ntrack>0
-hStubLT H.dc.stubtest==1
-f1HSpacePoints hms1HitsLt && hmsDC1PlanesGT && H.dc.Ch1.spacepoints==0 && g.evtyp==1
-f2HSpacePoints hms2HitsLt && hmsDC2PlanesGT && H.dc.Ch2.spacepoints==0 && g.evtyp==1
-hTest1 hmsHitsPlanes && (!hSpacePoints)
-hTest2 hSpacePoints && (!hStubLT)
-
-Block: CoarseReconstruct
-CoarseReconstruct_master HMS_event
-
-Block: Tracking
-Tracking_master HMS_event
-
-Block: Reconstruct
-Reconstruct_master HMS_event
-cer_pmt1_elec H.cer.npe[0]>.5
-cer_pmt2_elec H.cer.npe[0]>.5
-cer_elec H.cer.npeSum>.5
-cer_pi H.cer.npeSum<.5
-
-HMSScinGood H.hod.goodscinhit == 1
-
-HMSScinShould HMSScinGood
-HMSScinShoulde HMSScinGood && H.cal.etotnorm > 0.6&& H.cal.etotnorm < 2.0&& H.cer.npeSum > 0.5
-HMSScinShouldh HMSScinGood && H.cal.etotnorm <0.6&& H.cal.etotnorm>0.0&& H.cer.npeSum < 0.5
-
-HMSScinDid HMSScinShould && H.dc.ntrack > 0
-HMSScinDide HMSScinShoulde && H.dc.ntrack > 0
-HMSScinDidh HMSScinShouldh && H.dc.ntrack > 0
-
-
-
-goodHDC1x1 H.dc.1x1.nhit > 0 && H.dc.1x1.nhit < 3
-goodHDC1y1 H.dc.1y1.nhit > 0 && H.dc.1y1.nhit < 3
-goodHDC1u1 H.dc.1u1.nhit > 0 && H.dc.1u1.nhit < 3
-goodHDC1v1 H.dc.1v1.nhit > 0 && H.dc.1v1.nhit < 3
-goodHDC1y2 H.dc.1y2.nhit > 0 && H.dc.1y2.nhit < 3
-goodHDC1x2 H.dc.1x2.nhit > 0 && H.dc.1x2.nhit < 3
-
-goodHDC2x1 H.dc.2x1.nhit > 0 && H.dc.2x1.nhit < 3
-goodHDC2y1 H.dc.2y1.nhit > 0 && H.dc.2y1.nhit < 3
-goodHDC2u1 H.dc.2u1.nhit > 0 && H.dc.2u1.nhit < 3
-goodHDC2v1 H.dc.2v1.nhit > 0 && H.dc.2v1.nhit < 3
-goodHDC2y2 H.dc.2y2.nhit > 0 && H.dc.2y2.nhit < 3
-goodHDC2x2 H.dc.2x2.nhit > 0 && H.dc.2x2.nhit < 3
-
-goodHDC1 goodHDC1x1 && goodHDC1y1 && goodHDC1u1 && goodHDC1v1 && goodHDC1y2 && goodHDC1x2
-goodHDC2 goodHDC2x1 && goodHDC2y1 && goodHDC2u1 && goodHDC2v1 && goodHDC2y2 && goodHDC2x2
-bothGood goodHDC1 && goodHDC2
-
-realhdc1x1 goodHDC1x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1y1 goodHDC1y1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1u1 goodHDC1u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1v1 goodHDC1v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1y2 goodHDC1y2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1x2 goodHDC1x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2x1 goodHDC2x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2y1 goodHDC2y1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2u1 goodHDC2u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2v1 goodHDC2v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2y2 goodHDC2y2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2x2 goodHDC2x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-
-hFound1Track H.dc.ntrack == 1
-hFound2Track H.dc.ntrack == 2
-hFound3Track H.dc.ntrack == 3
-hFound4Track H.dc.ntrack == 4
-
-hCleanTrack H.gtr.index > -1
-1hCleanTrack H.gtr.index == 0
-2hCleanTrack H.gtr.index == 1
-3hCleanTrack H.gtr.index == 2
-4hCleanTrack H.gtr.index == 3
-
-anyhs1x H.hod.1x.nhits > 0
-anyhs1y H.hod.1y.nhits > 0
-anyhs2x H.hod.2x.nhits > 0
-anyhs2y H.hod.2y.nhits > 0
-
-goodhs1x H.hod.1x.nhits > 0 && H.hod.1x.nhits < 3
-goodhs1y H.hod.1y.nhits > 0 && H.hod.1y.nhits < 3
-goodhs1 goodhs1x && goodhs1y
-goodhs2x H.hod.2x.nhits > 0 && H.hod.2x.nhits < 3
-goodhs2y H.hod.2y.nhits > 0 && H.hod.2y.nhits < 3
-goodhs2 goodhs2x && goodhs2y
-goodhs1s2 goodhs1 && goodhs2
-
-Block: Physics
-Physics_master HMS_event
diff --git a/DEF-files/HMS/STACK/hstackana_cuts.def b/DEF-files/HMS/STACK/hstackana_cuts.def
deleted file mode 100644
index a6860328..00000000
--- a/DEF-files/HMS/STACK/hstackana_cuts.def
+++ /dev/null
@@ -1,201 +0,0 @@
-
-Block: RawDecode
-
-Pedestal_event g.evtyp == 99
-
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
-RawDecode_master 1
-
-Block: Decode
-
-hms_trigs HMS_event
-
-Decode_master HMS_event
-
-Block: CoarseTracking
-CoarseTracking_master HMS_event
-
-#add cuts to stricter times and apply them to drift distances (HMS 6 GeV Drift Chambers)
-time_cut1 H.dc.1x1.time > 0 && H.dc.1x1.time < 250
-time_cut2 H.dc.1u2.time > 0 && H.dc.1u2.time < 250
-time_cut3 H.dc.1u1.time > 0 && H.dc.1u1.time < 250
-time_cut4 H.dc.1v1.time > 0 && H.dc.1v1.time < 250
-time_cut5 H.dc.1v2.time > 0 && H.dc.1v2.time < 250
-time_cut6 H.dc.1x2.time > 0 && H.dc.1x2.time < 250
-time_cut7 H.dc.2x1.time > 0 && H.dc.2x1.time < 250
-time_cut8 H.dc.2u2.time > 0 && H.dc.1u2.time < 250
-time_cut9 H.dc.2u1.time > 0 && H.dc.2u1.time < 250
-time_cut10 H.dc.2v1.time > 0 && H.dc.2v1.time < 250
-time_cut11 H.dc.2v2.time > 0 && H.dc.2v2.time < 250
-time_cut12 H.dc.2x2.time > 0 && H.dc.2x2.time < 250
-
-hmsDC1Planes_large (H.dc.1x1.nhit+H.dc.1u2.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1v2.nhit) >20
-hmsDC2Planes_large (H.dc.2x1.nhit+H.dc.2u2.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2v2.nhit) >20
-
-hmsDC1_1hit_x1 H.dc.1x1.nhit == 1
-hmsDC1_1hit_u2 H.dc.1u2.nhit == 1
-hmsDC1_1hit_u1 H.dc.1u1.nhit == 1
-hmsDC1_1hit_v1 H.dc.1v1.nhit == 1
-hmsDC1_1hit_v2 H.dc.1v2.nhit == 1
-hmsDC1_1hit_x2 H.dc.1x2.nhit == 1
-
-hmsDC2_1hit_x1 H.dc.2x1.nhit == 1
-hmsDC2_1hit_u2 H.dc.2u2.nhit == 1
-hmsDC2_1hit_u1 H.dc.2u1.nhit == 1
-hmsDC2_1hit_v1 H.dc.2v1.nhit == 1
-hmsDC2_1hit_v2 H.dc.2v2.nhit == 1
-hmsDC2_1hit_x2 H.dc.2x2.nhit == 1
-
-h1hit1 H.dc.1x1.nhit >= 1
-h1hit2 H.dc.1u2.nhit >= 1
-h1hit3 H.dc.1u1.nhit >= 1
-h1hit4 H.dc.1v1.nhit >= 1
-h1hit5 H.dc.1v2.nhit >= 1
-h1hit6 H.dc.1x2.nhit >= 1
-
-h2hit1 H.dc.2x1.nhit >= 1
-h2hit2 H.dc.2u2.nhit >= 1
-h2hit3 H.dc.2u1.nhit >= 1
-h2hit4 H.dc.2v1.nhit >= 1
-h2hit5 H.dc.2v2.nhit >= 1
-h2hit6 H.dc.2x2.nhit >= 1
-
-hmsDC1Planes6hits (H.dc.1x1.nhit+H.dc.1u2.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1v2.nhit) ==6
-hmsDC2Planes6hits (H.dc.2x1.nhit+H.dc.2u2.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2v2.nhit )==6
-hmsDC1_5hits_x1 hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_6hits_x1 h1hit1&&hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_5hits_u2 hmsDC1_1hit_x1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_6hits_u2 h1hit2&&hmsDC1_1hit_x1&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_5hits_u1 hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_6hits_u1 h1hit3&&hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_5hits_v1 hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_6hits_v1 h1hit4&&hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_x2&&hmsDC1_1hit_v2
-hmsDC1_5hits_x2 hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_v2
-hmsDC1_6hits_x2 h1hit6&&hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_v2
-hmsDC1_5hits_v2 hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2
-hmsDC1_6hits_v2 h1hit5&&hmsDC1_1hit_x1&&hmsDC1_1hit_u2&&hmsDC1_1hit_u1&&hmsDC1_1hit_v1&&hmsDC1_1hit_x2
-
-hmsDC2_5hits_x1 hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_6hits_x1 h2hit1&&hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_5hits_u2 hmsDC2_1hit_x1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_6hits_u2 h2hit2&&hmsDC2_1hit_x1&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_5hits_u1 hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_6hits_u1 h2hit3&&hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_5hits_v1 hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_6hits_v1 h2hit4&&hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_x2&&hmsDC2_1hit_v2
-hmsDC2_5hits_x2 hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_v2
-hmsDC2_6hits_x2 h2hit6&&hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_v2
-hmsDC2_5hits_v2 hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2
-hmsDC2_6hits_v2 h2hit5&&hmsDC2_1hit_x1&&hmsDC2_1hit_u2&&hmsDC2_1hit_u1&&hmsDC2_1hit_v1&&hmsDC2_1hit_x2
-
-hms1HitsLt H.dc.Ch1.nhit <= H.dc.Ch1.maxhits && g.evtyp==1
-hms2HitsLt H.dc.Ch2.nhit <= H.dc.Ch2.maxhits && g.evtyp==1
-hmsHitsLt H.dc.Ch1.nhit <= H.dc.Ch1.maxhits && H.dc.Ch2.nhit <= H.dc.Ch2.maxhits && g.evtyp==1
-hmsDC1PlanesGT (h1hit1 + h1hit2 + h1hit3 + h1hit4 + h1hit5 + h1hit6 )>=5
-hmsDC2PlanesGT (h2hit1 + h2hit2 + h2hit3 + h2hit4 + h2hit5 + h2hit6 )>=5
-hmsPlanesGT hmsDC1PlanesGT && hmsDC2PlanesGT
-hmsHitsPlanes (H.dc.Ch1.nhit <= H.dc.Ch1.maxhits) && (H.dc.Ch2.nhit <= H.dc.Ch2.maxhits) && hmsPlanesGT
-hSpacePoints H.dc.Ch1.spacepoints >= 1 && H.dc.Ch2.spacepoints >=1
-hSpacePointsStub H.dc.stubtest==1 && H.dc.Ch1.spacepoints >=1 && H.dc.Ch2.spacepoints >=1
-hFoundTrack H.dc.ntrack>0
-hStubLT H.dc.stubtest==1
-f1HSpacePoints hms1HitsLt && hmsDC1PlanesGT && H.dc.Ch1.spacepoints==0 && g.evtyp==1
-f2HSpacePoints hms2HitsLt && hmsDC2PlanesGT && H.dc.Ch2.spacepoints==0 && g.evtyp==1
-hTest1 hmsHitsPlanes && (!hSpacePoints)
-hTest2 hSpacePoints && (!hStubLT)
-
-Block: CoarseReconstruct
-CoarseReconstruct_master HMS_event
-
-Block: Tracking
-Tracking_master HMS_event
-
-Block: Reconstruct
-Reconstruct_master HMS_event
-cer_pmt1_elec H.cer.npe[0]>.5
-cer_pmt2_elec H.cer.npe[0]>.5
-cer_elec H.cer.npeSum>.5
-cer_pi H.cer.npeSum<.5
-
-HMSScinGood H.hod.goodscinhit == 1
-
-HMSScinShould HMSScinGood
-HMSScinShoulde HMSScinGood && H.cal.etotnorm > 0.6&& H.cal.etotnorm < 2.0&& H.cer.npeSum > 0.5
-HMSScinShouldh HMSScinGood && H.cal.etotnorm <0.6&& H.cal.etotnorm>0.0&& H.cer.npeSum < 0.5
-
-HMSScinDid HMSScinShould && H.dc.ntrack > 0
-HMSScinDide HMSScinShoulde && H.dc.ntrack > 0
-HMSScinDidh HMSScinShouldh && H.dc.ntrack > 0
-
-
-
-goodHDC1x1 H.dc.1x1.nhit > 0 && H.dc.1x1.nhit < 3
-goodHDC1u2 H.dc.1u2.nhit > 0 && H.dc.1u2.nhit < 3
-goodHDC1u1 H.dc.1u1.nhit > 0 && H.dc.1u1.nhit < 3
-goodHDC1v1 H.dc.1v1.nhit > 0 && H.dc.1v1.nhit < 3
-goodHDC1v2 H.dc.1v2.nhit > 0 && H.dc.1v2.nhit < 3
-goodHDC1x2 H.dc.1x2.nhit > 0 && H.dc.1x2.nhit < 3
-
-goodHDC2x1 H.dc.2x1.nhit > 0 && H.dc.2x1.nhit < 3
-goodHDC2u2 H.dc.2u2.nhit > 0 && H.dc.2u2.nhit < 3
-goodHDC2u1 H.dc.2u1.nhit > 0 && H.dc.2u1.nhit < 3
-goodHDC2v1 H.dc.2v1.nhit > 0 && H.dc.2v1.nhit < 3
-goodHDC2v2 H.dc.2v2.nhit > 0 && H.dc.2v2.nhit < 3
-goodHDC2x2 H.dc.2x2.nhit > 0 && H.dc.2x2.nhit < 3
-
-goodHDC1 goodHDC1x1 && goodHDC1u2 && goodHDC1u1 && goodHDC1v1 && goodHDC1v2 && goodHDC1x2
-goodHDC2 goodHDC2x1 && goodHDC2u2 && goodHDC2u1 && goodHDC2v1 && goodHDC2v2 && goodHDC2x2
-bothGood goodHDC1 && goodHDC2
-
-realhdc1x1 goodHDC1x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1u2 goodHDC1u2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1u1 goodHDC1u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1v1 goodHDC1v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1v2 goodHDC1v2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc1x2 goodHDC1x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2x1 goodHDC2x1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2u2 goodHDC2u2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2u1 goodHDC2u1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2v1 goodHDC2v1 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2v2 goodHDC2v2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-realhdc2x2 goodHDC2x2 && ((H.dc.Ch1.spacepoints+H.dc.Ch2.spacepoints)>0)
-
-hFound1Track H.dc.ntrack == 1
-hFound2Track H.dc.ntrack == 2
-hFound3Track H.dc.ntrack == 3
-hFound4Track H.dc.ntrack == 4
-
-hCleanTrack H.gtr.index > -1
-1hCleanTrack H.gtr.index == 0
-2hCleanTrack H.gtr.index == 1
-3hCleanTrack H.gtr.index == 2
-4hCleanTrack H.gtr.index == 3
-
-anyhs1x H.hod.1x.nhits > 0
-anyhs1y H.hod.1y.nhits > 0
-anyhs2x H.hod.2x.nhits > 0
-anyhs2y H.hod.2y.nhits > 0
-
-goodhs1x H.hod.1x.nhits > 0 && H.hod.1x.nhits < 3
-goodhs1y H.hod.1y.nhits > 0 && H.hod.1y.nhits < 3
-goodhs1 goodhs1x && goodhs1y
-goodhs2x H.hod.2x.nhits > 0 && H.hod.2x.nhits < 3
-goodhs2y H.hod.2y.nhits > 0 && H.hod.2y.nhits < 3
-goodhs2 goodhs2x && goodhs2y
-goodhs1s2 goodhs1 && goodhs2
-
-HMS_hcer_track_matched_region_1 H.cer.numTracksMatched[0]>0
-HMS_hcer_track_fired_region_1 H.cer.numTracksFired[0]>0
-HMS_hcer_track_matched_region_2 H.cer.numTracksMatched[1]>0
-HMS_hcer_track_fired_region_2 H.cer.numTracksFired[1]>0
-HMS_hcer_track_matched_tot H.cer.totNumTracksMatched>0
-HMS_hcer_track_fired_tot H.cer.totNumTracksFired>0
-
-Block: Physics
-Physics_master HMS_event
diff --git a/DEF-files/HMS/STACK/merge_def_files.py b/DEF-files/HMS/STACK/merge_def_files.py
deleted file mode 100644
index e89af197..00000000
--- a/DEF-files/HMS/STACK/merge_def_files.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-# Python script to merge multiple def-files into single def-file
-import os
-import sys
-
-if (len(sys.argv) != 3 or sys.argv[1] == '-h'):
- print('Usage:')
- print(' merge_def_files.py merge_list.txt outfile.def')
- sys.exit()
-
-defFileList = open(sys.argv[1], 'r')
-defFile = defFileList.readlines()
-defFilePath = []
-mergedDefFile = sys.argv[2]
-
-for defFileName in defFile:
- defFilePath.append((defFileName).strip())
-
-with open(mergedDefFile, 'w') as outFile:
- for defFileName in defFilePath:
- outFile.write('\n\n')
- with open(defFileName) as inFile:
- for line in inFile:
- outFile.write(line)
diff --git a/DEF-files/HMS/STACK/merge_list.txt b/DEF-files/HMS/STACK/merge_list.txt
deleted file mode 100644
index b5789849..00000000
--- a/DEF-files/HMS/STACK/merge_list.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-BLOCK/hblock_vars.def
-CER/hcer_histos.def
-DC/hdc_6gev_histos.def
-HODO/hhodo_histos.def
-CAL/hcal_histos.def
-TRIG/htrig_histos.def
diff --git a/DEF-files/SHMS/EXAMPLES/workshop_example.def b/DEF-files/SHMS/EXAMPLES/workshop_example.def
deleted file mode 100644
index 9d55066b..00000000
--- a/DEF-files/SHMS/EXAMPLES/workshop_example.def
+++ /dev/null
@@ -1,31 +0,0 @@
-# Block variable definitions
-block T.shms.*
-block P.dc.*
-block P.hod.*
-block P.hgcer.*
-block P.gtr.*
-
-# Hodoscope 1x+ ADC 1D histograms
-TH1F phodo_1x_pos_rawpa 'SHMS 1X+ Raw Pulse Amplitude; Raw Pulse Amplitude; Number of Entries / 10 ADC Channels' P.hod.1x.posAdcPulseAmpRaw 410 0 4100
-TH1F phodo_1x_pos_pa 'SHMS 1X+ Pulse Amplitude; Pulse Amplitude; Number of Entries / 10 ADC Channels' P.hod.1x.posAdcPulseAmp 410 0 4100
-TH1F phodo_1x_pos_pt 'SHMS 1X+ Raw Pulse Time; Raw Pulse Time; Number of Entried / 100 ADC Channels' P.hod.1x.posAdcPulseTimeRaw 640 0 6400
-
-# Hodoscope 1x+ ADC cut 1D histogram
-TH1F phodo_1x_pos_pa_ntrack_cut 'SHMS 1X+ Pulse Amplitude NTrack = 1 Cut; Pulse Amplitude; Number of Entries / 10 ADC Channels' P.hod.1x.posAdcPulseAmp 410 0 4100 P.dc.ntrack==1
-
-# Hodoscope 1x+ ADC 2D histograms
-TH2F phodo_1x_pos_rawpa_vs_pmt 'SHMS 1X+ Raw Pulse Amplitude vs PMT; PMT Number; Raw Pulse Amplitude / 10 ADC Channels' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseAmpRaw 13 0.5 13.5 410 0 4100
-TH2F phodo_1x_pos_pa_vs_pmt 'SHMS 1X+ Pulse Amplitude vs PMT; PMT Number; Pulse Amplitude / 10 ADC Channels' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseAmp 13 0.5 13.5 410 0 4100
-TH2F phodo_1x_pos_pt_vs_pmt 'SHMS 1X+ Raw Pulse Time vs PMT; PMT Number; Raw Pulse Time / 100 ADC Channels' P.hod.1x.posAdcCounter P.hod.1x.posAdcPulseTimeRaw 13 0.5 13.5 640 0 6400
-
-# DC TDC 2D histograms
-TH2F pdc_1x1_raw_tdc 'SHMS 1X1 Raw TDC vs. Wire Number; Wire Number; Raw TDC Value/ 10 TDC Units' P.dc.1x1.wirenum P.dc.1u1.rawtdc 79 0.5 79.5 5000 -25000 25000
-
-# Heavy gas 2D histograms
-# Vector of histograms
-TH2F phgc_good_pt_vs_pa_pmt_ 'SHMS HGCER Good Pulse Time vs. Good Pulse Amplitude; Good Pulse Amplitude / 10 ADC Channels; Good Pulse Time / 100 ADC Channels' P.hgcer.goodAdcPulseAmp P.hgcer.goodAdcPulseTime 410 0 4100 250 0 2500
-# Scalar histogram
-sTH2F phgc_good_pt_vs_pa_all 'SHMS HGCER Good Pulse Time vs. Good Pulse Amplitude; Good Pulse Amplitude / 10 ADC Channels; Good Pulse Time / 100 ADC Channels' P.hgcer.goodAdcPulseAmp P.hgcer.goodAdcPulseTime 410 0 4100 250 0 2500
-# Eye histogram
-TH1F phgc_good_pi_pmt_3 'SHMS HGCER Good Pulse Integral; Good Pulse Integral; Number of Entries / 100 ADC Channels' P.hgcer.goodAdcPulseInt[2] 300 0 30000
-TH2F phgc_good_pi_vs_pmt 'SHMS HGCER Good Pulse Integral vs. PMT; PMT Number; Good Pulse Integral / 100 ADC Channels' [I+1] P.hgcer.goodAdcPulseInt 4 0.5 4.5 300 0 30000 P.hgcer.goodAdcPulseInt>0.0
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
index 73c4151c..3dd48437 100644
--- a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
@@ -68,8 +68,8 @@ TH2D ptrig6rate_vs_time 'SHMS Trig6 Rate vs. Time; 1 MHz Clock Time (s); pTRIG6
#SHMS TRIG PEDESTALS for HGC, NGC, PRESHWR
#--------------------------------------------
-TH1F ptrig_phgc_sum_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 0.25 mV' T.shms.pHGCER_adcPed 4000 0 1000 T.shms.pHGCER_adcPed>0.0
-TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 0.25 mV' T.shms.pNGCER_adcPed 4000 0 1000 T.shms.pNGCER_adcPed>0.0
-TH1F ptrig_prshwr_sum_pped 'SHMS Preshwr Sum FADC pulse Pedestal; Pulse Pedestal; Number of entries / 0.25 mV' T.shms.pPSHWR_adcPed 4000 0 1000 T.shms.pPSHWR_adcPed>0.0
-TH1F ptrig_phgc_sum_MOD_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 0.25 mV' T.shms.pHGCER_MOD_adcPed 4000 0 1000 T.shms.pHGCER_MOD_adcPed>0.0
-TH1F ptrig_pngc_sum_MOD_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 0.25 mV' T.shms.pNGCER_MOD_adcPed 4000 0 1000 T.shms.pNGCER_MOD_adcPed>0.0
+TH1F ptrig_phgc_sum_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pHGCER_adcPed 500 0 1000 T.shms.pHGCER_adcPed>0.0
+TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pNGCER_adcPed 500 0 1000 T.shms.pNGCER_adcPed>0.0
+TH1F ptrig_prshwr_sum_pped 'SHMS Preshwr Sum FADC pulse Pedestal; Pulse Pedestal; Number of entries /2 mV' T.shms.pPSHWR_adcPed 500 0 1000 T.shms.pPSHWR_adcPed>0.0
+TH1F ptrig_phgc_sum_MOD_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pHGCER_MOD_adcPed 500 0 1000 T.shms.pHGCER_MOD_adcPed>0.0
+TH1F ptrig_pngc_sum_MOD_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 2 mV' T.shms.pNGCER_MOD_adcPed 500 0 1000 T.shms.pNGCER_MOD_adcPed>0.0
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/AERO/paero_histos.def b/DEF-files/SHMS/STACK/AERO/paero_histos.def
deleted file mode 100644
index 47e557e4..00000000
--- a/DEF-files/SHMS/STACK/AERO/paero_histos.def
+++ /dev/null
@@ -1,43 +0,0 @@
-#***************
-# SHMS AEROGEL *
-#***************
-
-#----------------------------------------------
-# SHMS AEROGEL GOOD Occupancy and Multiplicity
-#----------------------------------------------
-
-TH1F paero_good_occ_pos 'SHMS Aero+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.aero.numGoodPosAdcHits 7 0.5 7.5
-TH1F paero_good_occ_neg 'SHMS Aero- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.aero.numGoodNegAdcHits 7 0.5 7.5
-TH1F paero_good_mult_pos 'SHMS Aero+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.aero.totNumGoodPosAdcHits 7 0.5 7.5
-TH1F paero_good_mult_neg 'SHMS Aero- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.aero.totNumGoodNegAdcHits 7 0.5 7.5
-TH1F paero_good_mult 'SHMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.aero.totnumGoodAdcHits 14 0.5 14.5
-
-#-------------------------------
-# SHMS AERO TOTAL NUMBER OF P.E.
-#-------------------------------
-
-TH1F paero_tot_npe_pos 'SHMS Aero+ Total Number of Photoelectrons; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.posNpeSum 200 0 100 P.aero.posNpeSum>0.0
-TH1F paero_tot_npe_neg 'SHMS Aero- Total Number of Photoelectrons; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.negNpeSum 200 0 100 P.aero.negNpeSum>0.0
-TH1F paero_tot_npe 'SHMS Aero Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.npeSum 200 0 100 P.aero.npeSum>0.0
-
-#--------------------------------
-# SHMS AERO Number of P.E. / PMT
-#--------------------------------
-
-TH2F paero_npe_pos 'SHMS Aero+ Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.aero.posNpe 7 0.5 7.5 200 0 100 P.aero.posNpe>0.0
-TH2F paero_npe_neg 'SHMS Aero- Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.aero.negNpe 7 0.5 7.5 200 0 100 P.aero.negNpe>0.0
-
-#------------------------------------------------------------------------------
-# SHMS AERO GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#------------------------------------------------------------------------------
-
-TH2F paero_good_pped_vs_pmt_pos 'SHMS Aero+ Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.aero.goodPosAdcPed 7 0.5 7.5 400 300 700 P.aero.goodPosAdcPed>0.0
-TH2F paero_good_pi_vs_pmt_pos 'SHMS Aero+ Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.aero.goodPosAdcPulseInt 7 0.5 7.5 600 0 30000 P.aero.goodPosAdcPulseInt>0.0
-TH2F paero_good_pamp_vs_pmt_pos 'SHMS Aero+ Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.aero.goodPosAdcPulseAmp 7 0.5 7.5 200 0 4000 P.aero.goodPosAdcPulseAmp>0.0
-TH2F paero_good_ptime_vs_pmt_pos 'SHMS Aero+ Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.aero.goodPosAdcPulseTime 7 0.5 7.5 350 0 3500 P.aero.goodPosAdcPulseTime>0.0
-
-TH2F paero_good_pped_vs_pmt_neg 'SHMS Aero- Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.aero.goodNegAdcPed 7 0.5 7.5 400 300 700 P.aero.goodNegAdcPed>0.0
-TH2F paero_good_pi_vs_pmt_neg 'SHMS Aero- Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.aero.goodNegAdcPulseInt 7 0.5 7.5 600 0 30000 P.aero.goodNegAdcPulseInt>0.0
-TH2F paero_good_pamp_vs_pmt_neg 'SHMS Aero- Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.aero.goodNegAdcPulseAmp 7 0.5 7.5 200 0 4000 P.aero.goodNegAdcPulseAmp>0.0
-TH2F paero_good_ptime_vs_pmt_neg 'SHMS Aero- Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.aero.goodNegAdcPulseTime 7 0.5 7.5 350 0 3500 P.aero.goodNegAdcPulseTime>0.0
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/BLOCK/pblock_vars.def b/DEF-files/SHMS/STACK/BLOCK/pblock_vars.def
deleted file mode 100644
index 4d4ad24c..00000000
--- a/DEF-files/SHMS/STACK/BLOCK/pblock_vars.def
+++ /dev/null
@@ -1,13 +0,0 @@
-#********************
-# Block Definitions *
-#********************
-
-block T.shms.*
-block P.ngcer.*
-block P.dc.*
-block P.tr.*
-block P.hod.*
-block P.hgcer.*
-block P.aero.*
-block P.cal.*
-block P.gtr.*
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/CAL/pcal_histos.def b/DEF-files/SHMS/STACK/CAL/pcal_histos.def
deleted file mode 100644
index 36e37b71..00000000
--- a/DEF-files/SHMS/STACK/CAL/pcal_histos.def
+++ /dev/null
@@ -1,110 +0,0 @@
-#*******************
-# SHMS CALORIMETER *
-#*******************
-
-#--------------------------------------------
-# SHMS PreSH GOOD Occupancy and Multiplicity
-#--------------------------------------------
-
-TH1F pcal_prshwr_good_occ_pos 'SHMS PreShower+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.cal.pr.numGoodPosAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_occ_neg 'SHMS PreShower- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.cal.pr.numGoodNegAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult_pos 'SHMS PreShower+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.cal.pr.totNumGoodPosAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult_neg 'SHMS PreShower- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.cal.pr.totNumGoodNegAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult 'SHMS PreShower Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.cal.pr.totnumGoodAdcHits 28 0.5 28.5
-
-#--------------------------------------------------------------------------------------------------
-# GOOD PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES
-# GOOD --> (passed errorFlag cut, pulsetime cuts oN Min/Max ADC Time Window, and ADC threshold cut)
-#--------------------------------------------------------------------------------------------------
-
-TH2F pcal_prshwr_good_pped_vs_pmt_pos 'SHMS PreShower+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.cal.pr.goodPosAdcPed 14 0.5 14.5 400 300 700 P.cal.pr.goodPosAdcPed>0.0
-TH2F pcal_prshwr_good_pi_vs_pmt_pos 'SHMS PreShower+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.cal.pr.goodPosAdcPulseInt 14 0.5 14.5 600 0 30000 P.cal.pr.goodPosAdcPulseInt>0.0
-TH2F pcal_prshwr_good_pamp_vs_pmt_pos 'SHMS PreShower+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.cal.pr.goodPosAdcPulseAmp 14 0.5 14.5 200 0 4000 P.cal.pr.goodPosAdcPulseAmp>0.0
-TH2F pcal_prshwr_good_ptime_vs_pmt_pos 'SHMS PreShower+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.cal.pr.goodPosAdcPulseTime 14 0.5 14.5 350 0 3500 P.cal.pr.goodPosAdcPulseTime>0.0
-
-TH2F pcal_prshwr_good_pped_vs_pmt_neg 'SHMS PreShower- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.cal.pr.goodNegAdcPed 14 0.5 14.5 400 300 700 P.cal.pr.goodNegAdcPed>0.0
-TH2F pcal_prshwr_good_pi_vs_pmt_neg 'SHMS PreShower- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseInt 14 0.5 14.5 600 0 30000 P.cal.pr.goodNegAdcPulseInt>0.0
-TH2F pcal_prshwr_good_pamp_vs_pmt_neg 'SHMS PreShower- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseAmp 14 0.5 14.5 200 0 4000 P.cal.pr.goodNegAdcPulseAmp>0.0
-TH2F pcal_prshwr_good_ptime_vs_pmt_neg 'SHMS PreShower- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseTime 14 0.5 14.5 350 0 3500 P.cal.pr.goodNegAdcPulseTime>0.0
-
-#------------------------------------------------------
-# SHMS PRE-SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS
-# (calib consts (GAIN) are in GeV/ADC units )
-#------------------------------------------------------
-
-TH2F pcal_prshwr_Epos_vs_pmt 'SHMS PreShower+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.epos 14 0.5 14.5 200 0 2 P.cal.pr.epos>0.0
-TH2F pcal_prshwr_Eneg_vs_pmt 'SHMS PreShower- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.eneg 14 0.5 14.5 200 0 2 P.cal.pr.eneg>0.0
-TH2F pcal_prshwr_Emean_vs_pmt 'SHMS PreShower Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.emean 14 0.5 14.5 300 0 3 P.cal.pr.emean>0.0
-
-#-------------------------------------------
-# SHMS ENERGY DEPOSITION in PreShower PLANE
-#-------------------------------------------
-
-TH1F pcal_prshwr_Eplane_pos 'SHMS PreShower+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_pos 200 0 2 P.cal.pr.eplane_pos>0.0
-TH1F pcal_prshwr_Eplane_neg 'SHMS PreShower- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_neg 200 0 2 P.cal.pr.eplane_neg>0.0
-TH1F pcal_prshwr_Eplane 'SHMS PreShower Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane 300 0 3 P.cal.pr.eplane>0.0
-
-#---------------------------------------------
-# SHMS Shower GOOD Occupancy and Multiplicity
-#---------------------------------------------
-TH1F pcal_shwr_good_occ 'SHMS Shower Good Occupancy; PMT Number; Number of Good ADC Hits' P.cal.fly.numGoodAdcHits 224 0.5 224.5
-TH1F pcal_shwr_good_mult 'SHMS Shower Good Multiplicity; PMT Number; Total Number of Good ADC Hits' P.cal.fly.totNumGoodAdcHits 224 0.5 224.5
-
-#-------------------------------------------------------------
-# SHMS Shower GOOD PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES
-#-------------------------------------------------------------
-
-TH2F pcal_shwr_good_pped_vs_pmt 'SHMS Shower Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.cal.fly.goodAdcPed 224 0.5 224.5 700 300 1000 P.cal.fly.goodAdcPed>0.0
-TH2F pcal_shwr_good_pi_vs_pmt 'SHMS Shower Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.cal.fly.goodAdcPulseInt 224 0.5 224.5 600 0 30000 P.cal.fly.goodAdcPulseInt>0.0
-TH2F pcal_shwr_good_pamp_vs_pmt 'SHMS Shower Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.cal.fly.goodAdcPulseAmp 224 0.5 224.5 200 0 4000 P.cal.fly.goodAdcPulseAmp>0.0
-TH2F pcal_shwr_good_ptime_vs_pmt 'SHMS Shower Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.cal.fly.goodAdcPulseTime 224 0.5 224.5 350 0 3500 P.cal.fly.goodAdcPulseTime>0.0
-
-#--------------------------------------------------
-# SHMS SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS
-# (calib consts (GAIN) are in GeV/ADC units )
-#--------------------------------------------------
-
-TH2F pcal_shwr_E_vs_pmt 'SHMS Shower Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.fly.e 224 0.5 224.5 300 0 3 P.cal.fly.e>0.0
-
-#--------------------------------------------------
-# TOTAL ENERGY DEPOSITION IN THE SHMS SHOWER ARRAY
-#--------------------------------------------------
-
-TH1F pcal_shwr_Earray 'SHMS Shower Total Energy Deposition in Array; Total Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.fly.earray 600 0 6 P.cal.fly.earray>0.0
-
-#-------------------------------------------------------------------------------------
-# SHMS PRE-SHOWER AND SHOWER (CALORIMETER) TOTAL ENERGY DEPOSITION
-# TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
-#-------------------------------------------------------------------------------------
-
-TH1F pcal_etot 'SHMS Calorimeter Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.etot 500 0 5 P.cal.etot>0.0
-TH1F pcal_etot_norm 'SHMS Calorimeter Total Normalized Energy Deposition; Total Energy Deposited (GeV) / P0 (GeV); Number of Entries / 0.01' P.cal.etotnorm 500 0 5 P.cal.etotnorm>0.0
-TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposited (GeV); Number of Entries / 0.1 GeV' P.cal.etrack 100 0 10 P.cal.etrack>0.0
-TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0
-TH1F pcal_etracknorm_track 'SHMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0&&P.dc.ntrack>0
-TH1F pcal_enenorm_track_elec 'SHMS Cal energy/p (npeSum > .5&&abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH1F pcal_enenorm_track_pion 'SHMS Cal energy/p (npeSum <.5&&abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH2F pcal_ene_2dtrack 'SHMS Cal energy v energy track' P.cal.etrack P.cal.etot 1000 0. 5. 1000 0. 5. P.dc.ntrack>0
-TH2F pcal_delta_etrack 'SHMS Delta v Cal energy/p ' P.cal.etracknorm P.gtr.dp 60 0. 1.5 80 -15. 25. P.dc.ntrack>0
-TH2F pcal_ngnpe_etrack 'SHMS NG Cer Npe v Cal energy/p' P.cal.etracknorm P.ngcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
-TH2F pcal_hgnpe_etrack 'SHMS HG Cer Npe v Cal energy/p' P.cal.etracknorm P.hgcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
-
-#-------------------------------
-# SHMS PID AND ACCEPTANCE PLOTS
-#-------------------------------
-
-TH2F hgc_vs_prshw 'SHMS HGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC Total N.P.E. / 0.5' P.cal.pr.eplane P.hgcer.npeSum 300 0 3 40 0 20 P.cal.pr.eplane>0.0&&P.hgcer.npeSum>0.0
-TH2F ngc_vs_prshw 'SHMS NGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC Total N.P.E. / 0.5' P.cal.pr.eplane P.ngcer.npeSum 300 0 3 40 0 20 P.cal.pr.eplane>0.0&&P.ngcer.npeSum>0.0
-TH2F pcal_shw_vs_prshw 'Shower vs. PreShower Energy Deposition; PreShower Energy / 0.1 GeV; Shower Energy / 0.1 GeV' P.cal.pr.eplane P.cal.fly.earray 50 0 5 350 0 35 P.cal.pr.eplane>0.0&&P.cal.fly.earray>0.0
-TH2F delta_vs_etracknorm 'SHMS Delta. vs. Normalized Track Energy; Calorimeter Normalized Track Energy; Momentum Acceptance (%)' P.cal.etracknorm P.gtr.dp 50 0 5 80 -15, 25 P.cal.etracknorm>0.0&&P.dc.ntrack>0
-
-#---------------------------
-# CLUSTERING PLOTS
-#---------------------------
-
-TH1F pcal_xclusttrack 'SHMS Cal X pos' P.cal.xclusttrack 200 -100. 100. P.cal.nclusttrack>-1
-TH1F pcal_xdiff 'SHMS Cal X pos - X track' P.cal.xclusttrack-P.cal.xtrack 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH2F pcal_xdiff_v_xtr 'SHMS Cal X pos - X track v Xtr' P.cal.xtrack P.cal.xclusttrack-P.cal.xtrack 200 -100. 100. 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack 'SHMS Cal X pos of track' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack1 'SHMS Cal X pos of track no matching clust' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-TH1F pcal_xtrack2 'SHMS Cal X pos of track no matching clust number of cluster=1' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/DC/pdc_histos.def b/DEF-files/SHMS/STACK/DC/pdc_histos.def
deleted file mode 100644
index 0d5485e0..00000000
--- a/DEF-files/SHMS/STACK/DC/pdc_histos.def
+++ /dev/null
@@ -1,162 +0,0 @@
-#*****************
-# Drift Chambers *
-#*****************
-
-#------------------
-# SHMS DC WIRE MAP
-#------------------
-
-TH1F pdc1u1_wirenum 'SHMS DC 1U1 Wiremap; Wire Number; Number of Entries' P.dc.1u1.wirenum 107 0.5 107.5
-TH1F pdc1u2_wirenum 'SHMS DC 1U2 Wiremap; Wire Number; Number of Entries' P.dc.1u2.wirenum 107 0.5 107.5
-TH1F pdc1x1_wirenum 'SHMS DC 1X1 Wiremap; Wire Number; Number of Entries' P.dc.1x1.wirenum 79 0.5 79.5
-TH1F pdc1x2_wirenum 'SHMS DC 1X2 Wiremap; Wire Number; Number of Entries' P.dc.1x2.wirenum 79 0.5 79.5
-TH1F pdc1v1_wirenum 'SHMS DC 1V1 Wiremap; Wire Number; Number of Entries' P.dc.1v1.wirenum 107 0.5 107.5
-TH1F pdc1v2_wirenum 'SHMS DC 1V2 Wiremap; Wire Number; Number of Entries' P.dc.1v2.wirenum 107 0.5 107.5
-
-TH1F pdc2v2_wirenum 'SHMS DC 2V2 Wiremap; Wire Number; Number of Entries' P.dc.2v2.wirenum 107 0.5 107.5
-TH1F pdc2v1_wirenum 'SHMS DC 2V1 Wiremap; Wire Number; Number of Entries' P.dc.2v1.wirenum 107 0.5 107.5
-TH1F pdc2x2_wirenum 'SHMS DC 2X2 Wiremap; Wire Number; Number of Entries' P.dc.2x2.wirenum 79 0.5 79.5
-TH1F pdc2x1_wirenum 'SHMS DC 2X1 Wiremap; Wire Number; Number of Entries' P.dc.2x1.wirenum 79 0.5 79.5
-TH1F pdc2u2_wirenum 'SHMS DC 2U2 Wiremap; Wire Number; Number of Entries' P.dc.2u2.wirenum 107 0.5 107.5
-TH1F pdc2u1_wirenum 'SHMS DC 2U1 Wiremap; Wire Number; Number of Entries' P.dc.2u1.wirenum 107 0.5 107.5
-
-#------------------------------
-# SHMS DC DRIFT TIME PER PLANE
-#------------------------------
-
-TH1F pdc1u1_drifttime 'SHMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u1.time 400 -50 350
-TH1F pdc1u2_drifttime 'SHMS DC 1U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u2.time 400 -50 350
-TH1F pdc1x1_drifttime 'SHMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x1.time 400 -50 350
-TH1F pdc1x2_drifttime 'SHMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x2.time 400 -50 350
-TH1F pdc1v1_drifttime 'SHMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v1.time 400 -50 350
-TH1F pdc1v2_drifttime 'SHMS DC 1V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v2.time 400 -50 350
-
-TH1F pdc2v2_drifttime 'SHMS DC 2V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v2.time 400 -50 350
-TH1F pdc2v1_drifttime 'SHMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v1.time 400 -50 350
-TH1F pdc2x2_drifttime 'SHMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x2.time 400 -50 350
-TH1F pdc2x1_drifttime 'SHMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x1.time 400 -50 350
-TH1F pdc2u2_drifttime 'SHMS DC 2U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u2.time 400 -50 350
-TH1F pdc2u1_drifttime 'SHMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u1.time 400 -50 350
-
-#----------------------------------
-# SHMS DC DRIFT TIME VS. WIRENUMBER
-#----------------------------------
-
-TH2F pdc1u1_drifttime_vs_wirenum 'SHMS DC 1U1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1u1.wirenum P.dc.1u1.time 107 0.5 107.5 500 0 500
-TH2F pdc1u2_drifttime_vs_wirenum 'SHMS DC 1U2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1u2.wirenum P.dc.1u2.time 107 0.5 107.5 500 0 500
-TH2F pdc1x1_drifttime_vs_wirenum 'SHMS DC 1X1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1x1.wirenum P.dc.1x1.time 79 0.5 79.5 500 0 500
-TH2F pdc1x2_drifttime_vs_wirenum 'SHMS DC 1X2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1x2.wirenum P.dc.1x2.time 79 0.5 79.5 500 0 500
-TH2F pdc1v1_drifttime_vs_wirenum 'SHMS DC 1V1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1v1.wirenum P.dc.1v1.time 107 0.5 107.5 500 0 500
-TH2F pdc1v2_drifttime_vs_wirenum 'SHMS DC 1V2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1v2.wirenum P.dc.1v2.time 107 0.5 107.5 500 0 500
-
-TH2F pdc2v2_drifttime_vs_wirenum 'SHMS DC 2V2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2v2.wirenum P.dc.2v2.time 107 0.5 107.5 500 0 500
-TH2F pdc2v1_drifttime_vs_wirenum 'SHMS DC 2V1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2v1.wirenum P.dc.2v1.time 107 0.5 107.5 500 0 500
-TH2F pdc2x2_drifttime_vs_wirenum 'SHMS DC 2X2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2x2.wirenum P.dc.2x2.time 79 0.5 79.5 500 0 500
-TH2F pdc2x1_drifttime_vs_wirenum 'SHMS DC 2X1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2x1.wirenum P.dc.2x1.time 79 0.5 79.5 500 0 500
-TH2F pdc2u2_drifttime_vs_wirenum 'SHMS DC 2U2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2u2.wirenum P.dc.2u2.time 107 0.5 107.5 500 0 500
-TH2F pdc2u1_drifttime_vs_wirenum 'SHMS DC 2U1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2u1.wirenum P.dc.2u1.time 107 0.5 107.5 500 0 500
-
-#----------------------------------
-# SHMS DC Drift Distance Per Plane
-#----------------------------------
-
-TH1F pdc1u1_ddist 'SHMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u1.dist 50 -0.1 0.6
-TH1F pdc1u1_ddist_cut 'SHMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u1.dist 50 -0.1 0.6 time_cut1
-
-TH1F pdc1u2_ddist 'SHMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u2.dist 50 -0.1 0.6
-TH1F pdc1u2_ddist_cut 'SHMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u2.dist 50 -0.1 0.6 time_cut2
-
-TH1F pdc1x1_ddist 'SHMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x1.dist 50 -0.1 0.6
-TH1F pdc1x1_ddist_cut 'SHMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x1.dist 50 -0.1 0.6 time_cut3
-
-TH1F pdc1x2_ddist 'SHMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x2.dist 50 -0.1 0.6
-TH1F pdc1x2_ddist_cut 'SHMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x2.dist 50 -0.1 0.6 time_cut4
-
-TH1F pdc1v1_ddist 'SHMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v1.dist 50 -0.1 0.6
-TH1F pdc1v1_ddist_cut 'SHMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v1.dist 50 -0.1 0.6 time_cut5
-
-TH1F pdc1v2_ddist 'SHMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v2.dist 50 -0.1 0.6
-TH1F pdc1v2_ddist_cut 'SHMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v2.dist 50 -0.1 0.6 time_cut6
-
-TH1F pdc2v2_ddist 'SHMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v2.dist 50 -0.1 0.6
-TH1F pdc2v2_ddist_cut 'SHMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v2.dist 50 -0.1 0.6 time_cut7
-
-TH1F pdc2v1_ddist 'SHMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v1.dist 50 -0.1 0.6
-TH1F pdc2v1_ddist_cut 'SHMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v1.dist 50 -0.1 0.6 time_cut8
-
-TH1F pdc2x2_ddist 'SHMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x2.dist 50 -0.1 0.6
-TH1F pdc2x2_ddist_cut 'SHMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x2.dist 50 -0.1 0.6 time_cut9
-
-TH1F pdc2x1_ddist 'SHMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x1.dist 50 -0.1 0.6
-TH1F pdc2x1_ddist_cut 'SHMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x1.dist 50 -0.1 0.6 time_cut10
-
-TH1F pdc2u2_ddist 'SHMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u2.dist 50 -0.1 0.6
-TH1F pdc2u2_ddist_cut 'SHMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u2.dist 50 -0.1 0.6 time_cut11
-
-TH1F pdc2u1_ddist 'SHMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u1.dist 50 -0.1 0.6
-TH1F pdc2u1_ddist_cut 'SHMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u1.dist 50 -0.1 0.6 time_cut12
-
-#----------------------------------------
-# SHMS DC Drift Distance vs. Wire number
-#----------------------------------------
-
-TH2F pdc1u1_wirenum_vs_ddist 'SHMS 1U1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1u1.wirenum P.dc.1u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc1u2_wirenum_vs_ddist 'SHMS 1U2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1u2.wirenum P.dc.1u2.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc1x1_wirenum_vs_ddist 'SHMS 1X1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1x1.wirenum P.dc.1x1.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc1x2_wirenum_vs_ddist 'SHMS 1X2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1x2.wirenum P.dc.1x2.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc1v1_wirenum_vs_ddist 'SHMS 1V1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1v1.wirenum P.dc.1v1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc1v2_wirenum_vs_ddist 'SHMS 1V2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1v2.wirenum P.dc.1v2.dist 107 0.5 107.5 300 -0.1 0.6
-
-TH2F pdc2u2_wirenum_vs_ddist 'SHMS 2U2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2u2.wirenum P.dc.2u2.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc2u1_wirenum_vs_ddist 'SHMS 2U1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2u1.wirenum P.dc.2u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc2x2_wirenum_vs_ddist 'SHMS 2X2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2x2.wirenum P.dc.2x2.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc2x1_wirenum_vs_ddist 'SHMS 2X1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2x1.wirenum P.dc.2x1.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc2v2_wirenum_vs_ddist 'SHMS 2V2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2v2.wirenum P.dc.2v2.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc2v1_wirenum_vs_ddist 'SHMS 2V1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2v1.wirenum P.dc.2v1.dist 107 0.5 107.5 300 -0.1 0.6
-
-#-----------------------------
-# SHMS DC RESIDUALS PER PLANE
-#-----------------------------
-
-TH1F pdc1u1_residuals 'SHMS 1U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[0] 200 -1.0 1.0
-TH1F pdc1u2_residuals 'SHMS 1U2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[1] 200 -1.0 1.0
-TH1F pdc1x1_residuals 'SHMS 1X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[2] 200 -1.0 1.0
-TH1F pdc1x2_residuals 'SHMS 1X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[3] 200 -1.0 1.0
-TH1F pdc1v1_residuals 'SHMS 1V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[4] 200 -1.0 1.0
-TH1F pdc1v2_residuals 'SHMS 1V2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[5] 200 -1.0 1.0
-
-TH1F pdc2v2_residuals 'SHMS 2V2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[6] 200 -1.0 1.0
-TH1F pdc2v1_residuals 'SHMS 2V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[7] 200 -1.0 1.0
-TH1F pdc2x2_residuals 'SHMS 2X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[8] 200 -1.0 1.0
-TH1F pdc2x1_residuals 'SHMS 2X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[9] 200 -1.0 1.0
-TH1F pdc2u2_residuals 'SHMS 2U2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[10] 200 -1.0 1.0
-TH1F pdc2u1_residuals 'SHMS 2U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[11] 200 -1.0 1.0
-
-#-----------------------------------
-# SHMS DC RESIDUALS vs. Wire Number
-#-----------------------------------
-
-TH2F pdc1u1_residuals_vs_wirenum 'SHMS 1U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1u1.wirenum P.dc.residual[0] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1u2_residuals_vs_wirenum 'SHMS 1U2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1u2.wirenum P.dc.residual[1] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1x1_residuals_vs_wirenum 'SHMS 1X1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1x1.wirenum P.dc.residual[2] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc1x2_residuals_vs_wirenum 'SHMS 1X2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1x2.wirenum P.dc.residual[3] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc1v1_residuals_vs_wirenum 'SHMS 1V1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1v1.wirenum P.dc.residual[4] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1v2_residuals_vs_wirenum 'SHMS 1V2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1v2.wirenum P.dc.residual[5] 107 0.5 107.5 200 -1.0 1.0
-
-TH2F pdc2v2_residuals_vs_wirenum 'SHMS 2V2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2v2.wirenum P.dc.residual[6] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2v1_residuals_vs_wirenum 'SHMS 2V1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2v1.wirenum P.dc.residual[7] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2x2_residuals_vs_wirenum 'SHMS 2X2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2x2.wirenum P.dc.residual[8] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc2x1_residuals_vs_wirenum 'SHMS 2X1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2x1.wirenum P.dc.residual[9] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc2u2_residuals_vs_wirenum 'SHMS 2U2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2u2.wirenum P.dc.residual[10] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2u1_residuals_vs_wirenum 'SHMS 2U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2u1.wirenum P.dc.residual[11] 107 0.5 107.5 200 -1.0 1.0
-
-#-------------------------------------------
-# SHMS DC TRACKING VARIABLES AT FOCAL PLANE
-#-------------------------------------------
-
-TH1F pdc_trk_mom 'SHMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6
-TH1F pdc_trk_beta 'SHMS DC Track Beta; Beta (GeV); Number of Entires' P.tr.beta 300 -1.5 1.5
-TH2F pdc_xfp_vs_yxp 'SHMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' P.dc.y_fp P.dc.x_fp 100 -50 50 100 -50 50
-TH2F pdc_xpfp_vs_ypfp 'SHMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' P.dc.yp_fp P.dc.xp_fp 100 -.1 .1 100 -.1 .1
-TH2F pdc_xfp_vs_ypfp 'SHMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm' P.dc.yp_fp P.dc.x_fp 100 -.1 .1 100 -50 50
-TH2F pdc_xfp_vs_xpfp 'SHMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' P.dc.xp_fp P.dc.x_fp 100 -.1 .1 100 -50 50
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/HGCER/phgcer_histos.def b/DEF-files/SHMS/STACK/HGCER/phgcer_histos.def
deleted file mode 100644
index 82bae8b9..00000000
--- a/DEF-files/SHMS/STACK/HGCER/phgcer_histos.def
+++ /dev/null
@@ -1,39 +0,0 @@
-#**********************
-# Heavy Gas Cherenkov *
-#**********************
-
-#-----------------------------------------
-# SHMS HGC GOOD Occupancy and Multiplicity
-#-----------------------------------------
-
-TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Number Good ADC Hits' P.hgcer.numGoodAdcHits 4 0.5 4.5
-TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
-
-#-------------------------------------------------------------------------------
-# SHMS HGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#-------------------------------------------------------------------------------
-
-TH2F phgcer_good_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.hgcer.goodAdcPed 4 0.5 4.5 400 300 700
-TH2F phgcer_good_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.hgcer.goodAdcPulseInt 4 0.5 4.5 600 0 30000 P.hgcer.goodAdcPulseInt>0.0
-TH2F phgcer_good_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.hgcer.goodAdcPulseAmp 4 0.5 4.5 200 0 4000 P.hgcer.goodAdcPulseAmp>0.0
-TH2F phgcer_good_ptime_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.hgcer.goodAdcPulseTime 4 0.5 4.5 350 0 3500 P.hgcer.goodAdcPulseTime>0.0
-
-#-------------------------------
-# SHMS HGC Number of P.E. / PMT
-#-------------------------------
-
-TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.hgcer.npe 4 0.5 4.5 200 0 100 P.hgcer.npe>0.0
-
-#-------------------------------
-# SHMS HGC TOTAL NUMBER OF P.E.
-#-------------------------------
-
-TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 200 0 100 P.hgcer.npeSum>0.0
-
-#--------------------------
-# SHMS HGC TRACK MATCHING
-#--------------------------
-
-sTH1F phgcer_trk_match 'SHMS Noble Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' P.hgcer.numTracksMatched 4 0.5 4.5
-sTH1F phgcer_trk_fired 'SHMS Noble Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.hgcer.numTracksFired 4 0.5 4.5
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/HODO/phodo_histos.def b/DEF-files/SHMS/STACK/HODO/phodo_histos.def
deleted file mode 100644
index 8e99e5aa..00000000
--- a/DEF-files/SHMS/STACK/HODO/phodo_histos.def
+++ /dev/null
@@ -1,178 +0,0 @@
-#*****************
-# SHMS HODOSCOPES
-#*****************
-
-#-----------------------------------
-# SHMS HODO GOOD ADC Multiplicities
-#-----------------------------------
-
-TH1F phodo_1x_good_adc_mult_pos 'SHMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1x.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult_pos 'SHMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1y.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult_pos 'SHMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2x.totNumGoodPosAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult_pos 'SHMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2y.totNumGoodPosAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_mult_neg 'SHMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1x.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult_neg 'SHMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1y.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult_neg 'SHMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2x.totNumGoodNegAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult_neg 'SHMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2y.totNumGoodNegAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_mult 'SHMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1x.totNumGoodAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult 'SHMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1y.totNumGoodAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult 'SHMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2x.totNumGoodAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult 'SHMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2y.totNumGoodAdcHits 21 0.5 21.5
-
-#-----------------------------------
-# SHMS HODO Good TDC Multiplicities
-#-----------------------------------
-
-TH1F phodo_1x_good_tdc_mult_pos 'SHMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1x.totNumGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult_pos 'SHMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1y.totNumGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult_pos 'SHMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2x.totNumGoodPosTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult_pos 'SHMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2y.totNumGoodPosTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_mult_neg 'SHMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1x.totNumGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult_neg 'SHMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1y.totNumGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult_neg 'SHMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2x.totNumGoodNegTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult_neg 'SHMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2y.totNumGoodNegTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_mult 'SHMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1x.totNumGoodTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult 'SHMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1y.totNumGoodTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult 'SHMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2x.totNumGoodTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult 'SHMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2y.totNumGoodTdcHits 21 0.5 21.5
-
-#---------------------------------
-# SHMS HODO GOOD ADC OCCUPANCIES
-#---------------------------------
-
-TH1F phodo_1x_good_adc_occ_pos 'SHMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1x.numGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_occ_pos 'SHMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1y.numGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_occ_pos 'SHMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2x.numGoodPosAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_occ_pos 'SHMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2y.numGoodPosAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_occ_neg 'SHMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1x.numGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_occ_neg 'SHMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1y.numGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_occ_neg 'SHMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2x.numGoodNegAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_occ_neg 'SHMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2y.numGoodNegAdcHits 21 0.5 21.5
-
-#--------------------------------
-# SHMS HODO GOOD TDC OCCUPANCIES
-#--------------------------------
-
-TH1F phodo_1x_good_tdc_occ_pos 'SHMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1x.numGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_occ_pos 'SHMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1y.numGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_occ_pos 'SHMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2x.numGoodPosTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_occ_pos 'SHMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2y.numGoodPosTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_occ_neg 'SHMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1x.numGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_occ_neg 'SHMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1y.numGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_occ_neg 'SHMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2x.numGoodNegTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_occ_neg 'SHMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2y.numGoodNegTdcHits 21 0.5 21.5
-
-#---------------------
-# GOOD PULSE PEDESTAL
-#---------------------
-
-TH2F phodo_1x_good_pped_vs_pmt_pos 'SHMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1x.GoodPosAdcPed 13 0.5 13.5 400 300 700 P.hod.1x.GoodPosAdcPed>0.0
-TH2F phodo_1y_good_pped_vs_pmt_pos 'SHMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1y.GoodPosAdcPed 13 0.5 13.5 400 300 700 P.hod.1y.GoodPosAdcPed>0.0
-TH2F phodo_2x_good_pped_vs_pmt_pos 'SHMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2x.GoodPosAdcPed 14 0.5 14.5 400 300 700 P.hod.2x.GoodPosAdcPed>0.0
-TH2F phodo_2y_good_pped_vs_pmt_pos 'SHMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2y.GoodPosAdcPed 21 0.5 21.5 400 300 700 P.hod.2y.GoodPosAdcPed>0.0
-
-TH2F phodo_1x_good_pped_vs_pmt_neg 'SHMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1x.GoodNegAdcPed 13 0.5 13.5 400 300 700 P.hod.1x.GoodNegAdcPed>0.0
-TH2F phodo_1y_good_pped_vs_pmt_neg 'SHMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1y.GoodNegAdcPed 13 0.5 13.5 400 300 700 P.hod.1y.GoodNegAdcPed>0.0
-TH2F phodo_2x_good_pped_vs_pmt_neg 'SHMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2x.GoodNegAdcPed 14 0.5 14.5 400 300 700 P.hod.2x.GoodNegAdcPed>0.0
-TH2F phodo_2y_good_pped_vs_pmt_neg 'SHMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2y.GoodNegAdcPed 21 0.5 21.5 400 300 700 P.hod.2y.GoodNegAdcPed>0.0
-
-#---------------------
-# GOOD PULSE INTEGRAL
-#---------------------
-
-TH2F phodo_1x_good_pi_vs_pmt_pos 'SHMS 1X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1x.GoodPosAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1x.GoodPosAdcPulseInt>0.0
-TH2F phodo_1y_good_pi_vs_pmt_pos 'SHMS 1Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1y.GoodPosAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1y.GoodPosAdcPulseInt>0.0
-TH2F phodo_2x_good_pi_vs_pmt_pos 'SHMS 2X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2x.GoodPosAdcPulseInt 14 0.5 14.5 600 0 30000 P.hod.2x.GoodPosAdcPulseInt>0.0
-TH2F phodo_2y_good_pi_vs_pmt_pos 'SHMS 2Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2y.GoodPosAdcPulseInt 21 0.5 21.5 600 0 30000 P.hod.2y.GoodPosAdcPulseInt>0.0
-
-TH2F phodo_1x_good_pi_vs_pmt_neg 'SHMS 1X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1x.GoodNegAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1x.GoodNegAdcPulseInt>0.0
-TH2F phodo_1y_good_pi_vs_pmt_neg 'SHMS 1Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1y.GoodNegAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1y.GoodNegAdcPulseInt>0.0
-TH2F phodo_2x_good_pi_vs_pmt_neg 'SHMS 2X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2x.GoodNegAdcPulseInt 14 0.5 14.5 600 0 30000 P.hod.2x.GoodNegAdcPulseInt>0.0
-TH2F phodo_2y_good_pi_vs_pmt_neg 'SHMS 2Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2y.GoodNegAdcPulseInt 21 0.5 21.5 600 0 30000 P.hod.2y.GoodNegAdcPulseInt>0.0
-
-#-----------------------
-# GOOD PULSE AMPLITUDE
-#-----------------------
-
-TH2F phodo_1x_good_pamp_vs_pmt_pos 'SHMS 1X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1x.GoodPosAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1x.GoodPosAdcPulseAmp>0.0
-TH2F phodo_1y_good_pamp_vs_pmt_pos 'SHMS 1Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1y.GoodPosAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1y.GoodPosAdcPulseAmp>0.0
-TH2F phodo_2x_good_pamp_vs_pmt_pos 'SHMS 2X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2x.GoodPosAdcPulseAmp 14 0.5 14.5 205 0 4100 P.hod.2x.GoodPosAdcPulseAmp>0.0
-TH2F phodo_2y_good_pamp_vs_pmt_pos 'SHMS 2Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2y.GoodPosAdcPulseAmp 21 0.5 21.5 205 0 4100 P.hod.2y.GoodPosAdcPulseAmp>0.0
-
-TH2F phodo_1x_good_pamp_vs_pmt_neg 'SHMS 1X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1x.GoodNegAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1x.GoodNegAdcPulseAmp>0.0
-TH2F phodo_1y_good_pamp_vs_pmt_neg 'SHMS 1Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1y.GoodNegAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1y.GoodNegAdcPulseAmp>0.0
-TH2F phodo_2x_good_pamp_vs_pmt_neg 'SHMS 2X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2x.GoodNegAdcPulseAmp 14 0.5 14.5 205 0 4100 P.hod.2x.GoodNegAdcPulseAmp>0.0
-TH2F phodo_2y_good_pamp_vs_pmt_neg 'SHMS 2Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2y.GoodNegAdcPulseAmp 21 0.5 21.5 205 0 4100 P.hod.2y.GoodNegAdcPulseAmp>0.0
-
-#---------------------
-# GOOD ADC PULSE TIME
-#---------------------
-
-TH2F phodo_1x_good_ptime_vs_pmt_pos 'SHMS 1X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1x.GoodPosAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1x.GoodPosAdcPulseTime>0.0
-TH2F phodo_1y_good_ptime_vs_pmt_pos 'SHMS 1Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1y.GoodPosAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1y.GoodPosAdcPulseTime>0.0
-TH2F phodo_2x_good_ptime_vs_pmt_pos 'SHMS 2X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2x.GoodPosAdcPulseTime 14 0.5 14.5 410 0 4100 P.hod.2x.GoodPosAdcPulseTime>0.0
-TH2F phodo_2y_good_ptime_vs_pmt_pos 'SHMS 2Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2y.GoodPosAdcPulseTime 21 0.5 21.5 410 0 4100 P.hod.2y.GoodPosAdcPulseTime>0.0
-
-TH2F phodo_1x_good_ptime_vs_pmt_neg 'SHMS 1X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1x.GoodNegAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1x.GoodNegAdcPulseTime>0.0
-TH2F phodo_1y_good_ptime_vs_pmt_neg 'SHMS 1Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1y.GoodNegAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1y.GoodNegAdcPulseTime>0.0
-TH2F phodo_2x_good_ptime_vs_pmt_neg 'SHMS 2X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2x.GoodNegAdcPulseTime 14 0.5 14.5 410 0 4100 P.hod.2x.GoodNegAdcPulseTime>0.0
-TH2F phodo_2y_good_ptime_vs_pmt_neg 'SHMS 2Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2y.GoodNegAdcPulseTime 21 0.5 21.5 410 0 4100 P.hod.2y.GoodNegAdcPulseTime>0.0
-
-#---------------------------------------------------------
-# GOOD TDC TIME UNCORRECTED (uncorrected for time offsets)
-#---------------------------------------------------------
-
-TH2F phodo_1x_good_tdctime_uncorr_vs_pmt_pos 'SHMS 1X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodPosTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodPosTdcTimeUnCorr>0.0
-TH2F phodo_1y_good_tdctime_uncorr_vs_pmt_pos 'SHMS 1Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodPosTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodPosTdcTimeUnCorr>0.0
-TH2F phodo_2x_good_tdctime_uncorr_vs_pmt_pos 'SHMS 2X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodPosTdcTimeUnCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodPosTdcTimeUnCorr>0.0
-TH2F phodo_2y_good_tdctime_uncorr_vs_pmt_pos 'SHMS 2Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodPosTdcTimeUnCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodPosTdcTimeUnCorr>0.0
-
-TH2F phodo_1x_good_tdctime_uncorr_vs_pmt_neg 'SHMS 1X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodNegTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodNegTdcTimeUnCorr>0.0
-TH2F phodo_1y_good_tdctime_uncorr_vs_pmt_neg 'SHMS 1Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodNegTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodNegTdcTimeUnCorr>0.0
-TH2F phodo_2x_good_tdctime_uncorr_vs_pmt_neg 'SHMS 2X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodNegTdcTimeUnCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodNegTdcTimeUnCorr>0.0
-TH2F phodo_2y_good_tdctime_uncorr_vs_pmt_neg 'SHMS 2Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodNegTdcTimeUnCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodNegTdcTimeUnCorr>0.0
-
-#-----------------------------------------------------
-# GOOD TDC TIME CORRECTED (corrected for time offsets)
-#-----------------------------------------------------
-
-TH2F phodo_1x_good_tdctime_corr_vs_pmt_pos 'SHMS 1X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodPosTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodPosTdcTimeCorr>0.0
-TH2F phodo_1y_good_tdctime_corr_vs_pmt_pos 'SHMS 1Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodPosTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodPosTdcTimeCorr>0.0
-TH2F phodo_2x_good_tdctime_corr_vs_pmt_pos 'SHMS 2X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodPosTdcTimeCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodPosTdcTimeCorr>0.0
-TH2F phodo_2y_good_tdctime_corr_vs_pmt_pos 'SHMS 2Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodPosTdcTimeCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodPosTdcTimeCorr>0.0
-
-TH2F phodo_1x_good_tdctime_corr_vs_pmt_neg 'SHMS 1X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodNegTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodNegTdcTimeCorr>0.0
-TH2F phodo_1y_good_tdctime_corr_vs_pmt_neg 'SHMS 1Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodNegTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodNegTdcTimeCorr>0.0
-TH2F phodo_2x_good_tdctime_corr_vs_pmt_neg 'SHMS 2X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodNegTdcTimeCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodNegTdcTimeCorr>0.0
-TH2F phodo_2y_good_tdctime_corr_vs_pmt_neg 'SHMS 2Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodNegTdcTimeCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodNegTdcTimeCorr>0.0
-
-#-----------------------------------------------------------
-# GOOD TDC TIME TOF CORRECTED (corrected for time of flight)
-#-----------------------------------------------------------
-
-TH2F phodo_1x_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 1X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodPosTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodPosTdcTimeTOFCorr>0.0
-TH2F phodo_1y_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 1Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodPosTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodPosTdcTimeTOFCorr>0.0
-TH2F phodo_2x_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 2X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodPosTdcTimeTOFCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodPosTdcTimeTOFCorr>0.0
-TH2F phodo_2y_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 2Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodPosTdcTimeTOFCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodPosTdcTimeTOFCorr>0.0
-
-TH2F phodo_1x_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 1X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodNegTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodNegTdcTimeTOFCorr>0.0
-TH2F phodo_1y_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 1Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodNegTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodNegTdcTimeTOFCorr>0.0
-TH2F phodo_2x_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 2X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodNegTdcTimeTOFCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodNegTdcTimeTOFCorr>0.0
-TH2F phodo_2y_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 2Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodNegTdcTimeTOFCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodNegTdcTimeTOFCorr>0.0
-
-#----------------------------------------------------------------
-# SHMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
-#----------------------------------------------------------------
-
-TH1F phodo_beta_notrack 'SHMS Hodo Calculated Beta Without Track Info; Beta; Number of Entries / 0.02' P.hod.betanotrack 100 0 2.0 P.hod.betanotrack>0.0
-TH1F phodo_beta 'SHMS Hodo Beta; Beta; Number of Entries / 0.02' P.hod.beta 100 0 2.0 P.hod.beta>0.0
-TH1F phodo_fpHitsTime 'SHMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' P.hod.fpHitsTime 90 0 90
-TH1F phodo_starttime 'SHMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' P.hod.starttime 90 0 90
-TH1F phodo_good_startime 'SHMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' P.hod.goodstarttime 90 0 90
-TH2F phodo_xhod_vs_yhod 'SHMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' P.hod.y_hodo P.hod.x_hodo 1000 -50 50 1000 -50 50
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/NGCER/pngcer_histos.def b/DEF-files/SHMS/STACK/NGCER/pngcer_histos.def
deleted file mode 100644
index 868491e7..00000000
--- a/DEF-files/SHMS/STACK/NGCER/pngcer_histos.def
+++ /dev/null
@@ -1,39 +0,0 @@
-#**********************
-# Noble Gas Cherenkov *
-#**********************
-
-#------------------------------------------
-# SHMS NGC GOOD Occupancy and Multiplicity
-#------------------------------------------
-
-TH1F pngcer_good_occ 'SHMS Noble Gas Cherenkov Good Occupancy; PMT Number; Number of Good ADC Hits' P.ngcer.numGoodAdcHits 4 0.5 4.5
-TH1F pngcer_good_mult 'SHMS Noble Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.ngcer.totNumGoodAdcHits 4 0.5 4.5
-
-#-------------------------------------------------------------------------------
-# SHMS NGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#-------------------------------------------------------------------------------
-
-TH2F pngcer_good_pped_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.ngcer.goodAdcPed 4 0.5 4.5 400 300 700
-TH2F pngcer_good_pi_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.ngcer.goodAdcPulseInt 4 0.5 4.5 600 0 30000 P.ngcer.goodAdcPulseInt>0.0
-TH2F pngcer_good_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.ngcer.goodAdcPulseAmp 4 0.5 4.5 200 0 4000 P.ngcer.goodAdcPulseAmp>0.0
-TH2F pngcer_good_ptime_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.ngcer.goodAdcPulseTime 4 0.5 4.5 350 0 3500 P.ngcer.goodAdcPulseTime>0.0
-
-#-------------------------------
-# SHMS NGC Number of P.E. / PMT
-#-------------------------------
-
-TH2F pngcer_npe 'SHMS Noble Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.ngcer.npe 4 0.5 4.5 200 0 100 P.ngcer.npe>0.0
-
-#-------------------------------
-# SHMS NGC TOTAL NUMBER OF P.E.
-#-------------------------------
-
-TH1F pngcer_tot_npe 'SHMS Noble Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.ngcer.npeSum 200 0 100 P.ngcer.npeSum>0.0
-
-#--------------------------
-# SHMS NGC TRACK MATCHING
-#--------------------------
-
-sTH1F pngcer_trk_match 'SHMS Noble Gas Cherenkov Tracks Matches; PMT Number; Number of Tracks Matched' P.ngcer.numTracksMatched 4 0.5 4.5
-sTH1F pngcer_trk_fired 'SHMS Noble Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.ngcer.numTracksFired 4 0.5 4.5
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/TRIG/ptrig_histos.def b/DEF-files/SHMS/STACK/TRIG/ptrig_histos.def
deleted file mode 100644
index 27479ef6..00000000
--- a/DEF-files/SHMS/STACK/TRIG/ptrig_histos.def
+++ /dev/null
@@ -1,90 +0,0 @@
-#********************
-# Trigger Apparatus *
-#********************
-
-TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pNGCER_adcPed 2000 0 2000
-TH1F ptrig_pngc_sum_pint 'SHMS Noble Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pNGCER_adcPulseInt 4000 0 40000
-TH1F ptrig_pngc_sum_pamp 'SHMS Noble Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pNGCER_adcPulseAmp 4100 0 4100
-TH1F ptrig_pngc_sum_ptime 'SHMS Noble Gas Sum FADC Pulse Time; Pulse Time; Number of Entries / 10 ADC Units' T.shms.pNGCER_adcPulseTimeRaw 1000 0 10000
-TH1F ptrig_pngc_sum_tdc 'SHMS Noble Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units' T.shms.pNGCER_tdcTime 700 -3500 3500
-
-TH1F ptrig_phgc_sum_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pHGCER_adcPed 2000 0 2000
-TH1F ptrig_phgc_sum_pint 'SHMS Heavy Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pHGCER_adcPulseInt 4000 0 40000
-TH1F ptrig_phgc_sum_pamp 'SHMS Heavy Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pHGCER_adcPulseAmp 4100 0 4100
-TH1F ptrig_phgc_sum_ptime 'SHMS Heavy Gas Sum FADC Pulse Time; Pulse Time; Number of Entries / 10 ADC Units' T.shms.pHGCER_adcPulseTimeRaw 1000 0 10000
-TH1F ptrig_phgc_sum_tdc 'SHMS Heavy Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units' T.shms.pHGCER_tdcTime 700 -3500 3500
-
-TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1X_tdcMultiplicity 11 0 11
-TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1Y_tdcMultiplicity 11 0 11
-TH1F ptrig_p2x_tdc_mult 'SHMS p2x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2X_tdcMultiplicity 11 0 11
-TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2Y_tdcMultiplicity 11 0 11
-
-TH1F ptrig_p1T_tdc_mult 'SHMS p1x/p1y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1T_tdcMultiplicity 11 0 11
-TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2T_tdcMultiplicity 11 0 11
-
-TH1F ptrig_pT1_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 20, Channel 15); Raw TDC Multiplicity; Counts / 10' T.shms.pT1_tdcMultiplicity 11 0 11
-TH1F ptrig_pT2_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.shms.pT2_tdcMultiplicity 11 0 11
-TH1F ptrig_pT3_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 38); Raw TDC Multiplicity; Counts / 10' T.shms.pT3_tdcMultiplicity 11 0 11
-
-TH1F ptrig_p1x_tdc 'SHMS p1x TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1X_tdcTime 350 0 3500
-TH1F ptrig_p1y_tdc 'SHMS p1y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1Y_tdcTime 350 0 3500
-TH1F ptrig_p2x_tdc 'SHMS p2x TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2X_tdcTime 350 0 3500
-TH1F ptrig_p2y_tdc 'SHMS p2y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2Y_tdcTime 350 0 3500
-
-TH1F ptrig_p1T_tdc 'SHMS p1x/p1y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1T_tdcTime 350 0 3500
-TH1F ptrig_p2T_tdc 'SHMS p2x/p2y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2T_tdcTime 350 0 3500
-
-TH1F ptrig_pT1_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 20, Channel 15); Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT1_tdcTime 350 0 3500
-TH1F ptrig_pT2_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 31); Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT2_tdcTime 350 0 3500
-TH1F ptrig_pT3_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 38); Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT3_tdcTime 350 0 3500
-
-TH1F ptrig_p1x_good_tdc 'SHMS p1x Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1X_tdcTime 350 0 3500 T.shms.p1X_tdcMultiplicity==1
-TH1F ptrig_p1y_good_tdc 'SHMS p1y Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1Y_tdcTime 350 0 3500 T.shms.p1Y_tdcMultiplicity==1
-TH1F ptrig_p2x_good_tdc 'SHMS p2x Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2X_tdcTime 350 0 3500 T.shms.p2X_tdcMultiplicity==1
-TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2Y_tdcTime 350 0 3500 T.shms.p2Y_tdcMultiplicity==1
-
-TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1T_tdcTime 350 0 3500 T.shms.p1T_tdcMultiplicity==1
-TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2T_tdcTime 350 0 3500 T.shms.p2T_tdcMultiplicity==1
-
-TH1F ptrig_pT1_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT1_tdcTime 350 0 3500 T.shms.pT1_tdcMultiplicity==1
-TH1F ptrig_pT2_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT2_tdcTime 350 0 3500 T.shms.pT2_tdcMultiplicity==1
-TH1F ptrig_pT3_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 38); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT3_tdcTime 350 0 3500 T.shms.pT3_tdcMultiplicity==1
-
-TH2F ptrig_ch1xy_ch2x 'SHMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.shms.p1T_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1T_tdcMultiplicity==1
-TH2F ptrig_ch1x_ch2x 'SHMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.shms.p1X_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
-TH2F ptrig_ch1y_ch2x 'SHMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.shms.p1Y_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1Y_tdcMultiplicity==1
-TH2F ptrig_ch1ych1x 'SHMS Hodo Trig; Trig 1X (ns); Trig 1Y (ns)' T.shms.p1X_tdcTime T.shms.p1Y_tdcTime 200 100 300 200 100 300 T.shms.p1Y_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
-
-TH1F ptrig_pdc_ref1 'SHMS DC Reference Time Slot 6 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF1_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref2 'SHMS DC Reference Time Slot 7 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF2_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref3 'SHMS DC Reference Time Slot 8 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF3_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref4 'SHMS DC Reference Time Slot 9 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF4_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref5 'SHMS DC Reference Time Slot 10 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF5_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref6 'SHMS DC Reference Time Slot 11 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF6_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref7 'SHMS DC Reference Time Slot 12 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF7_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref8 'SHMS DC Reference Time Slot 13 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF8_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref9 'SHMS DC Reference Time Slot 14 Channel 15; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF9_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref10 'SHMS DC Reference Time Slot 15 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF10_tdcTime 200 12000 14000
-
-#-------------
-# Fast Raster
-#-------------
-
-# 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.shms.pFRXA_adcPulseIntRaw*(1./4096.)/25.
-formula FRXB_V T.shms.pFRXB_adcPulseIntRaw*(1./4096.)/25.
-formula FRYA_V T.shms.pFRYA_adcPulseIntRaw*(1./4096.)/25.
-formula FRYB_V T.shms.pFRYB_adcPulseIntRaw*(1./4096.)/25.
-
-TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' T.shms.pFRXA_adcPulseIntRaw 1000 0 100000
-TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' T.shms.pFRXB_adcPulseIntRaw 1000 0 100000
-TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' T.shms.pFRYA_adcPulseIntRaw 1000 0 100000
-TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' T.shms.pFRYB_adcPulseIntRaw 1000 0 100000
-TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
-TH2F pFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
-TH2F pFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/merge_def_files.py b/DEF-files/SHMS/STACK/merge_def_files.py
deleted file mode 100644
index e89af197..00000000
--- a/DEF-files/SHMS/STACK/merge_def_files.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-# Python script to merge multiple def-files into single def-file
-import os
-import sys
-
-if (len(sys.argv) != 3 or sys.argv[1] == '-h'):
- print('Usage:')
- print(' merge_def_files.py merge_list.txt outfile.def')
- sys.exit()
-
-defFileList = open(sys.argv[1], 'r')
-defFile = defFileList.readlines()
-defFilePath = []
-mergedDefFile = sys.argv[2]
-
-for defFileName in defFile:
- defFilePath.append((defFileName).strip())
-
-with open(mergedDefFile, 'w') as outFile:
- for defFileName in defFilePath:
- outFile.write('\n\n')
- with open(defFileName) as inFile:
- for line in inFile:
- outFile.write(line)
diff --git a/DEF-files/SHMS/STACK/merge_list.txt b/DEF-files/SHMS/STACK/merge_list.txt
deleted file mode 100644
index 9cd73992..00000000
--- a/DEF-files/SHMS/STACK/merge_list.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-BLOCK/pblock_vars.def
-NGCER/pngcer_histos.def
-DC/pdc_histos.def
-HODO/phodo_histos.def
-HGCER/phgcer_histos.def
-AERO/paero_histos.def
-CAL/pcal_histos.def
-TRIG/ptrig_histos.def
diff --git a/DEF-files/SHMS/STACK/pstackana.def b/DEF-files/SHMS/STACK/pstackana.def
deleted file mode 100644
index 8228e52d..00000000
--- a/DEF-files/SHMS/STACK/pstackana.def
+++ /dev/null
@@ -1,683 +0,0 @@
-
-
-#********************
-# Block Definitions *
-#********************
-
-block T.shms.*
-block P.ngcer.*
-block P.dc.*
-block P.tr.*
-block P.hod.*
-block P.hgcer.*
-block P.aero.*
-block P.cal.*
-block P.gtr.*
-
-#**********************
-# Noble Gas Cherenkov *
-#**********************
-
-#------------------------------------------
-# SHMS NGC GOOD Occupancy and Multiplicity
-#------------------------------------------
-
-TH1F pngcer_good_occ 'SHMS Noble Gas Cherenkov Good Occupancy; PMT Number; Number of Good ADC Hits' P.ngcer.numGoodAdcHits 4 0.5 4.5
-TH1F pngcer_good_mult 'SHMS Noble Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.ngcer.totNumGoodAdcHits 4 0.5 4.5
-
-#-------------------------------------------------------------------------------
-# SHMS NGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#-------------------------------------------------------------------------------
-
-TH2F pngcer_good_pped_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.ngcer.goodAdcPed 4 0.5 4.5 400 300 700
-TH2F pngcer_good_pi_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.ngcer.goodAdcPulseInt 4 0.5 4.5 600 0 30000 P.ngcer.goodAdcPulseInt>0.0
-TH2F pngcer_good_pamp_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.ngcer.goodAdcPulseAmp 4 0.5 4.5 200 0 4000 P.ngcer.goodAdcPulseAmp>0.0
-TH2F pngcer_good_ptime_vs_pmt 'SHMS Noble Gas Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.ngcer.goodAdcPulseTime 4 0.5 4.5 350 0 3500 P.ngcer.goodAdcPulseTime>0.0
-
-#-------------------------------
-# SHMS NGC Number of P.E. / PMT
-#-------------------------------
-
-TH2F pngcer_npe 'SHMS Noble Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.ngcer.npe 4 0.5 4.5 200 0 100 P.ngcer.npe>0.0
-
-#-------------------------------
-# SHMS NGC TOTAL NUMBER OF P.E.
-#-------------------------------
-
-TH1F pngcer_tot_npe 'SHMS Noble Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.ngcer.npeSum 200 0 100 P.ngcer.npeSum>0.0
-
-#--------------------------
-# SHMS NGC TRACK MATCHING
-#--------------------------
-
-sTH1F pngcer_trk_match 'SHMS Noble Gas Cherenkov Tracks Matches; PMT Number; Number of Tracks Matched' P.ngcer.numTracksMatched 4 0.5 4.5
-sTH1F pngcer_trk_fired 'SHMS Noble Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.ngcer.numTracksFired 4 0.5 4.5
-
-#*****************
-# Drift Chambers *
-#*****************
-
-#------------------
-# SHMS DC WIRE MAP
-#------------------
-
-TH1F pdc1u1_wirenum 'SHMS DC 1U1 Wiremap; Wire Number; Number of Entries' P.dc.1u1.wirenum 107 0.5 107.5
-TH1F pdc1u2_wirenum 'SHMS DC 1U2 Wiremap; Wire Number; Number of Entries' P.dc.1u2.wirenum 107 0.5 107.5
-TH1F pdc1x1_wirenum 'SHMS DC 1X1 Wiremap; Wire Number; Number of Entries' P.dc.1x1.wirenum 79 0.5 79.5
-TH1F pdc1x2_wirenum 'SHMS DC 1X2 Wiremap; Wire Number; Number of Entries' P.dc.1x2.wirenum 79 0.5 79.5
-TH1F pdc1v1_wirenum 'SHMS DC 1V1 Wiremap; Wire Number; Number of Entries' P.dc.1v1.wirenum 107 0.5 107.5
-TH1F pdc1v2_wirenum 'SHMS DC 1V2 Wiremap; Wire Number; Number of Entries' P.dc.1v2.wirenum 107 0.5 107.5
-
-TH1F pdc2v2_wirenum 'SHMS DC 2V2 Wiremap; Wire Number; Number of Entries' P.dc.2v2.wirenum 107 0.5 107.5
-TH1F pdc2v1_wirenum 'SHMS DC 2V1 Wiremap; Wire Number; Number of Entries' P.dc.2v1.wirenum 107 0.5 107.5
-TH1F pdc2x2_wirenum 'SHMS DC 2X2 Wiremap; Wire Number; Number of Entries' P.dc.2x2.wirenum 79 0.5 79.5
-TH1F pdc2x1_wirenum 'SHMS DC 2X1 Wiremap; Wire Number; Number of Entries' P.dc.2x1.wirenum 79 0.5 79.5
-TH1F pdc2u2_wirenum 'SHMS DC 2U2 Wiremap; Wire Number; Number of Entries' P.dc.2u2.wirenum 107 0.5 107.5
-TH1F pdc2u1_wirenum 'SHMS DC 2U1 Wiremap; Wire Number; Number of Entries' P.dc.2u1.wirenum 107 0.5 107.5
-
-#------------------------------
-# SHMS DC DRIFT TIME PER PLANE
-#------------------------------
-
-TH1F pdc1u1_drifttime 'SHMS DC 1U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u1.time 400 -50 350
-TH1F pdc1u2_drifttime 'SHMS DC 1U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1u2.time 400 -50 350
-TH1F pdc1x1_drifttime 'SHMS DC 1X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x1.time 400 -50 350
-TH1F pdc1x2_drifttime 'SHMS DC 1X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1x2.time 400 -50 350
-TH1F pdc1v1_drifttime 'SHMS DC 1V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v1.time 400 -50 350
-TH1F pdc1v2_drifttime 'SHMS DC 1V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.1v2.time 400 -50 350
-
-TH1F pdc2v2_drifttime 'SHMS DC 2V2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v2.time 400 -50 350
-TH1F pdc2v1_drifttime 'SHMS DC 2V1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2v1.time 400 -50 350
-TH1F pdc2x2_drifttime 'SHMS DC 2X2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x2.time 400 -50 350
-TH1F pdc2x1_drifttime 'SHMS DC 2X1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2x1.time 400 -50 350
-TH1F pdc2u2_drifttime 'SHMS DC 2U2 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u2.time 400 -50 350
-TH1F pdc2u1_drifttime 'SHMS DC 2U1 Drift Time; Drift Time (ns); Number of Entries / 1 ns' P.dc.2u1.time 400 -50 350
-
-#----------------------------------
-# SHMS DC DRIFT TIME VS. WIRENUMBER
-#----------------------------------
-
-TH2F pdc1u1_drifttime_vs_wirenum 'SHMS DC 1U1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1u1.wirenum P.dc.1u1.time 107 0.5 107.5 500 0 500
-TH2F pdc1u2_drifttime_vs_wirenum 'SHMS DC 1U2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1u2.wirenum P.dc.1u2.time 107 0.5 107.5 500 0 500
-TH2F pdc1x1_drifttime_vs_wirenum 'SHMS DC 1X1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1x1.wirenum P.dc.1x1.time 79 0.5 79.5 500 0 500
-TH2F pdc1x2_drifttime_vs_wirenum 'SHMS DC 1X2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1x2.wirenum P.dc.1x2.time 79 0.5 79.5 500 0 500
-TH2F pdc1v1_drifttime_vs_wirenum 'SHMS DC 1V1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1v1.wirenum P.dc.1v1.time 107 0.5 107.5 500 0 500
-TH2F pdc1v2_drifttime_vs_wirenum 'SHMS DC 1V2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.1v2.wirenum P.dc.1v2.time 107 0.5 107.5 500 0 500
-
-TH2F pdc2v2_drifttime_vs_wirenum 'SHMS DC 2V2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2v2.wirenum P.dc.2v2.time 107 0.5 107.5 500 0 500
-TH2F pdc2v1_drifttime_vs_wirenum 'SHMS DC 2V1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2v1.wirenum P.dc.2v1.time 107 0.5 107.5 500 0 500
-TH2F pdc2x2_drifttime_vs_wirenum 'SHMS DC 2X2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2x2.wirenum P.dc.2x2.time 79 0.5 79.5 500 0 500
-TH2F pdc2x1_drifttime_vs_wirenum 'SHMS DC 2X1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2x1.wirenum P.dc.2x1.time 79 0.5 79.5 500 0 500
-TH2F pdc2u2_drifttime_vs_wirenum 'SHMS DC 2U2Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2u2.wirenum P.dc.2u2.time 107 0.5 107.5 500 0 500
-TH2F pdc2u1_drifttime_vs_wirenum 'SHMS DC 2U1Drift Time vs. Wire Number; Wire Number; Drift Time (ns)' P.dc.2u1.wirenum P.dc.2u1.time 107 0.5 107.5 500 0 500
-
-#----------------------------------
-# SHMS DC Drift Distance Per Plane
-#----------------------------------
-
-TH1F pdc1u1_ddist 'SHMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u1.dist 50 -0.1 0.6
-TH1F pdc1u1_ddist_cut 'SHMS 1U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u1.dist 50 -0.1 0.6 time_cut1
-
-TH1F pdc1u2_ddist 'SHMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u2.dist 50 -0.1 0.6
-TH1F pdc1u2_ddist_cut 'SHMS 1U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1u2.dist 50 -0.1 0.6 time_cut2
-
-TH1F pdc1x1_ddist 'SHMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x1.dist 50 -0.1 0.6
-TH1F pdc1x1_ddist_cut 'SHMS 1X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x1.dist 50 -0.1 0.6 time_cut3
-
-TH1F pdc1x2_ddist 'SHMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x2.dist 50 -0.1 0.6
-TH1F pdc1x2_ddist_cut 'SHMS 1X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1x2.dist 50 -0.1 0.6 time_cut4
-
-TH1F pdc1v1_ddist 'SHMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v1.dist 50 -0.1 0.6
-TH1F pdc1v1_ddist_cut 'SHMS 1V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v1.dist 50 -0.1 0.6 time_cut5
-
-TH1F pdc1v2_ddist 'SHMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v2.dist 50 -0.1 0.6
-TH1F pdc1v2_ddist_cut 'SHMS 1V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.1v2.dist 50 -0.1 0.6 time_cut6
-
-TH1F pdc2v2_ddist 'SHMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v2.dist 50 -0.1 0.6
-TH1F pdc2v2_ddist_cut 'SHMS 2V2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v2.dist 50 -0.1 0.6 time_cut7
-
-TH1F pdc2v1_ddist 'SHMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v1.dist 50 -0.1 0.6
-TH1F pdc2v1_ddist_cut 'SHMS 2V1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2v1.dist 50 -0.1 0.6 time_cut8
-
-TH1F pdc2x2_ddist 'SHMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x2.dist 50 -0.1 0.6
-TH1F pdc2x2_ddist_cut 'SHMS 2X2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x2.dist 50 -0.1 0.6 time_cut9
-
-TH1F pdc2x1_ddist 'SHMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x1.dist 50 -0.1 0.6
-TH1F pdc2x1_ddist_cut 'SHMS 2X1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2x1.dist 50 -0.1 0.6 time_cut10
-
-TH1F pdc2u2_ddist 'SHMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u2.dist 50 -0.1 0.6
-TH1F pdc2u2_ddist_cut 'SHMS 2U2 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u2.dist 50 -0.1 0.6 time_cut11
-
-TH1F pdc2u1_ddist 'SHMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u1.dist 50 -0.1 0.6
-TH1F pdc2u1_ddist_cut 'SHMS 2U1 Drift Distance; Drift Distance (cm); Number of Entries' P.dc.2u1.dist 50 -0.1 0.6 time_cut12
-
-#----------------------------------------
-# SHMS DC Drift Distance vs. Wire number
-#----------------------------------------
-
-TH2F pdc1u1_wirenum_vs_ddist 'SHMS 1U1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1u1.wirenum P.dc.1u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc1u2_wirenum_vs_ddist 'SHMS 1U2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1u2.wirenum P.dc.1u2.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc1x1_wirenum_vs_ddist 'SHMS 1X1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1x1.wirenum P.dc.1x1.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc1x2_wirenum_vs_ddist 'SHMS 1X2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1x2.wirenum P.dc.1x2.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc1v1_wirenum_vs_ddist 'SHMS 1V1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1v1.wirenum P.dc.1v1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc1v2_wirenum_vs_ddist 'SHMS 1V2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.1v2.wirenum P.dc.1v2.dist 107 0.5 107.5 300 -0.1 0.6
-
-TH2F pdc2u2_wirenum_vs_ddist 'SHMS 2U2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2u2.wirenum P.dc.2u2.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc2u1_wirenum_vs_ddist 'SHMS 2U1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2u1.wirenum P.dc.2u1.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc2x2_wirenum_vs_ddist 'SHMS 2X2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2x2.wirenum P.dc.2x2.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc2x1_wirenum_vs_ddist 'SHMS 2X1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2x1.wirenum P.dc.2x1.dist 79 0.5 79.5 300 -0.1 0.6
-TH2F pdc2v2_wirenum_vs_ddist 'SHMS 2V2 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2v2.wirenum P.dc.2v2.dist 107 0.5 107.5 300 -0.1 0.6
-TH2F pdc2v1_wirenum_vs_ddist 'SHMS 2V1 Wiremap vs. Drift Distance; Wire Number; Drift Distance (cm)' P.dc.2v1.wirenum P.dc.2v1.dist 107 0.5 107.5 300 -0.1 0.6
-
-#-----------------------------
-# SHMS DC RESIDUALS PER PLANE
-#-----------------------------
-
-TH1F pdc1u1_residuals 'SHMS 1U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[0] 200 -1.0 1.0
-TH1F pdc1u2_residuals 'SHMS 1U2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[1] 200 -1.0 1.0
-TH1F pdc1x1_residuals 'SHMS 1X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[2] 200 -1.0 1.0
-TH1F pdc1x2_residuals 'SHMS 1X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[3] 200 -1.0 1.0
-TH1F pdc1v1_residuals 'SHMS 1V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[4] 200 -1.0 1.0
-TH1F pdc1v2_residuals 'SHMS 1V2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[5] 200 -1.0 1.0
-
-TH1F pdc2v2_residuals 'SHMS 2V2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[6] 200 -1.0 1.0
-TH1F pdc2v1_residuals 'SHMS 2V1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[7] 200 -1.0 1.0
-TH1F pdc2x2_residuals 'SHMS 2X2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[8] 200 -1.0 1.0
-TH1F pdc2x1_residuals 'SHMS 2X1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[9] 200 -1.0 1.0
-TH1F pdc2u2_residuals 'SHMS 2U2 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[10] 200 -1.0 1.0
-TH1F pdc2u1_residuals 'SHMS 2U1 DC Residuals; Residuals (cm); Number of Entries / 0.01 cm' P.dc.residual[11] 200 -1.0 1.0
-
-#-----------------------------------
-# SHMS DC RESIDUALS vs. Wire Number
-#-----------------------------------
-
-TH2F pdc1u1_residuals_vs_wirenum 'SHMS 1U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1u1.wirenum P.dc.residual[0] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1u2_residuals_vs_wirenum 'SHMS 1U2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1u2.wirenum P.dc.residual[1] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1x1_residuals_vs_wirenum 'SHMS 1X1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1x1.wirenum P.dc.residual[2] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc1x2_residuals_vs_wirenum 'SHMS 1X2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1x2.wirenum P.dc.residual[3] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc1v1_residuals_vs_wirenum 'SHMS 1V1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1v1.wirenum P.dc.residual[4] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1v2_residuals_vs_wirenum 'SHMS 1V2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.1v2.wirenum P.dc.residual[5] 107 0.5 107.5 200 -1.0 1.0
-
-TH2F pdc2v2_residuals_vs_wirenum 'SHMS 2V2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2v2.wirenum P.dc.residual[6] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2v1_residuals_vs_wirenum 'SHMS 2V1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2v1.wirenum P.dc.residual[7] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2x2_residuals_vs_wirenum 'SHMS 2X2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2x2.wirenum P.dc.residual[8] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc2x1_residuals_vs_wirenum 'SHMS 2X1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2x1.wirenum P.dc.residual[9] 79 0.5 79.5 200 -1.0 1.0
-TH2F pdc2u2_residuals_vs_wirenum 'SHMS 2U2 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2u2.wirenum P.dc.residual[10] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2u1_residuals_vs_wirenum 'SHMS 2U1 DC Residuals vs. Wire Number; Wire Number; Residuals (cm)' P.dc.2u1.wirenum P.dc.residual[11] 107 0.5 107.5 200 -1.0 1.0
-
-#-------------------------------------------
-# SHMS DC TRACKING VARIABLES AT FOCAL PLANE
-#-------------------------------------------
-
-TH1F pdc_trk_mom 'SHMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6
-TH1F pdc_trk_beta 'SHMS DC Track Beta; Beta (GeV); Number of Entires' P.tr.beta 300 -1.5 1.5
-TH2F pdc_xfp_vs_yxp 'SHMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' P.dc.y_fp P.dc.x_fp 100 -50 50 100 -50 50
-TH2F pdc_xpfp_vs_ypfp 'SHMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' P.dc.yp_fp P.dc.xp_fp 100 -.1 .1 100 -.1 .1
-TH2F pdc_xfp_vs_ypfp 'SHMS DC X_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X_{fp} / 1 cm' P.dc.yp_fp P.dc.x_fp 100 -.1 .1 100 -50 50
-TH2F pdc_xfp_vs_xpfp 'SHMS DC X_{fp} vs X'_{fp}; X'_{fp} / 0.002 rad; X_{fp} / 1 cm' P.dc.xp_fp P.dc.x_fp 100 -.1 .1 100 -50 50
-
-#*****************
-# SHMS HODOSCOPES
-#*****************
-
-#-----------------------------------
-# SHMS HODO GOOD ADC Multiplicities
-#-----------------------------------
-
-TH1F phodo_1x_good_adc_mult_pos 'SHMS 1X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1x.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult_pos 'SHMS 1Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.1y.totNumGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult_pos 'SHMS 2X+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2x.totNumGoodPosAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult_pos 'SHMS 2Y+ Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.hod.2y.totNumGoodPosAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_mult_neg 'SHMS 1X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1x.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult_neg 'SHMS 1Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.1y.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult_neg 'SHMS 2X- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2x.totNumGoodNegAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult_neg 'SHMS 2Y- Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.hod.2y.totNumGoodNegAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_mult 'SHMS 1X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1x.totNumGoodAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_mult 'SHMS 1Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.1y.totNumGoodAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_mult 'SHMS 2X Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2x.totNumGoodAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_mult 'SHMS 2Y Good ADC Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hod.2y.totNumGoodAdcHits 21 0.5 21.5
-
-#-----------------------------------
-# SHMS HODO Good TDC Multiplicities
-#-----------------------------------
-
-TH1F phodo_1x_good_tdc_mult_pos 'SHMS 1X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1x.totNumGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult_pos 'SHMS 1Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.1y.totNumGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult_pos 'SHMS 2X+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2x.totNumGoodPosTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult_pos 'SHMS 2Y+ Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good +TDC Hits' P.hod.2y.totNumGoodPosTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_mult_neg 'SHMS 1X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1x.totNumGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult_neg 'SHMS 1Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.1y.totNumGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult_neg 'SHMS 2X- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2x.totNumGoodNegTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult_neg 'SHMS 2Y- Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good -TDC Hits' P.hod.2y.totNumGoodNegTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_mult 'SHMS 1X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1x.totNumGoodTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_mult 'SHMS 1Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.1y.totNumGoodTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_mult 'SHMS 2X Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2x.totNumGoodTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_mult 'SHMS 2Y Good TDC Multiplicity; Number of PMTs Hit; Total Number of Good TDC Hits' P.hod.2y.totNumGoodTdcHits 21 0.5 21.5
-
-#---------------------------------
-# SHMS HODO GOOD ADC OCCUPANCIES
-#---------------------------------
-
-TH1F phodo_1x_good_adc_occ_pos 'SHMS 1X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1x.numGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_occ_pos 'SHMS 1Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.1y.numGoodPosAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_occ_pos 'SHMS 2X+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2x.numGoodPosAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_occ_pos 'SHMS 2Y+ Good ADC Occupancy; PMT Number; Number of Good +ADC Hits' P.hod.2y.numGoodPosAdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_adc_occ_neg 'SHMS 1X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1x.numGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_1y_good_adc_occ_neg 'SHMS 1Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.1y.numGoodNegAdcHits 13 0.5 13.5
-TH1F phodo_2x_good_adc_occ_neg 'SHMS 2X- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2x.numGoodNegAdcHits 14 0.5 14.5
-TH1F phodo_2y_good_adc_occ_neg 'SHMS 2Y- Good ADC Occupancy; PMT Number; Number of Good -ADC Hits' P.hod.2y.numGoodNegAdcHits 21 0.5 21.5
-
-#--------------------------------
-# SHMS HODO GOOD TDC OCCUPANCIES
-#--------------------------------
-
-TH1F phodo_1x_good_tdc_occ_pos 'SHMS 1X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1x.numGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_occ_pos 'SHMS 1Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.1y.numGoodPosTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_occ_pos 'SHMS 2X+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2x.numGoodPosTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_occ_pos 'SHMS 2Y+ Good TDC Occupancy; PMT Number; Number of Good +TDC Hits' P.hod.2y.numGoodPosTdcHits 21 0.5 21.5
-
-TH1F phodo_1x_good_tdc_occ_neg 'SHMS 1X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1x.numGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_1y_good_tdc_occ_neg 'SHMS 1Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.1y.numGoodNegTdcHits 13 0.5 13.5
-TH1F phodo_2x_good_tdc_occ_neg 'SHMS 2X- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2x.numGoodNegTdcHits 14 0.5 14.5
-TH1F phodo_2y_good_tdc_occ_neg 'SHMS 2Y- Good TDC Occupancy; PMT Number; Number of Good -TDC Hits' P.hod.2y.numGoodNegTdcHits 21 0.5 21.5
-
-#---------------------
-# GOOD PULSE PEDESTAL
-#---------------------
-
-TH2F phodo_1x_good_pped_vs_pmt_pos 'SHMS 1X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1x.GoodPosAdcPed 13 0.5 13.5 400 300 700 P.hod.1x.GoodPosAdcPed>0.0
-TH2F phodo_1y_good_pped_vs_pmt_pos 'SHMS 1Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1y.GoodPosAdcPed 13 0.5 13.5 400 300 700 P.hod.1y.GoodPosAdcPed>0.0
-TH2F phodo_2x_good_pped_vs_pmt_pos 'SHMS 2X+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2x.GoodPosAdcPed 14 0.5 14.5 400 300 700 P.hod.2x.GoodPosAdcPed>0.0
-TH2F phodo_2y_good_pped_vs_pmt_pos 'SHMS 2Y+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2y.GoodPosAdcPed 21 0.5 21.5 400 300 700 P.hod.2y.GoodPosAdcPed>0.0
-
-TH2F phodo_1x_good_pped_vs_pmt_neg 'SHMS 1X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1x.GoodNegAdcPed 13 0.5 13.5 400 300 700 P.hod.1x.GoodNegAdcPed>0.0
-TH2F phodo_1y_good_pped_vs_pmt_neg 'SHMS 1Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.1y.GoodNegAdcPed 13 0.5 13.5 400 300 700 P.hod.1y.GoodNegAdcPed>0.0
-TH2F phodo_2x_good_pped_vs_pmt_neg 'SHMS 2X- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2x.GoodNegAdcPed 14 0.5 14.5 400 300 700 P.hod.2x.GoodNegAdcPed>0.0
-TH2F phodo_2y_good_pped_vs_pmt_neg 'SHMS 2Y- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.hod.2y.GoodNegAdcPed 21 0.5 21.5 400 300 700 P.hod.2y.GoodNegAdcPed>0.0
-
-#---------------------
-# GOOD PULSE INTEGRAL
-#---------------------
-
-TH2F phodo_1x_good_pi_vs_pmt_pos 'SHMS 1X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1x.GoodPosAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1x.GoodPosAdcPulseInt>0.0
-TH2F phodo_1y_good_pi_vs_pmt_pos 'SHMS 1Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1y.GoodPosAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1y.GoodPosAdcPulseInt>0.0
-TH2F phodo_2x_good_pi_vs_pmt_pos 'SHMS 2X+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2x.GoodPosAdcPulseInt 14 0.5 14.5 600 0 30000 P.hod.2x.GoodPosAdcPulseInt>0.0
-TH2F phodo_2y_good_pi_vs_pmt_pos 'SHMS 2Y+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2y.GoodPosAdcPulseInt 21 0.5 21.5 600 0 30000 P.hod.2y.GoodPosAdcPulseInt>0.0
-
-TH2F phodo_1x_good_pi_vs_pmt_neg 'SHMS 1X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1x.GoodNegAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1x.GoodNegAdcPulseInt>0.0
-TH2F phodo_1y_good_pi_vs_pmt_neg 'SHMS 1Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.1y.GoodNegAdcPulseInt 13 0.5 13.5 600 0 30000 P.hod.1y.GoodNegAdcPulseInt>0.0
-TH2F phodo_2x_good_pi_vs_pmt_neg 'SHMS 2X- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2x.GoodNegAdcPulseInt 14 0.5 14.5 600 0 30000 P.hod.2x.GoodNegAdcPulseInt>0.0
-TH2F phodo_2y_good_pi_vs_pmt_neg 'SHMS 2Y- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.hod.2y.GoodNegAdcPulseInt 21 0.5 21.5 600 0 30000 P.hod.2y.GoodNegAdcPulseInt>0.0
-
-#-----------------------
-# GOOD PULSE AMPLITUDE
-#-----------------------
-
-TH2F phodo_1x_good_pamp_vs_pmt_pos 'SHMS 1X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1x.GoodPosAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1x.GoodPosAdcPulseAmp>0.0
-TH2F phodo_1y_good_pamp_vs_pmt_pos 'SHMS 1Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1y.GoodPosAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1y.GoodPosAdcPulseAmp>0.0
-TH2F phodo_2x_good_pamp_vs_pmt_pos 'SHMS 2X+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2x.GoodPosAdcPulseAmp 14 0.5 14.5 205 0 4100 P.hod.2x.GoodPosAdcPulseAmp>0.0
-TH2F phodo_2y_good_pamp_vs_pmt_pos 'SHMS 2Y+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2y.GoodPosAdcPulseAmp 21 0.5 21.5 205 0 4100 P.hod.2y.GoodPosAdcPulseAmp>0.0
-
-TH2F phodo_1x_good_pamp_vs_pmt_neg 'SHMS 1X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1x.GoodNegAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1x.GoodNegAdcPulseAmp>0.0
-TH2F phodo_1y_good_pamp_vs_pmt_neg 'SHMS 1Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.1y.GoodNegAdcPulseAmp 13 0.5 13.5 205 0 4100 P.hod.1y.GoodNegAdcPulseAmp>0.0
-TH2F phodo_2x_good_pamp_vs_pmt_neg 'SHMS 2X- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2x.GoodNegAdcPulseAmp 14 0.5 14.5 205 0 4100 P.hod.2x.GoodNegAdcPulseAmp>0.0
-TH2F phodo_2y_good_pamp_vs_pmt_neg 'SHMS 2Y- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.hod.2y.GoodNegAdcPulseAmp 21 0.5 21.5 205 0 4100 P.hod.2y.GoodNegAdcPulseAmp>0.0
-
-#---------------------
-# GOOD ADC PULSE TIME
-#---------------------
-
-TH2F phodo_1x_good_ptime_vs_pmt_pos 'SHMS 1X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1x.GoodPosAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1x.GoodPosAdcPulseTime>0.0
-TH2F phodo_1y_good_ptime_vs_pmt_pos 'SHMS 1Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1y.GoodPosAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1y.GoodPosAdcPulseTime>0.0
-TH2F phodo_2x_good_ptime_vs_pmt_pos 'SHMS 2X+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2x.GoodPosAdcPulseTime 14 0.5 14.5 410 0 4100 P.hod.2x.GoodPosAdcPulseTime>0.0
-TH2F phodo_2y_good_ptime_vs_pmt_pos 'SHMS 2Y+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2y.GoodPosAdcPulseTime 21 0.5 21.5 410 0 4100 P.hod.2y.GoodPosAdcPulseTime>0.0
-
-TH2F phodo_1x_good_ptime_vs_pmt_neg 'SHMS 1X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1x.GoodNegAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1x.GoodNegAdcPulseTime>0.0
-TH2F phodo_1y_good_ptime_vs_pmt_neg 'SHMS 1Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.1y.GoodNegAdcPulseTime 13 0.5 13.5 410 0 4100 P.hod.1y.GoodNegAdcPulseTime>0.0
-TH2F phodo_2x_good_ptime_vs_pmt_neg 'SHMS 2X- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2x.GoodNegAdcPulseTime 14 0.5 14.5 410 0 4100 P.hod.2x.GoodNegAdcPulseTime>0.0
-TH2F phodo_2y_good_ptime_vs_pmt_neg 'SHMS 2Y- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.hod.2y.GoodNegAdcPulseTime 21 0.5 21.5 410 0 4100 P.hod.2y.GoodNegAdcPulseTime>0.0
-
-#---------------------------------------------------------
-# GOOD TDC TIME UNCORRECTED (uncorrected for time offsets)
-#---------------------------------------------------------
-
-TH2F phodo_1x_good_tdctime_uncorr_vs_pmt_pos 'SHMS 1X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodPosTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodPosTdcTimeUnCorr>0.0
-TH2F phodo_1y_good_tdctime_uncorr_vs_pmt_pos 'SHMS 1Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodPosTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodPosTdcTimeUnCorr>0.0
-TH2F phodo_2x_good_tdctime_uncorr_vs_pmt_pos 'SHMS 2X+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodPosTdcTimeUnCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodPosTdcTimeUnCorr>0.0
-TH2F phodo_2y_good_tdctime_uncorr_vs_pmt_pos 'SHMS 2Y+ Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodPosTdcTimeUnCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodPosTdcTimeUnCorr>0.0
-
-TH2F phodo_1x_good_tdctime_uncorr_vs_pmt_neg 'SHMS 1X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodNegTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodNegTdcTimeUnCorr>0.0
-TH2F phodo_1y_good_tdctime_uncorr_vs_pmt_neg 'SHMS 1Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodNegTdcTimeUnCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodNegTdcTimeUnCorr>0.0
-TH2F phodo_2x_good_tdctime_uncorr_vs_pmt_neg 'SHMS 2X- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodNegTdcTimeUnCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodNegTdcTimeUnCorr>0.0
-TH2F phodo_2y_good_tdctime_uncorr_vs_pmt_neg 'SHMS 2Y- Good Uncorrected TDC Time vs. PMT Number; PMT Number; Good Uncorrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodNegTdcTimeUnCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodNegTdcTimeUnCorr>0.0
-
-#-----------------------------------------------------
-# GOOD TDC TIME CORRECTED (corrected for time offsets)
-#-----------------------------------------------------
-
-TH2F phodo_1x_good_tdctime_corr_vs_pmt_pos 'SHMS 1X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodPosTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodPosTdcTimeCorr>0.0
-TH2F phodo_1y_good_tdctime_corr_vs_pmt_pos 'SHMS 1Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodPosTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodPosTdcTimeCorr>0.0
-TH2F phodo_2x_good_tdctime_corr_vs_pmt_pos 'SHMS 2X+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodPosTdcTimeCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodPosTdcTimeCorr>0.0
-TH2F phodo_2y_good_tdctime_corr_vs_pmt_pos 'SHMS 2Y+ Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodPosTdcTimeCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodPosTdcTimeCorr>0.0
-
-TH2F phodo_1x_good_tdctime_corr_vs_pmt_neg 'SHMS 1X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodNegTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodNegTdcTimeCorr>0.0
-TH2F phodo_1y_good_tdctime_corr_vs_pmt_neg 'SHMS 1Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodNegTdcTimeCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodNegTdcTimeCorr>0.0
-TH2F phodo_2x_good_tdctime_corr_vs_pmt_neg 'SHMS 2X- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodNegTdcTimeCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodNegTdcTimeCorr>0.0
-TH2F phodo_2y_good_tdctime_corr_vs_pmt_neg 'SHMS 2Y- Good Corrected TDC Time vs. PMT Number; PMT Number; Good Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodNegTdcTimeCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodNegTdcTimeCorr>0.0
-
-#-----------------------------------------------------------
-# GOOD TDC TIME TOF CORRECTED (corrected for time of flight)
-#-----------------------------------------------------------
-
-TH2F phodo_1x_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 1X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodPosTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodPosTdcTimeTOFCorr>0.0
-TH2F phodo_1y_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 1Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodPosTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodPosTdcTimeTOFCorr>0.0
-TH2F phodo_2x_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 2X+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodPosTdcTimeTOFCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodPosTdcTimeTOFCorr>0.0
-TH2F phodo_2y_good_tdctime_tofcorr_vs_pmt_pos 'SHMS 2Y+ Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodPosTdcTimeTOFCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodPosTdcTimeTOFCorr>0.0
-
-TH2F phodo_1x_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 1X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1x.GoodNegTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1x.GoodNegTdcTimeTOFCorr>0.0
-TH2F phodo_1y_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 1Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.1y.GoodNegTdcTimeTOFCorr 13 0.5 13.5 120 0 120 P.hod.1y.GoodNegTdcTimeTOFCorr>0.0
-TH2F phodo_2x_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 2X- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2x.GoodNegTdcTimeTOFCorr 14 0.5 14.5 120 0 120 P.hod.2x.GoodNegTdcTimeTOFCorr>0.0
-TH2F phodo_2y_good_tdctime_tofcorr_vs_pmt_neg 'SHMS 2Y- Good TOF Corrected TDC Time vs. PMT Number; PMT Number; Good TOF Corrected TDC Time / 1 TDC Unit' [I+1] P.hod.2y.GoodNegTdcTimeTOFCorr 21 0.5 21.5 120 0 120 P.hod.2y.GoodNegTdcTimeTOFCorr>0.0
-
-#----------------------------------------------------------------
-# SHMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
-#----------------------------------------------------------------
-
-TH1F phodo_beta_notrack 'SHMS Hodo Calculated Beta Without Track Info; Beta; Number of Entries / 0.02' P.hod.betanotrack 100 0 2.0 P.hod.betanotrack>0.0
-TH1F phodo_beta 'SHMS Hodo Beta; Beta; Number of Entries / 0.02' P.hod.beta 100 0 2.0 P.hod.beta>0.0
-TH1F phodo_fpHitsTime 'SHMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' P.hod.fpHitsTime 90 0 90
-TH1F phodo_starttime 'SHMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' P.hod.starttime 90 0 90
-TH1F phodo_good_startime 'SHMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' P.hod.goodstarttime 90 0 90
-TH2F phodo_xhod_vs_yhod 'SHMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' P.hod.y_hodo P.hod.x_hodo 1000 -50 50 1000 -50 50
-
-#**********************
-# Heavy Gas Cherenkov *
-#**********************
-
-#-----------------------------------------
-# SHMS HGC GOOD Occupancy and Multiplicity
-#-----------------------------------------
-
-TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Number Good ADC Hits' P.hgcer.numGoodAdcHits 4 0.5 4.5
-TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
-
-#-------------------------------------------------------------------------------
-# SHMS HGC GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#-------------------------------------------------------------------------------
-
-TH2F phgcer_good_pped_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.hgcer.goodAdcPed 4 0.5 4.5 400 300 700
-TH2F phgcer_good_pi_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.hgcer.goodAdcPulseInt 4 0.5 4.5 600 0 30000 P.hgcer.goodAdcPulseInt>0.0
-TH2F phgcer_good_pamp_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.hgcer.goodAdcPulseAmp 4 0.5 4.5 200 0 4000 P.hgcer.goodAdcPulseAmp>0.0
-TH2F phgcer_good_ptime_vs_pmt 'SHMS Heavy Gas Cherenkov Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.hgcer.goodAdcPulseTime 4 0.5 4.5 350 0 3500 P.hgcer.goodAdcPulseTime>0.0
-
-#-------------------------------
-# SHMS HGC Number of P.E. / PMT
-#-------------------------------
-
-TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.hgcer.npe 4 0.5 4.5 200 0 100 P.hgcer.npe>0.0
-
-#-------------------------------
-# SHMS HGC TOTAL NUMBER OF P.E.
-#-------------------------------
-
-TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 200 0 100 P.hgcer.npeSum>0.0
-
-#--------------------------
-# SHMS HGC TRACK MATCHING
-#--------------------------
-
-sTH1F phgcer_trk_match 'SHMS Noble Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' P.hgcer.numTracksMatched 4 0.5 4.5
-sTH1F phgcer_trk_fired 'SHMS Noble Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.hgcer.numTracksFired 4 0.5 4.5
-
-#***************
-# SHMS AEROGEL *
-#***************
-
-#----------------------------------------------
-# SHMS AEROGEL GOOD Occupancy and Multiplicity
-#----------------------------------------------
-
-TH1F paero_good_occ_pos 'SHMS Aero+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.aero.numGoodPosAdcHits 7 0.5 7.5
-TH1F paero_good_occ_neg 'SHMS Aero- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.aero.numGoodNegAdcHits 7 0.5 7.5
-TH1F paero_good_mult_pos 'SHMS Aero+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.aero.totNumGoodPosAdcHits 7 0.5 7.5
-TH1F paero_good_mult_neg 'SHMS Aero- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.aero.totNumGoodNegAdcHits 7 0.5 7.5
-TH1F paero_good_mult 'SHMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.aero.totnumGoodAdcHits 14 0.5 14.5
-
-#-------------------------------
-# SHMS AERO TOTAL NUMBER OF P.E.
-#-------------------------------
-
-TH1F paero_tot_npe_pos 'SHMS Aero+ Total Number of Photoelectrons; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.posNpeSum 200 0 100 P.aero.posNpeSum>0.0
-TH1F paero_tot_npe_neg 'SHMS Aero- Total Number of Photoelectrons; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.negNpeSum 200 0 100 P.aero.negNpeSum>0.0
-TH1F paero_tot_npe 'SHMS Aero Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.npeSum 200 0 100 P.aero.npeSum>0.0
-
-#--------------------------------
-# SHMS AERO Number of P.E. / PMT
-#--------------------------------
-
-TH2F paero_npe_pos 'SHMS Aero+ Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.aero.posNpe 7 0.5 7.5 200 0 100 P.aero.posNpe>0.0
-TH2F paero_npe_neg 'SHMS Aero- Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / PMT' [I+1] P.aero.negNpe 7 0.5 7.5 200 0 100 P.aero.negNpe>0.0
-
-#------------------------------------------------------------------------------
-# SHMS AERO GOOD Pulse Pedestal / Integral / Raw Integral / Amplitude / Time
-# GOOD --> (passed errorFlag cut and pulsetime cuts oN Min/Max ADC Time Window)
-#------------------------------------------------------------------------------
-
-TH2F paero_good_pped_vs_pmt_pos 'SHMS Aero+ Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.aero.goodPosAdcPed 7 0.5 7.5 400 300 700 P.aero.goodPosAdcPed>0.0
-TH2F paero_good_pi_vs_pmt_pos 'SHMS Aero+ Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.aero.goodPosAdcPulseInt 7 0.5 7.5 600 0 30000 P.aero.goodPosAdcPulseInt>0.0
-TH2F paero_good_pamp_vs_pmt_pos 'SHMS Aero+ Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.aero.goodPosAdcPulseAmp 7 0.5 7.5 200 0 4000 P.aero.goodPosAdcPulseAmp>0.0
-TH2F paero_good_ptime_vs_pmt_pos 'SHMS Aero+ Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.aero.goodPosAdcPulseTime 7 0.5 7.5 350 0 3500 P.aero.goodPosAdcPulseTime>0.0
-
-TH2F paero_good_pped_vs_pmt_neg 'SHMS Aero- Good Pulse Pedestal vs. PMT Number; PMT Number; Pulse Pedestal / 1 ADC Units' [I+1] P.aero.goodNegAdcPed 7 0.5 7.5 400 300 700 P.aero.goodNegAdcPed>0.0
-TH2F paero_good_pi_vs_pmt_neg 'SHMS Aero- Good Pulse Integral vs. PMT Number; PMT Number; Pulse Integral / 50 ADC Units' [I+1] P.aero.goodNegAdcPulseInt 7 0.5 7.5 600 0 30000 P.aero.goodNegAdcPulseInt>0.0
-TH2F paero_good_pamp_vs_pmt_neg 'SHMS Aero- Good Pulse Amplitude vs. PMT Number; PMT Number; Pulse Amplitude / 20 ADC Units' [I+1] P.aero.goodNegAdcPulseAmp 7 0.5 7.5 200 0 4000 P.aero.goodNegAdcPulseAmp>0.0
-TH2F paero_good_ptime_vs_pmt_neg 'SHMS Aero- Good Pulse Time vs. PMT Number; PMT Number; Pulse Time / 10 ADC Units' [I+1] P.aero.goodNegAdcPulseTime 7 0.5 7.5 350 0 3500 P.aero.goodNegAdcPulseTime>0.0
-
-#*******************
-# SHMS CALORIMETER *
-#*******************
-
-#--------------------------------------------
-# SHMS PreSH GOOD Occupancy and Multiplicity
-#--------------------------------------------
-
-TH1F pcal_prshwr_good_occ_pos 'SHMS PreShower+ Good Occupancy; PMT Number; Number of Good +ADC Hits' P.cal.pr.numGoodPosAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_occ_neg 'SHMS PreShower- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.cal.pr.numGoodNegAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult_pos 'SHMS PreShower+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.cal.pr.totNumGoodPosAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult_neg 'SHMS PreShower- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.cal.pr.totNumGoodNegAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult 'SHMS PreShower Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.cal.pr.totnumGoodAdcHits 28 0.5 28.5
-
-#--------------------------------------------------------------------------------------------------
-# GOOD PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES
-# GOOD --> (passed errorFlag cut, pulsetime cuts oN Min/Max ADC Time Window, and ADC threshold cut)
-#--------------------------------------------------------------------------------------------------
-
-TH2F pcal_prshwr_good_pped_vs_pmt_pos 'SHMS PreShower+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.cal.pr.goodPosAdcPed 14 0.5 14.5 400 300 700 P.cal.pr.goodPosAdcPed>0.0
-TH2F pcal_prshwr_good_pi_vs_pmt_pos 'SHMS PreShower+ Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.cal.pr.goodPosAdcPulseInt 14 0.5 14.5 600 0 30000 P.cal.pr.goodPosAdcPulseInt>0.0
-TH2F pcal_prshwr_good_pamp_vs_pmt_pos 'SHMS PreShower+ Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.cal.pr.goodPosAdcPulseAmp 14 0.5 14.5 200 0 4000 P.cal.pr.goodPosAdcPulseAmp>0.0
-TH2F pcal_prshwr_good_ptime_vs_pmt_pos 'SHMS PreShower+ Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.cal.pr.goodPosAdcPulseTime 14 0.5 14.5 350 0 3500 P.cal.pr.goodPosAdcPulseTime>0.0
-
-TH2F pcal_prshwr_good_pped_vs_pmt_neg 'SHMS PreShower- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.cal.pr.goodNegAdcPed 14 0.5 14.5 400 300 700 P.cal.pr.goodNegAdcPed>0.0
-TH2F pcal_prshwr_good_pi_vs_pmt_neg 'SHMS PreShower- Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseInt 14 0.5 14.5 600 0 30000 P.cal.pr.goodNegAdcPulseInt>0.0
-TH2F pcal_prshwr_good_pamp_vs_pmt_neg 'SHMS PreShower- Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseAmp 14 0.5 14.5 200 0 4000 P.cal.pr.goodNegAdcPulseAmp>0.0
-TH2F pcal_prshwr_good_ptime_vs_pmt_neg 'SHMS PreShower- Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.cal.pr.goodNegAdcPulseTime 14 0.5 14.5 350 0 3500 P.cal.pr.goodNegAdcPulseTime>0.0
-
-#------------------------------------------------------
-# SHMS PRE-SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS
-# (calib consts (GAIN) are in GeV/ADC units )
-#------------------------------------------------------
-
-TH2F pcal_prshwr_Epos_vs_pmt 'SHMS PreShower+ Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.epos 14 0.5 14.5 200 0 2 P.cal.pr.epos>0.0
-TH2F pcal_prshwr_Eneg_vs_pmt 'SHMS PreShower- Energy Deposition vs. PMT Number; PMT Number; Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.eneg 14 0.5 14.5 200 0 2 P.cal.pr.eneg>0.0
-TH2F pcal_prshwr_Emean_vs_pmt 'SHMS PreShower Mean Energy Deposition vs. PMT Number; PMT Number; Mean Energy Deposition (0.01 GeV / ADC Units)' [I+1] P.cal.pr.emean 14 0.5 14.5 300 0 3 P.cal.pr.emean>0.0
-
-#-------------------------------------------
-# SHMS ENERGY DEPOSITION in PreShower PLANE
-#-------------------------------------------
-
-TH1F pcal_prshwr_Eplane_pos 'SHMS PreShower+ Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_pos 200 0 2 P.cal.pr.eplane_pos>0.0
-TH1F pcal_prshwr_Eplane_neg 'SHMS PreShower- Energy Deposition; Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane_neg 200 0 2 P.cal.pr.eplane_neg>0.0
-TH1F pcal_prshwr_Eplane 'SHMS PreShower Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.pr.eplane 300 0 3 P.cal.pr.eplane>0.0
-
-#---------------------------------------------
-# SHMS Shower GOOD Occupancy and Multiplicity
-#---------------------------------------------
-TH1F pcal_shwr_good_occ 'SHMS Shower Good Occupancy; PMT Number; Number of Good ADC Hits' P.cal.fly.numGoodAdcHits 224 0.5 224.5
-TH1F pcal_shwr_good_mult 'SHMS Shower Good Multiplicity; PMT Number; Total Number of Good ADC Hits' P.cal.fly.totNumGoodAdcHits 224 0.5 224.5
-
-#-------------------------------------------------------------
-# SHMS Shower GOOD PULSE PEDESTALS/INTEGRALS/AMPLITUDES/TIMES
-#-------------------------------------------------------------
-
-TH2F pcal_shwr_good_pped_vs_pmt 'SHMS Shower Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 1 ADC Unit' [I+1] P.cal.fly.goodAdcPed 224 0.5 224.5 700 300 1000 P.cal.fly.goodAdcPed>0.0
-TH2F pcal_shwr_good_pi_vs_pmt 'SHMS Shower Good Pulse Integral vs. PMT Number; PMT Number; Good Pulse Integral / 50 ADC Units' [I+1] P.cal.fly.goodAdcPulseInt 224 0.5 224.5 600 0 30000 P.cal.fly.goodAdcPulseInt>0.0
-TH2F pcal_shwr_good_pamp_vs_pmt 'SHMS Shower Good Pulse Amplitude vs. PMT Number; PMT Number; Good Pulse Amplitude / 20 ADC Units' [I+1] P.cal.fly.goodAdcPulseAmp 224 0.5 224.5 200 0 4000 P.cal.fly.goodAdcPulseAmp>0.0
-TH2F pcal_shwr_good_ptime_vs_pmt 'SHMS Shower Good Pulse Time vs. PMT Number; PMT Number; Good Pulse Time / 10 ADC Units' [I+1] P.cal.fly.goodAdcPulseTime 224 0.5 224.5 350 0 3500 P.cal.fly.goodAdcPulseTime>0.0
-
-#--------------------------------------------------
-# SHMS SHOWER ENERGY DEPOSITION vs. PMT HISTOGRAMS
-# (calib consts (GAIN) are in GeV/ADC units )
-#--------------------------------------------------
-
-TH2F pcal_shwr_E_vs_pmt 'SHMS Shower Energy Deposition vs. PMT Number; PMT Number; Energy Deposited (0.01 GeV / ADC Units)' [I+1] P.cal.fly.e 224 0.5 224.5 300 0 3 P.cal.fly.e>0.0
-
-#--------------------------------------------------
-# TOTAL ENERGY DEPOSITION IN THE SHMS SHOWER ARRAY
-#--------------------------------------------------
-
-TH1F pcal_shwr_Earray 'SHMS Shower Total Energy Deposition in Array; Total Energy Deposited (GeV); Number of Entries / 0.01 GeV' P.cal.fly.earray 600 0 6 P.cal.fly.earray>0.0
-
-#-------------------------------------------------------------------------------------
-# SHMS PRE-SHOWER AND SHOWER (CALORIMETER) TOTAL ENERGY DEPOSITION
-# TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
-#-------------------------------------------------------------------------------------
-
-TH1F pcal_etot 'SHMS Calorimeter Total Energy Deposition; Total Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.etot 500 0 5 P.cal.etot>0.0
-TH1F pcal_etot_norm 'SHMS Calorimeter Total Normalized Energy Deposition; Total Energy Deposited (GeV) / P0 (GeV); Number of Entries / 0.01' P.cal.etotnorm 500 0 5 P.cal.etotnorm>0.0
-TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposited (GeV); Number of Entries / 0.1 GeV' P.cal.etrack 100 0 10 P.cal.etrack>0.0
-TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0
-TH1F pcal_etracknorm_track 'SHMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' P.cal.etracknorm 100 0 10 P.cal.etracknorm>0.0&&P.dc.ntrack>0
-TH1F pcal_enenorm_track_elec 'SHMS Cal energy/p (npeSum > .5&&abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH1F pcal_enenorm_track_pion 'SHMS Cal energy/p (npeSum <.5&&abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH2F pcal_ene_2dtrack 'SHMS Cal energy v energy track' P.cal.etrack P.cal.etot 1000 0. 5. 1000 0. 5. P.dc.ntrack>0
-TH2F pcal_delta_etrack 'SHMS Delta v Cal energy/p ' P.cal.etracknorm P.gtr.dp 60 0. 1.5 80 -15. 25. P.dc.ntrack>0
-TH2F pcal_ngnpe_etrack 'SHMS NG Cer Npe v Cal energy/p' P.cal.etracknorm P.ngcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
-TH2F pcal_hgnpe_etrack 'SHMS HG Cer Npe v Cal energy/p' P.cal.etracknorm P.hgcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
-
-#-------------------------------
-# SHMS PID AND ACCEPTANCE PLOTS
-#-------------------------------
-
-TH2F hgc_vs_prshw 'SHMS HGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC Total N.P.E. / 0.5' P.cal.pr.eplane P.hgcer.npeSum 300 0 3 40 0 20 P.cal.pr.eplane>0.0&&P.hgcer.npeSum>0.0
-TH2F ngc_vs_prshw 'SHMS NGC Total N.P.E. vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC Total N.P.E. / 0.5' P.cal.pr.eplane P.ngcer.npeSum 300 0 3 40 0 20 P.cal.pr.eplane>0.0&&P.ngcer.npeSum>0.0
-TH2F pcal_shw_vs_prshw 'Shower vs. PreShower Energy Deposition; PreShower Energy / 0.1 GeV; Shower Energy / 0.1 GeV' P.cal.pr.eplane P.cal.fly.earray 50 0 5 350 0 35 P.cal.pr.eplane>0.0&&P.cal.fly.earray>0.0
-TH2F delta_vs_etracknorm 'SHMS Delta. vs. Normalized Track Energy; Calorimeter Normalized Track Energy; Momentum Acceptance (%)' P.cal.etracknorm P.gtr.dp 50 0 5 80 -15, 25 P.cal.etracknorm>0.0&&P.dc.ntrack>0
-
-#---------------------------
-# CLUSTERING PLOTS
-#---------------------------
-
-TH1F pcal_xclusttrack 'SHMS Cal X pos' P.cal.xclusttrack 200 -100. 100. P.cal.nclusttrack>-1
-TH1F pcal_xdiff 'SHMS Cal X pos - X track' P.cal.xclusttrack-P.cal.xtrack 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH2F pcal_xdiff_v_xtr 'SHMS Cal X pos - X track v Xtr' P.cal.xtrack P.cal.xclusttrack-P.cal.xtrack 200 -100. 100. 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack 'SHMS Cal X pos of track' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack1 'SHMS Cal X pos of track no matching clust' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-TH1F pcal_xtrack2 'SHMS Cal X pos of track no matching clust number of cluster=1' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-
-#********************
-# Trigger Apparatus *
-#********************
-
-TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pNGCER_adcPed 2000 0 2000
-TH1F ptrig_pngc_sum_pint 'SHMS Noble Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pNGCER_adcPulseInt 4000 0 40000
-TH1F ptrig_pngc_sum_pamp 'SHMS Noble Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pNGCER_adcPulseAmp 4100 0 4100
-TH1F ptrig_pngc_sum_ptime 'SHMS Noble Gas Sum FADC Pulse Time; Pulse Time; Number of Entries / 10 ADC Units' T.shms.pNGCER_adcPulseTimeRaw 1000 0 10000
-TH1F ptrig_pngc_sum_tdc 'SHMS Noble Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units' T.shms.pNGCER_tdcTime 700 -3500 3500
-
-TH1F ptrig_phgc_sum_pped 'SHMS Heavy Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pHGCER_adcPed 2000 0 2000
-TH1F ptrig_phgc_sum_pint 'SHMS Heavy Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pHGCER_adcPulseInt 4000 0 40000
-TH1F ptrig_phgc_sum_pamp 'SHMS Heavy Gas Sum FADC Pulse Amplitude; Pulse Amplitude; Number of Entries / 1 ADC Units' T.shms.pHGCER_adcPulseAmp 4100 0 4100
-TH1F ptrig_phgc_sum_ptime 'SHMS Heavy Gas Sum FADC Pulse Time; Pulse Time; Number of Entries / 10 ADC Units' T.shms.pHGCER_adcPulseTimeRaw 1000 0 10000
-TH1F ptrig_phgc_sum_tdc 'SHMS Heavy Gas Sum TDC Time; TDC Time; Number of Entries / 10 TDC Units' T.shms.pHGCER_tdcTime 700 -3500 3500
-
-TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1X_tdcMultiplicity 11 0 11
-TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1Y_tdcMultiplicity 11 0 11
-TH1F ptrig_p2x_tdc_mult 'SHMS p2x TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2X_tdcMultiplicity 11 0 11
-TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2Y_tdcMultiplicity 11 0 11
-
-TH1F ptrig_p1T_tdc_mult 'SHMS p1x/p1y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1T_tdcMultiplicity 11 0 11
-TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2T_tdcMultiplicity 11 0 11
-
-TH1F ptrig_pT1_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 20, Channel 15); Raw TDC Multiplicity; Counts / 10' T.shms.pT1_tdcMultiplicity 11 0 11
-TH1F ptrig_pT2_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.shms.pT2_tdcMultiplicity 11 0 11
-TH1F ptrig_pT3_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 38); Raw TDC Multiplicity; Counts / 10' T.shms.pT3_tdcMultiplicity 11 0 11
-
-TH1F ptrig_p1x_tdc 'SHMS p1x TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1X_tdcTime 350 0 3500
-TH1F ptrig_p1y_tdc 'SHMS p1y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1Y_tdcTime 350 0 3500
-TH1F ptrig_p2x_tdc 'SHMS p2x TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2X_tdcTime 350 0 3500
-TH1F ptrig_p2y_tdc 'SHMS p2y TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2Y_tdcTime 350 0 3500
-
-TH1F ptrig_p1T_tdc 'SHMS p1x/p1y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1T_tdcTime 350 0 3500
-TH1F ptrig_p2T_tdc 'SHMS p2x/p2y Coincidence TDC Time; Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2T_tdcTime 350 0 3500
-
-TH1F ptrig_pT1_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 20, Channel 15); Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT1_tdcTime 350 0 3500
-TH1F ptrig_pT2_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 31); Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT2_tdcTime 350 0 3500
-TH1F ptrig_pT3_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 38); Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT3_tdcTime 350 0 3500
-
-TH1F ptrig_p1x_good_tdc 'SHMS p1x Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1X_tdcTime 350 0 3500 T.shms.p1X_tdcMultiplicity==1
-TH1F ptrig_p1y_good_tdc 'SHMS p1y Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1Y_tdcTime 350 0 3500 T.shms.p1Y_tdcMultiplicity==1
-TH1F ptrig_p2x_good_tdc 'SHMS p2x Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2X_tdcTime 350 0 3500 T.shms.p2X_tdcMultiplicity==1
-TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2Y_tdcTime 350 0 3500 T.shms.p2Y_tdcMultiplicity==1
-
-TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p1T_tdcTime 350 0 3500 T.shms.p1T_tdcMultiplicity==1
-TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.p2T_tdcTime 350 0 3500 T.shms.p2T_tdcMultiplicity==1
-
-TH1F ptrig_pT1_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT1_tdcTime 350 0 3500 T.shms.pT1_tdcMultiplicity==1
-TH1F ptrig_pT2_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT2_tdcTime 350 0 3500 T.shms.pT2_tdcMultiplicity==1
-TH1F ptrig_pT3_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 38); Good Raw TDC Time (TDC Units); Counts / 10 TDC Units' T.shms.pT3_tdcTime 350 0 3500 T.shms.pT3_tdcMultiplicity==1
-
-TH2F ptrig_ch1xy_ch2x 'SHMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.shms.p1T_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1T_tdcMultiplicity==1
-TH2F ptrig_ch1x_ch2x 'SHMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.shms.p1X_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
-TH2F ptrig_ch1y_ch2x 'SHMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.shms.p1Y_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1Y_tdcMultiplicity==1
-TH2F ptrig_ch1ych1x 'SHMS Hodo Trig; Trig 1X (ns); Trig 1Y (ns)' T.shms.p1X_tdcTime T.shms.p1Y_tdcTime 200 100 300 200 100 300 T.shms.p1Y_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
-
-TH1F ptrig_pdc_ref1 'SHMS DC Reference Time Slot 6 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF1_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref2 'SHMS DC Reference Time Slot 7 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF2_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref3 'SHMS DC Reference Time Slot 8 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF3_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref4 'SHMS DC Reference Time Slot 9 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF4_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref5 'SHMS DC Reference Time Slot 10 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF5_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref6 'SHMS DC Reference Time Slot 11 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF6_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref7 'SHMS DC Reference Time Slot 12 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF7_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref8 'SHMS DC Reference Time Slot 13 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF8_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref9 'SHMS DC Reference Time Slot 14 Channel 15; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF9_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref10 'SHMS DC Reference Time Slot 15 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF10_tdcTime 200 12000 14000
-
-#-------------
-# Fast Raster
-#-------------
-
-# 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.shms.pFRXA_adcPulseIntRaw*(1./4096.)/25.
-formula FRXB_V T.shms.pFRXB_adcPulseIntRaw*(1./4096.)/25.
-formula FRYA_V T.shms.pFRYA_adcPulseIntRaw*(1./4096.)/25.
-formula FRYB_V T.shms.pFRYB_adcPulseIntRaw*(1./4096.)/25.
-
-TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' T.shms.pFRXA_adcPulseIntRaw 1000 0 100000
-TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' T.shms.pFRXB_adcPulseIntRaw 1000 0 100000
-TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' T.shms.pFRYA_adcPulseIntRaw 1000 0 100000
-TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' T.shms.pFRYB_adcPulseIntRaw 1000 0 100000
-TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
-TH2F pFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
-TH2F pFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
\ No newline at end of file
diff --git a/DEF-files/SHMS/STACK/pstackana_cuts.def b/DEF-files/SHMS/STACK/pstackana_cuts.def
deleted file mode 100644
index 78df32c3..00000000
--- a/DEF-files/SHMS/STACK/pstackana_cuts.def
+++ /dev/null
@@ -1,275 +0,0 @@
-# Report file for SHMS stack
-
-Block: RawDecode
-
-Pedestal_event g.evtyp == 99
-
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
-
-RawDecode_master 1
-
-Block: Decode
-
-shms_trigs SHMS_event
-
-good_S1_time T.shms.p1T_tdcTime > 241 && T.shms.p1T_tdcTime < 243
-good_S2X_time T.shms.p2X_tdcTime > 180 && T.shms.p2X_tdcTime < 220
-good_S1_S2X_time good_S1_time && good_S2X_time
-
-Decode_master SHMS_event
-
-Block: CoarseTracking
-CoarseTracking_master SHMS_event
-
-# Add cuts to stricter times and apply them to drift distances
-time_cut1 P.dc.1u1.time > 0 && P.dc.1u1.time < 250
-time_cut2 P.dc.1u2.time > 0 && P.dc.1u2.time < 250
-time_cut3 P.dc.1x1.time > 0 && P.dc.1x1.time < 250
-time_cut4 P.dc.1x2.time > 0 && P.dc.1x2.time < 250
-time_cut5 P.dc.1v1.time > 0 && P.dc.1v1.time < 250
-time_cut6 P.dc.1v2.time > 0 && P.dc.1v2.time < 250
-time_cut7 P.dc.2v2.time > 0 && P.dc.2v2.time < 250
-time_cut8 P.dc.2v1.time > 0 && P.dc.2v1.time < 250
-time_cut9 P.dc.2x2.time > 0 && P.dc.2x2.time < 250
-time_cut10 P.dc.2x1.time > 0 && P.dc.2x1.time < 250
-time_cut11 P.dc.2u2.time > 0 && P.dc.2u2.time < 250
-time_cut12 P.dc.2u1.time > 0 && P.dc.2u1.time < 250
-
-shmsDC1Planes_large (P.dc.1x1.nhit + P.dc.1u2.nhit + P.dc.1u1.nhit + P.dc.1v1.nhit + P.dc.1x2.nhit + P.dc.1v2.nhit) > 20
-shmsDC2Planes_large (P.dc.2x1.nhit + P.dc.2u2.nhit + P.dc.2u1.nhit + P.dc.2v1.nhit + P.dc.2x2.nhit + P.dc.2v2.nhit) > 20
-
-shms_ch1_gt0 P.dc.Ch1.nhit > 0
-shms_ch2_gt0 P.dc.Ch2.nhit > 0
-shms_ch_gt0 P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit > 0
-shms_ch_gt4 P.dc.Ch2.nhit > 3 && P.dc.Ch1.nhit > 3
-shms_ch2_gt0_noch1 P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit == 0
-shms_ch1_gt0_noch2 P.dc.Ch1.nhit > 0 && P.dc.Ch2.nhit == 0
-shms_noch1_noch2 P.dc.Ch1.nhit == 0 && P.dc.Ch2.nhit == 0
-shms_ch_gt0_track shms_ch_gt0 && P.dc.ntrack > 0
-shms_ch_gt4_track shms_ch_gt4 && P.dc.ntrack > 0
-
-shms_ch1_gt0_gtime P.dc.Ch1.nhit > 0 && good_S1_S2X_time
-shms_ch2_gt0_gtime P.dc.Ch2.nhit > 0 && good_S1_S2X_time
-shms_ch_gt0_gtime P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit > 0 && good_S1_S2X_time
-shms_ch_gt4_gtime P.dc.Ch2.nhit > 3 && P.dc.Ch1.nhit > 3 && good_S1_S2X_time
-shms_ch2_gt0_noch1_gtime P.dc.Ch2.nhit > 0 && P.dc.Ch1.nhit == 0 && good_S1_S2X_time
-shms_ch1_gt0_noch2_gtime P.dc.Ch1.nhit > 0 && P.dc.Ch2.nhit == 0 && good_S1_S2X_time
-shms_noch1_noch2_gtime P.dc.Ch1.nhit == 0 && P.dc.Ch2.nhit == 0 && good_S1_S2X_time
-shms_ch_gt0_track_gtime shms_ch_gt0 && P.dc.ntrack > 0 && good_S1_S2X_time
-shms_ch_gt4_track_gtime shms_ch_gt4 && P.dc.ntrack > 0 && good_S1_S2X_time
-
-shmsDC1_1hit_x1 P.dc.1x1.nhit == 1
-shmsDC1_1hit_u1 P.dc.1u1.nhit == 1
-shmsDC1_1hit_u2 P.dc.1u2.nhit == 1
-shmsDC1_1hit_v1 P.dc.1v1.nhit == 1
-shmsDC1_1hit_v2 P.dc.1v2.nhit == 1
-shmsDC1_1hit_x2 P.dc.1x2.nhit == 1
-
-shmsDC2_1hit_x1 P.dc.2x1.nhit == 1
-shmsDC2_1hit_u1 P.dc.2u1.nhit == 1
-shmsDC2_1hit_u2 P.dc.2u2.nhit == 1
-shmsDC2_1hit_v1 P.dc.2v1.nhit == 1
-shmsDC2_1hit_v2 P.dc.2v2.nhit == 1
-shmsDC2_1hit_x2 P.dc.2x2.nhit == 1
-
-p1hit1 P.dc.1x1.nhit >= 1
-p1hit2 P.dc.1u1.nhit >= 1
-p1hit3 P.dc.1u2.nhit >= 1
-p1hit4 P.dc.1v1.nhit >= 1
-p1hit5 P.dc.1v2.nhit >= 1
-p1hit6 P.dc.1x2.nhit >= 1
-
-p2hit1 P.dc.2x1.nhit >= 1
-p2hit2 P.dc.2u1.nhit >= 1
-p2hit3 P.dc.2u2.nhit >= 1
-p2hit4 P.dc.2v1.nhit >= 1
-p2hit5 P.dc.2v2.nhit >= 1
-p2hit6 P.dc.2x2.nhit >= 1
-
-shmsDC1Planes6hits shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC2Planes6hits shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-
-shmsDC1_5hits_x1 shmsDC1_1hit_u1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_6hits_x1 p1hit1 && shmsDC1_1hit_u1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_5hits_u1 shmsDC1_1hit_x1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_6hits_u1 p1hit2 && shmsDC1_1hit_x1 && shmsDC1_1hit_u2 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_5hits_u2 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_6hits_u2 p1hit3 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_v1 && shmsDC1_1hit_v2
-shmsDC1_5hits_v1 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-shmsDC1_6hits_v1 p1hit4 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-shmsDC1_5hits_v2 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v1
-shmsDC1_6hits_v2 p1hit5 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_x2 && shmsDC1_1hit_u2 && shmsDC1_1hit_v1
-shmsDC1_5hits_x2 shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_v1 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-shmsDC1_6hits_x2 p1hit6 && shmsDC1_1hit_x1 && shmsDC1_1hit_u1 && shmsDC1_1hit_v1 && shmsDC1_1hit_u2 && shmsDC1_1hit_v2
-
-shmsDC2_5hits_x1 shmsDC2_1hit_u1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_6hits_x1 p2hit1 && shmsDC2_1hit_u1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_5hits_u1 shmsDC2_1hit_x1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_6hits_u1 p2hit2 && shmsDC2_1hit_x1 && shmsDC2_1hit_u2 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_5hits_u2 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_6hits_u2 p2hit3 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_v1 && shmsDC2_1hit_v2
-shmsDC2_5hits_v1 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-shmsDC2_6hits_v1 p2hit4 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-shmsDC2_5hits_v2 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v1
-shmsDC2_6hits_v2 p2hit5 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_x2 && shmsDC2_1hit_u2 && shmsDC2_1hit_v1
-shmsDC2_5hits_x2 shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_v1 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-shmsDC2_6hits_x2 p2hit6 && shmsDC2_1hit_x1 && shmsDC2_1hit_u1 && shmsDC2_1hit_v1 && shmsDC2_1hit_u2 && shmsDC2_1hit_v2
-
-shms1HitsLt P.dc.Ch1.nhit <= P.dc.Ch1.maxhits && g.evtyp == 1
-shms2HitsLt P.dc.Ch2.nhit <= P.dc.Ch2.maxhits && g.evtyp == 1
-shmsHitsLt P.dc.Ch1.nhit <= P.dc.Ch1.maxhits && P.dc.Ch2.nhit <= P.dc.Ch2.maxhits && g.evtyp == 1
-
-shmsDC1PlanesGT (p1hit1 + p1hit2 + p1hit3 + p1hit4 + p1hit5 + p1hit6 ) >= 5
-shmsDC2PlanesGT (p2hit1 + p2hit2 + p2hit3 + p2hit4 + p2hit5 + p2hit6 ) >= 5
-shmsPlanesGT shmsDC1PlanesGT && shmsDC2PlanesGT
-shmsHitsPlanes (P.dc.Ch1.nhit <= 6) && (P.dc.Ch2.nhit <= 6) && shmsPlanesGT
-
-pSpacePoints P.dc.Ch1.spacepoints >= 1 && P.dc.Ch2.spacepoints >= 1
-pSpacePointsStub P.dc.stubtest == 1 && P.dc.Ch1.spacepoints >= 1 && P.dc.Ch2.spacepoints >= 1
-pFoundTrack P.dc.ntrack > 0
-pStubLT P.dc.stubtest == 1
-f1PSpacePoints shms1HitsLt && shmsDC1PlanesGT && P.dc.Ch1.spacepoints == 0 && g.evtyp == 1
-f2PSpacePoints shms2HitsLt && shmsDC2PlanesGT && P.dc.Ch2.spacepoints == 0 && g.evtyp == 1
-
-pTest1 shmsHitsPlanes && (!pSpacePoints)
-pTest2 pSpacePoints && (!pStubLT)
-
-Block: CoarseReconstruct
-CoarseReconstruct_master SHMS_event
-
-Block: Tracking
-Tracking_master SHMS_event
-
-Block: Reconstruct
-Reconstruct_master SHMS_event
-
-cer_ng_elec P.ngcer.npeSum > 0.5
-cer_ng_pi P.ngcer.npeSum <= 0.5
-cer_hg_elec P.hgcer.npeSum > 0.5
-cer_hg_pi P.hgcer.npeSum <= 0.5
-cer_pi_both cer_ng_pi && cer_hg_pi
-cer_elec_both cer_ng_elec && cer_hg_elec
-cal_elec P.cal.etracknorm > 0.6 && P.cal.etracknorm < 1.6
-cal_pi P.cal.etracknorm <= 0.6 && P.cal.etracknorm > 0.
-elec_all cer_ng_elec && cer_hg_elec && cal_elec
-pi_all cer_ng_pi && cer_hg_pi && cal_pi
-
-shmsScinGood P.hod.goodscinhit == 1
-shmsScinShould shmsScinGood
-shmsScinShoulde shmsScinGood && P.cal.etotnorm > 0.6 && P.cal.etotnorm < 1.6 && P.hgcer.npeSum > 0.5
-shmsScinShouldh shmsScinGood && P.cal.etotnorm <= 0.6 && P.cal.etotnorm > 0. && P.hgcer.npeSum < 0.5
-shmsScinDid shmsScinShould && P.dc.ntrack > 0
-shmsScinDide shmsScinShoulde && P.dc.ntrack > 0
-shmsScinDidh shmsScinShouldh && P.dc.ntrack > 0
-
-goodHDC1x1 P.dc.1x1.nhit > 0 && P.dc.1x1.nhit < 3
-goodHDC1u2 P.dc.1u2.nhit > 0 && P.dc.1u2.nhit < 3
-goodHDC1u1 P.dc.1u1.nhit > 0 && P.dc.1u1.nhit < 3
-goodHDC1v1 P.dc.1v1.nhit > 0 && P.dc.1v1.nhit < 3
-goodHDC1v2 P.dc.1v2.nhit > 0 && P.dc.1v2.nhit < 3
-goodHDC1x2 P.dc.1x2.nhit > 0 && P.dc.1x2.nhit < 3
-
-goodHDC2x1 P.dc.2x1.nhit > 0 && P.dc.2x1.nhit < 3
-goodHDC2u2 P.dc.2u2.nhit > 0 && P.dc.2u2.nhit < 3
-goodHDC2u1 P.dc.2u1.nhit > 0 && P.dc.2u1.nhit < 3
-goodHDC2v1 P.dc.2v1.nhit > 0 && P.dc.2v1.nhit < 3
-goodHDC2v2 P.dc.2v2.nhit > 0 && P.dc.2v2.nhit < 3
-goodHDC2x2 P.dc.2x2.nhit > 0 && P.dc.2x2.nhit < 3
-
-goodHDC1 goodHDC1x1 && goodHDC1u2 && goodHDC1u1 && goodHDC1v1 && goodHDC1v2 && goodHDC1x2
-goodHDC2 goodHDC2x1 && goodHDC2u2 && goodHDC2u1 && goodHDC2v1 && goodHDC2v2 && goodHDC2x2
-bothGood goodHDC1 && goodHDC2
-
-realhdc1x1 goodHDC1x1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1u2 goodHDC1u2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1u1 goodHDC1u1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1v1 goodHDC1v1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1v2 goodHDC1v2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc1x2 goodHDC1x2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-
-realhdc2x1 goodHDC2x1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2u2 goodHDC2u2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2u1 goodHDC2u1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2v1 goodHDC2v1 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2v2 goodHDC2v2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-realhdc2x2 goodHDC2x2 && ((P.dc.Ch1.spacepoints + P.dc.Ch2.spacepoints) > 0)
-
-pFound1Track P.dc.ntrack == 1
-pFound2Track P.dc.ntrack == 2
-pFound3Track P.dc.ntrack == 3
-pFound4Track P.dc.ntrack == 4
-
-pCleanTrack P.gtr.index > -1
-1pCleanTrack P.gtr.index == 0
-2pCleanTrack P.gtr.index == 1
-3pCleanTrack P.gtr.index == 2
-4pCleanTrack P.gtr.index == 3
-
-pCleanTrack_cer_elec (P.gtr.index > -1) && cer_elec_both
-p1hit1_cer_elec p1hit1 && cer_elec_both
-pCleanTrack_cal_elec (P.gtr.index > -1) && cal_elec
-p1hit1_cal_elec p1hit1 && cal_elec
-
-anyhs1x P.hod.1x.nhits > 0
-anyhs1y P.hod.1y.nhits > 0
-anyhs2x P.hod.2x.nhits > 0
-anyhs2y P.hod.2y.nhits > 0
-
-goodps1x P.hod.1x.nhits > 0 && P.hod.1x.nhits < 3
-goodps1y P.hod.1y.nhits > 0 && P.hod.1y.nhits < 3
-goodps1 goodps1x && goodps1y
-goodps2x P.hod.2x.nhits > 0 && P.hod.2x.nhits < 3
-goodps2y P.hod.2y.nhits > 0 && P.hod.2y.nhits < 3
-goodps2 goodps2x && goodps2y
-goodps1s2 goodps1 && goodps2
-
-SHMS_hgcer_track_matched_region_1 P.hgcer.numTracksMatched[0]>0
-SHMS_hgcer_track_fired_region_1 P.hgcer.numTracksFired[0]>0
-SHMS_hgcer_track_matched_region_2 P.hgcer.numTracksMatched[1]>0
-SHMS_hgcer_track_fired_region_2 P.hgcer.numTracksFired[1]>0
-SHMS_hgcer_track_matched_region_3 P.hgcer.numTracksMatched[2]>0
-SHMS_hgcer_track_fired_region_3 P.hgcer.numTracksFired[2]>0
-SHMS_hgcer_track_matched_region_4 P.hgcer.numTracksMatched[3]>0
-SHMS_hgcer_track_fired_region_4 P.hgcer.numTracksFired[3]>0
-SHMS_hgcer_track_matched_tot P.hgcer.totNumTracksMatched>0
-SHMS_hgcer_track_fired_tot P.hgcer.totNumTracksFired>0
-
-SHMS_ngcer_track_matched_region_1 P.ngcer.numTracksMatched[0]>0
-SHMS_ngcer_track_fired_region_1 P.ngcer.numTracksFired[0]>0
-SHMS_ngcer_track_matched_region_2 P.ngcer.numTracksMatched[1]>0
-SHMS_ngcer_track_fired_region_2 P.ngcer.numTracksFired[1]>0
-SHMS_ngcer_track_matched_region_3 P.ngcer.numTracksMatched[2]>0
-SHMS_ngcer_track_fired_region_3 P.ngcer.numTracksFired[2]>0
-SHMS_ngcer_track_matched_region_4 P.ngcer.numTracksMatched[3]>0
-SHMS_ngcer_track_fired_region_4 P.ngcer.numTracksFired[3]>0
-SHMS_ngcer_track_matched_tot P.ngcer.totNumTracksMatched>0
-SHMS_ngcer_track_fired_tot P.ngcer.totNumTracksFired>0
-
-SHMS_aero_track_matched_region_1 P.aero.numTracksMatched[0]>0
-SHMS_aero_track_fired_region_1 P.aero.numTracksFired[0]>0
-SHMS_aero_track_matched_region_2 P.aero.numTracksMatched[1]>0
-SHMS_aero_track_fired_region_2 P.aero.numTracksFired[1]>0
-SHMS_aero_track_matched_region_3 P.aero.numTracksMatched[2]>0
-SHMS_aero_track_fired_region_3 P.aero.numTracksFired[2]>0
-SHMS_aero_track_matched_region_4 P.aero.numTracksMatched[3]>0
-SHMS_aero_track_fired_region_4 P.aero.numTracksFired[3]>0
-SHMS_aero_track_matched_region_5 P.aero.numTracksMatched[4]>0
-SHMS_aero_track_fired_region_5 P.aero.numTracksFired[4]>0
-SHMS_aero_track_matched_region_6 P.aero.numTracksMatched[5]>0
-SHMS_aero_track_fired_region_6 P.aero.numTracksFired[5]>0
-SHMS_aero_track_matched_region_7 P.aero.numTracksMatched[6]>0
-SHMS_aero_track_fired_region_7 P.aero.numTracksFired[6]>0
-SHMS_aero_track_matched_tot P.aero.totNumTracksMatched>0
-SHMS_aero_track_fired_tot P.aero.totNumTracksFired>0
-
-
-
-Block: Physics
-Physics_master SHMS_event
-
diff --git a/PARAM/HMS/AERO/CALIB/haero_calib.param b/PARAM/HMS/AERO/haero_calib.param
similarity index 100%
rename from PARAM/HMS/AERO/CALIB/haero_calib.param
rename to PARAM/HMS/AERO/haero_calib.param
diff --git a/PARAM/HMS/AERO/CUTS/haero_cuts.param b/PARAM/HMS/AERO/haero_cuts.param
similarity index 100%
rename from PARAM/HMS/AERO/CUTS/haero_cuts.param
rename to PARAM/HMS/AERO/haero_cuts.param
diff --git a/PARAM/HMS/AERO/GEOM/haero_geom.param b/PARAM/HMS/AERO/haero_geom.param
similarity index 100%
rename from PARAM/HMS/AERO/GEOM/haero_geom.param
rename to PARAM/HMS/AERO/haero_geom.param
diff --git a/PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param b/PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param
new file mode 100644
index 00000000..262e50e0
--- /dev/null
+++ b/PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param
@@ -0,0 +1,13 @@
+num_scal_reads = 238
+
+scal_read_bcm1_current = 65.3904, 65.8471, 65.5617, 66.385, 66.4372, 66.4948, 66.5276, 66.2301, 66.9749, 66.5255, 65.6394, 65.301, 65.2118, 65.5959, 65.3136, 65.5845, 66.0014, 66.0064, 65.9074, 66.5556, 66.3279, 66.2721, 66.7376, 66.7436, 66.406, 66.1495, 66.3664, 66.8288, 66.1698, 65.7488, 65.8068, 65.5182, 65.4781, 65.6477, 65.3168, 65.5482, 65.6113, 65.6373, 65.7855, 65.8375, 65.9434, 66.0618, 65.9619, 65.5811, 66.5881, 66.8738, 66.7127, 66.5399, 66.8307, 66.5464, 66.5779, 66.3498, 66.1766, 66.3075, 66.348, 66.579, 65.731, 65.3561, 65.7531, 65.2712, 65.3861, 65.255, 65.5454, 65.4159, 65.9244, 65.9328, 65.4754, 65.4301, 65.3063, 65.2325, 65.4436, 65.6716, 65.6443, 65.6555, 65.7512, 65.5462, 65.6659, 65.5153, 65.9228, 65.665, 65.3787, 65.6251, 65.8003, 65.3902, 65.2553, 65.3407, 65.3627, 65.3714, 65.6989, 65.4978, 65.4183, 65.8765, 66.3749, 66.2406, 65.9588, 66.2009, 66.4822, 66.6537, 66.0356, 65.9948, 66.0481, 66.2361, 65.9392, 65.6609, 65.2282, 65.2438, 65.5212, 65.605, 65.4217, 65.3312, 65.1659, 65.2751, 65.3517, 65.4686, 65.8597, 65.7995, 65.7597, 66.3868, 66.3652, 66.298, 66.2605, 66.0745, 66.3122, 66.3745, 66.2215, 66.3926, 66.3646, 65.968, 65.8704, 65.8715, 66.0966, 65.7821, 65.7141, 65.9112, 65.8669, 65.988, 65.941, 65.9379, 65.7818, 66.0316, 66.0552, 65.7001, 65.626, 65.796, 65.7736, 65.9744, 65.9549, 65.8338, 65.65, 65.87, 65.529, 65.9812, 65.9359, 65.6887, 64.7208, 65.0609, 64.9503, 64.9911, 65.2434, 65.385, 65.3907, 65.2979, 66.0045, 66.3613, 66.2676, 66.2715, 66.1884, 66.2915, 66.0623, 65.6283, 65.1534, 65.3824, 65.4183, 65.2315, 65.0535, 65.3601, 65.359, 65.6954, 65.7067, 65.2618, 65.3313, 65.9207, 66.0107, 66.3749, 66.4201, 66.1062, 66.5425, 66.4121, 66.6773, 66.5051, 65.7641, 66.1912, 65.71, 65.7193, 65.902, 65.8496, 65.9258, 65.9523, 65.72, 65.9785, 65.7826, 65.4782, 65.7931, 66.0113, 65.7633, 65.7015, 65.6462, 65.7985, 65.7667, 65.6512, 65.5825, 66.0532, 66.0974, 66.0932, 65.858, 65.7763, 65.7491, 65.8858, 65.8141, 66.1577, 65.6943, 65.6536, 65.411, 65.7414, 66.0504, 65.6806, 65.4437, 65.4615, 65.4244, 65.6197, 65.7904, 65.7287, 65.3009, 65.599, 65.9299, 65.435, 64.938, 64.95
+
+scal_read_bcm2_current = 66.7903, 67.0367, 66.7463, 67.5848, 67.6379, 67.6961, 67.7296, 67.4258, 68.187, 67.7278, 66.8266, 66.4824, 66.3923, 66.7842, 66.5002, 66.7733, 67.1974, 67.2024, 67.1022, 67.7632, 67.531, 67.478, 67.9498, 67.9556, 67.6118, 67.3509, 67.5728, 68.044, 67.3737, 66.9449, 67.0036, 66.7104, 66.6693, 66.8423, 66.5085, 66.7425, 66.8064, 66.8335, 66.9844, 67.0382, 67.1458, 67.2668, 67.1649, 66.7781, 67.8035, 68.0967, 67.933, 67.7563, 68.0314, 67.7631, 67.7956, 67.5629, 67.3863, 67.5192, 67.56, 67.7963, 66.9331, 66.5527, 66.9555, 66.4662, 66.5837, 66.4504, 66.7467, 66.615, 67.1331, 67.1418, 66.677, 66.6321, 66.5053, 66.4319, 66.6468, 66.8784, 66.8517, 66.8635, 66.9608, 66.7501, 66.8755, 66.7223, 67.1367, 66.8742, 66.5831, 66.8345, 67.0135, 66.5956, 66.4587, 66.5455, 66.5687, 66.5781, 66.9108, 66.7068, 66.6271, 67.0925, 67.6004, 67.465, 67.1782, 67.4245, 67.7083, 67.8866, 67.2575, 67.2171, 67.2712, 67.4625, 67.1605, 66.8767, 66.4377, 66.4549, 66.737, 66.8246, 66.6377, 66.5459, 66.377, 66.4888, 66.5677, 66.6869, 67.0854, 67.0244, 66.985, 67.6245, 67.6003, 67.5324, 67.4945, 67.3061, 67.5475, 67.6118, 67.4554, 67.6303, 67.6026, 67.1989, 67.1005, 67.1018, 67.3305, 67.0128, 66.9415, 67.143, 67.098, 67.222, 67.1729, 67.1708, 67.0141, 67.2669, 67.2904, 66.9288, 66.8533, 67.0265, 67.0034, 67.2048, 67.1887, 67.0667, 66.8789, 67.1019, 66.7556, 67.2156, 67.1674, 66.9187, 65.9339, 66.281, 66.1688, 66.2107, 66.4682, 66.6125, 66.6187, 66.5245, 67.2435, 67.6085, 67.5124, 67.5164, 67.4324, 67.5371, 67.3037, 66.8632, 66.3802, 66.6137, 66.6508, 66.46, 66.281, 66.5931, 66.5928, 66.9349, 66.9474, 66.4945, 66.5667, 67.1653, 67.2578, 67.6288, 67.6752, 67.3564, 67.8001, 67.6765, 67.9387, 67.7633, 67.01, 67.4451, 66.9558, 66.9656, 67.1554, 67.099, 67.177, 67.2044, 66.9687, 67.2317, 67.0322, 66.7238, 67.0438, 67.2657, 67.0141, 66.9515, 66.8959, 67.051, 67.0204, 66.9016, 66.8321, 67.3118, 67.3564, 67.3536, 67.1131, 67.0336, 67.0038, 67.145, 67.0715, 67.4217, 66.9508, 66.9093, 66.6628, 66.9993, 67.3142, 66.9389, 66.698, 66.7169, 66.6801, 66.8788, 67.052, 66.9902, 66.555, 66.8586, 67.1956, 66.6914, 66.1847, 66.2024
+
+scal_read_bcm4a_current = 130.832, 131.612, 131.045, 132.721, 132.816, 132.931, 132.99, 132.384, 133.909, 132.995, 131.201, 130.522, 130.338, 131.109, 130.54, 131.09, 131.947, 131.955, 131.758, 133.092, 132.625, 132.517, 133.459, 133.473, 132.795, 132.271, 132.717, 133.672, 132.337, 131.493, 131.618, 131.021, 130.928, 131.265, 130.6, 131.068, 131.217, 131.274, 131.572, 131.687, 131.899, 132.144, 131.936, 131.17, 133.229, 133.816, 133.492, 133.144, 133.718, 133.159, 133.235, 132.787, 132.433, 132.696, 132.788, 133.273, 131.545, 130.79, 131.595, 130.607, 130.835, 130.587, 131.179, 130.915, 131.95, 131.958, 131.036, 130.952, 130.696, 130.558, 130.992, 131.46, 131.411, 131.432, 131.633, 131.224, 131.456, 131.14, 131.984, 131.469, 130.885, 131.379, 131.734, 130.909, 130.635, 130.81, 130.867, 130.886, 131.548, 131.148, 130.986, 131.913, 132.945, 132.677, 132.101, 132.584, 133.154, 133.522, 132.266, 132.178, 132.295, 132.676, 132.065, 131.501, 130.612, 130.64, 131.195, 131.377, 131.006, 130.828, 130.501, 130.727, 130.879, 131.119, 131.931, 131.806, 131.728, 133.021, 132.974, 132.846, 132.766, 132.372, 132.855, 132.988, 132.691, 133.023, 132.978, 132.186, 131.999, 131.998, 132.455, 131.813, 131.673, 132.08, 131.985, 132.233, 132.143, 132.129, 131.815, 132.341, 132.395, 131.67, 131.532, 131.879, 131.839, 132.25, 132.218, 131.981, 131.603, 132.053, 131.359, 132.274, 132.179, 131.682, 129.734, 130.442, 130.205, 130.287, 130.806, 131.098, 131.115, 130.928, 132.353, 133.077, 132.891, 132.918, 132.744, 132.947, 132.481, 131.611, 130.648, 131.133, 131.219, 130.838, 130.474, 131.089, 131.069, 131.763, 131.796, 130.892, 131.03, 132.23, 132.409, 133.157, 133.26, 132.627, 133.512, 133.253, 133.782, 133.445, 131.953, 132.831, 131.852, 131.877, 132.236, 132.132, 132.281, 132.349, 131.88, 132.399, 131.997, 131.376, 132.04, 132.497, 131.987, 131.851, 131.735, 132.048, 131.987, 131.758, 131.641, 132.602, 132.696, 132.69, 132.206, 132.03, 131.981, 132.273, 132.146, 132.859, 131.886, 131.809, 131.319, 132.015, 132.656, 131.899, 131.412, 131.434, 131.364, 131.769, 132.111, 131.991, 131.128, 131.746, 132.425, 131.434, 130.439, 130.47
+
+scal_read_bcm4b_current = 186.427, 187.922, 186.853, 188.754, 189.066, 189.434, 189.087, 188.058, 190.236, 188.809, 186.201, 185.346, 185.365, 186.522, 185.274, 186.164, 187.368, 187.506, 187.218, 188.984, 188.233, 188.073, 189.43, 189.597, 189.635, 188.526, 189.178, 190.038, 187.967, 187.263, 187.272, 186.397, 185.939, 186.474, 185.549, 186.3, 186.416, 186.385, 186.749, 187.043, 187.198, 187.638, 187.414, 186.775, 189.412, 190.199, 189.586, 189.18, 190.481, 189.236, 189.197, 188.44, 187.981, 188.475, 188.485, 189.051, 186.621, 185.538, 186.766, 185.532, 186.028, 185.595, 186.161, 185.977, 187.715, 187.881, 187.066, 186.404, 185.801, 185.662, 186.185, 187.034, 186.916, 186.975, 187.717, 187.342, 187.444, 186.749, 188.286, 187.575, 186.916, 186.875, 187.216, 186.1, 185.834, 185.904, 185.959, 186.184, 187.128, 186.515, 186.378, 187.569, 189.258, 189.173, 188.226, 189.189, 190.38, 190.454, 187.941, 187.675, 188.098, 189.022, 188.146, 187.262, 185.674, 186.123, 186.922, 186.777, 186.222, 185.925, 185.407, 185.892, 186.159, 186.386, 187.742, 187.41, 187.432, 189.289, 189.131, 188.83, 188.966, 188.323, 188.88, 189.162, 188.712, 189.041, 188.844, 187.59, 187.711, 187.613, 188.376, 188.267, 188.007, 187.885, 187.526, 187.836, 187.649, 187.61, 187.121, 187.791, 187.919, 186.971, 186.917, 187.511, 187.252, 187.85, 187.923, 187.82, 187.314, 187.985, 186.807, 188.238, 188.021, 188, 185.782, 186.13, 185.394, 185.452, 186.085, 186.433, 186.32, 186.185, 188.02, 189.131, 189.036, 188.974, 188.692, 189.08, 188.302, 187.008, 185.576, 186.24, 186.351, 185.731, 185.562, 186.546, 186.715, 187.671, 187.597, 186.146, 186.17, 187.933, 188.136, 189.294, 190.226, 188.858, 189.974, 189.387, 190.349, 189.964, 187.471, 188.798, 187.492, 187.65, 188.222, 187.988, 188.326, 188.445, 187.278, 188.153, 188.027, 188.275, 188.501, 188.694, 187.586, 187.83, 187.626, 187.848, 187.581, 187.229, 187.029, 188.296, 188.333, 188.329, 187.627, 187.372, 187.334, 187.937, 187.978, 189.235, 187.812, 187.894, 187.069, 187.884, 188.597, 187.509, 186.752, 187.619, 188.231, 188.694, 188.946, 188.106, 186.831, 187.463, 188.513, 186.958, 185.524, 185.494
+
+scal_read_bcm17_current = -62.2173, -61.9717, -62.1117, -61.701, -61.6758, -61.6471, -61.6274, -61.7838, -61.4084, -61.6312, -62.0685, -62.2373, -62.284, -62.0916, -62.2288, -62.0971, -61.8901, -61.8881, -61.937, -61.6117, -61.7228, -61.7451, -61.518, -61.5144, -61.6813, -61.8059, -61.6963, -61.4666, -61.7942, -62.0044, -61.9769, -62.116, -62.1359, -62.0545, -62.22, -62.1038, -62.0714, -62.0597, -61.9861, -61.9574, -61.8993, -61.837, -61.8899, -62.0779, -61.5809, -61.4351, -61.5142, -61.5972, -61.4199, -61.5935, -61.5773, -61.6899, -61.7713, -61.7118, -61.6921, -61.5781, -61.9987, -62.1819, -61.9853, -62.2216, -62.1631, -62.2294, -62.085, -62.1498, -61.8988, -61.8956, -62.1244, -62.146, -62.2072, -62.242, -62.1389, -62.0223, -62.0334, -62.0277, -61.9823, -62.0849, -62.028, -62.1031, -61.8999, -62.0267, -62.1674, -62.0451, -61.9602, -62.1579, -62.22, -62.1775, -62.1624, -62.1559, -61.9964, -62.0947, -62.1337, -61.9061, -61.6594, -61.7267, -61.8678, -61.7423, -61.5993, -61.5134, -61.8214, -61.843, -61.8179, -61.7263, -61.87, -62.0047, -62.2173, -62.2126, -62.0763, -62.0338, -62.1254, -62.1653, -62.2455, -62.1914, -62.1509, -62.0923, -61.8964, -61.9235, -61.9427, -61.6317, -61.6445, -61.6783, -61.6944, -61.7869, -61.6661, -61.6378, -61.716, -61.633, -61.6471, -61.8443, -61.8933, -61.8925, -61.7797, -61.935, -61.9692, -61.8683, -61.888, -61.8296, -61.8529, -61.8517, -61.9238, -61.8012, -61.7893, -61.9668, -62.0014, -61.9158, -61.9242, -61.8178, -61.8372, -61.9001, -61.9912, -61.8785, -62.0477, -61.8244, -61.8488, -61.969, -62.4491, -62.281, -62.3355, -62.3131, -62.1844, -62.1128, -62.1104, -62.1543, -61.8044, -61.6282, -61.6733, -61.673, -61.7166, -61.6625, -61.7768, -61.9912, -62.2227, -62.1068, -62.0892, -62.1823, -62.269, -62.1169, -62.1179, -61.9478, -61.9401, -62.1597, -62.126, -61.8314, -61.7869, -61.6032, -61.5795, -61.7367, -61.5149, -61.581, -61.4454, -61.5351, -61.9022, -61.6875, -61.9264, -61.9189, -61.8341, -61.8581, -61.8147, -61.8012, -61.9137, -61.7869, -61.8851, -62.0357, -61.8801, -61.7693, -61.8897, -61.9205, -61.9495, -61.8789, -61.896, -61.9521, -61.9882, -61.7512, -61.7272, -61.7326, -61.8502, -61.8927, -61.9029, -61.8347, -61.8715, -61.698, -61.9252, -61.9452, -62.0655, -61.8998, -61.7418, -61.921, -62.0394, -62.0338, -62.0565, -61.9584, -61.8731, -61.9023, -62.1119, -61.9615, -61.7952, -62.0443, -62.2919, -62.2883
+
+scal_read_event = 1, 1627, 3279, 4922, 6609, 8269, 9916, 10000, 11668, 13335, 14979, 16594, 18242, 19872, 20000, 21647, 23289, 24944, 26596, 28264, 29937, 30000, 31678, 33353, 35004, 36669, 38343, 40000, 41644, 43321, 44982, 46622, 48276, 49921, 50000, 51600, 53250, 54900, 56558, 58210, 59889, 60000, 61672, 63312, 64989, 66673, 68328, 69996, 70000, 71685, 73352, 75024, 76680, 78339, 80000, 81664, 83298, 84921, 86560, 88197, 89833, 90000, 91624, 93271, 94903, 96571, 98213, 99866, 100000, 101627, 103283, 104945, 106587, 108245, 109875, 110000, 111641, 113279, 114934, 116577, 118235, 119904, 120000, 121636, 123289, 124919, 126593, 128227, 129884, 130000, 131648, 133302, 134968, 136627, 138312, 139959, 140000, 141672, 143326, 144983, 146631, 148302, 149975, 150000, 151633, 153292, 154948, 156595, 158251, 159904, 160000, 161638, 163305, 164941, 166607, 168288, 169932, 170000, 171667, 173327, 174978, 176643, 178306, 179977, 180000, 181645, 183331, 184971, 186620, 188277, 189944, 190000, 191619, 193276, 194924, 196601, 198273, 199913, 200000, 201669, 203327, 204982, 206638, 208301, 209947, 210000, 211641, 213308, 214961, 216637, 218268, 219931, 220000, 221636, 223261, 224890, 226521, 228151, 229784, 230000, 231609, 233263, 234925, 236594, 238242, 239915, 240000, 241661, 243313, 244978, 246628, 248260, 249891, 250000, 251655, 253289, 254916, 256553, 258204, 259845, 260000, 261643, 263288, 264979, 266631, 268309, 269984, 270000, 271649, 273325, 274994, 276659, 278300, 279950, 280000, 281640, 283304, 284983, 286630, 288304, 289943, 290000, 291656, 293296, 294969, 296625, 298244, 299890, 300000, 301627, 303268, 304942, 306596, 308253, 309912, 310000, 311650, 313289, 314969, 316633, 318298, 319964, 320000, 321643, 323323, 324973, 326633, 328292, 329915, 330000, 331645, 333301, 334942, 336578, 338242, 339870, 340000, 1e+38
\ No newline at end of file
diff --git a/PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param b/PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param
new file mode 100644
index 00000000..f242f60f
--- /dev/null
+++ b/PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param
@@ -0,0 +1,13 @@
+num_scal_reads = 154
+
+scal_read_bcm1_current = 50.5009, 50.1226, 50.4317, 50.9125, 51.0089, 50.834, 50.6728, 50.6553, 50.7497, 50.884, 50.8908, 50.9264, 50.9982, 50.5139, 50.6805, 50.5674, 50.6736, 50.93, 50.7266, 50.3512, 50.1216, 50.6034, 50.7112, 50.5524, 50.7244, 50.7601, 50.7551, 51.6381, 51.1424, 23.872, 0.0459189, 0.0461081, 0.0512322, 0.0458103, 0.0457565, 0.0459565, 0.0460539, 0.0458101, 0.0457397, 0.933966, 0.663487, 0.0460929, 0.0463246, 0.0462704, 0.0460112, 0.0462163, 0.0461621, 0.0461472, 1.04107, 2.23518, 3.0138, 5.55885, 7.71833, 8.23467, 9.50704, 11.7628, 13.244, 16.0619, 16.987, 19.049, 21.6977, 22.7971, 24.0462, 25.0353, 27.9611, 28.9614, 31.692, 32.2846, 33.2246, 36.1603, 37.9374, 38.8497, 39.8207, 41.6082, 44.1141, 45.0258, 45.6829, 45.9503, 48.5651, 48.7136, 50.2098, 50.7766, 51.0219, 51.1066, 50.8423, 51.0143, 51.1652, 51.1069, 51.1026, 51.2929, 51.0515, 51.0035, 50.9865, 50.9512, 51.0938, 50.7323, 50.9158, 50.9579, 50.8706, 50.7865, 50.8047, 50.9917, 50.8262, 50.7701, 50.8588, 50.9776, 51.1634, 51.3144, 50.9601, 50.8978, 51.0119, 50.9458, 50.9223, 51.0492, 51.1996, 51.4882, 51.4417, 51.1692, 51.0929, 51.3034, 51.3091, 51.2376, 50.9895, 51.326, 51.0954, 50.9036, 50.6393, 51.2195, 51.0364, 51.3871, 51.4313, 51.3097, 51.316, 51.0998, 51.0606, 51.1745, 50.9071, 50.8718, 51.146, 51.4338, 51.1482, 51.1771, 51.1448, 51.2715, 51.2599, 51.3172, 51.6005, 51.5774, 51.3718, 51.3372, 50.8894, 51.2431, 51.0445, 50.9275
+
+scal_read_bcm2_current = 51.107, 51.2012, 51.515, 52.0026, 52.1005, 51.9226, 51.759, 51.7409, 51.8363, 51.9728, 51.9803, 52.017, 52.0889, 51.5971, 51.7656, 51.651, 51.758, 52.0186, 51.8127, 51.4313, 51.1977, 51.6873, 51.7962, 51.6348, 51.8089, 51.8449, 51.8393, 52.7351, 52.2321, 24.3988, 0.0825212, 0.0824887, 0.0826405, 0.0825207, 0.0825854, 0.0827048, 0.082553, 0.0826492, 0.0825764, 0.988121, 0.712286, 0.0826083, 0.0826174, 0.082553, 0.0825112, 0.0826174, 0.082553, 0.0825435, 1.09689, 2.31414, 3.10706, 5.70161, 7.90296, 8.42987, 9.72754, 12.0291, 13.5405, 16.416, 17.3599, 19.4644, 22.1667, 23.2891, 24.5635, 25.5728, 28.5579, 29.578, 32.3636, 32.9673, 33.9249, 36.9206, 38.7341, 39.6655, 40.6573, 42.4858, 45.0531, 45.9845, 46.6566, 46.9295, 49.6026, 49.7514, 51.2744, 51.8513, 52.0993, 52.1843, 51.9164, 52.0912, 52.2426, 52.184, 52.1789, 52.3725, 52.1266, 52.079, 52.0242, 52.026, 52.1704, 51.8034, 51.9895, 52.0313, 51.9428, 51.857, 51.8752, 52.0652, 51.8971, 51.8253, 51.9303, 52.0506, 52.2384, 52.3914, 52.0313, 51.9679, 52.0832, 52.0158, 51.9918, 52.1203, 52.2733, 52.566, 52.5186, 52.2423, 52.1643, 52.3774, 52.3827, 52.3098, 52.0582, 52.3997, 52.166, 51.9704, 51.7026, 52.291, 52.1054, 52.4609, 52.5058, 52.3822, 52.3885, 52.1694, 52.1292, 52.244, 51.9726, 51.9353, 52.2138, 52.5061, 52.2161, 52.2448, 52.2122, 52.3407, 52.3292, 52.3869, 52.6738, 52.6502, 52.4411, 52.4065, 51.9524, 52.3106, 52.1083, 51.9915
+
+scal_read_bcm4a_current = 100.689, 100.366, 100.967, 101.923, 102.12, 101.769, 101.442, 101.395, 101.575, 101.843, 101.853, 101.919, 102.061, 101.09, 101.406, 101.162, 101.373, 101.879, 101.478, 100.721, 100.264, 101.22, 101.436, 101.115, 101.459, 101.536, 101.52, 103.273, 102.264, 48.2115, 0.982674, 0.982136, 0.981667, 0.982748, 0.98367, 0.980509, 0.981291, 0.98313, 0.984677, 2.44656, 2.00271, 0.982516, 0.982289, 0.982288, 0.98159, 0.983746, 0.981981, 0.983055, 2.62343, 4.62117, 6.15407, 11.226, 15.5253, 16.5565, 19.0979, 23.6003, 26.5566, 32.179, 34.0255, 38.1378, 43.4135, 45.6018, 48.0935, 50.0602, 55.8857, 57.8801, 63.3179, 64.496, 66.3584, 72.1925, 75.7303, 77.5466, 79.4741, 83.0398, 88.0343, 89.8509, 91.1629, 91.6983, 96.9026, 97.1968, 100.177, 101.303, 101.786, 101.951, 101.437, 101.776, 102.065, 101.938, 101.918, 102.293, 101.816, 101.721, 101.728, 101.613, 101.885, 101.17, 101.523, 101.603, 101.43, 101.257, 101.293, 101.652, 101.318, 101.212, 101.382, 101.615, 101.979, 102.272, 101.557, 101.426, 101.655, 101.52, 101.463, 101.701, 102.003, 102.575, 102.476, 101.935, 101.765, 102.171, 102.176, 102.042, 101.543, 102.196, 101.737, 101.355, 100.838, 101.989, 101.623, 102.32, 102.414, 102.162, 102.161, 101.719, 101.638, 101.865, 101.329, 101.26, 101.801, 102.364, 101.792, 101.846, 101.775, 102.016, 101.991, 102.095, 102.658, 102.603, 102.193, 102.122, 101.24, 101.934, 101.54, 101.31
+
+scal_read_bcm4b_current = 143.422, 143.043, 144.189, 145.355, 145.535, 144.64, 144.314, 144.49, 144.625, 145.143, 144.995, 145.004, 145.502, 144.177, 144.664, 144.103, 144.325, 145.082, 144.23, 143.313, 143.051, 144.731, 145.288, 144.922, 145.305, 145.669, 145.014, 147.388, 145.879, 69.6122, 2.72229, 2.73309, 2.72393, 2.71838, 2.72321, 2.72923, 2.7347, 2.71906, 2.70639, 4.29667, 3.83664, 2.72416, 2.71355, 2.72068, 2.75026, 2.74596, 2.74274, 2.73432, 4.51083, 6.7352, 8.85106, 16.0831, 22.1572, 23.5979, 27.2098, 33.6305, 37.859, 45.8833, 48.5111, 54.3043, 61.9179, 64.9889, 68.5411, 71.2345, 79.5069, 82.4891, 90.3633, 91.9081, 94.4824, 103.092, 108.018, 110.562, 113.251, 118.261, 125.429, 127.878, 129.849, 130.627, 138.022, 138.764, 142.845, 144.122, 144.865, 145.029, 145.429, 145.678, 145.806, 145.378, 145.432, 145.786, 145.281, 145.164, 145.288, 145.028, 145.378, 144.528, 145.127, 144.971, 144.763, 144.294, 144.339, 144.583, 144.123, 143.942, 144.235, 145.002, 145.824, 145.775, 144.542, 144.343, 144.779, 144.414, 144.673, 144.834, 145.471, 146.056, 145.629, 145.353, 145.186, 145.589, 145.625, 145.182, 144.806, 145.895, 145.732, 145.235, 144.113, 145.446, 144.91, 145.873, 145.906, 145.306, 145.291, 144.518, 144.565, 145.216, 144.363, 144.343, 145.038, 145.754, 144.86, 144.931, 145.301, 145.587, 145.306, 145.468, 146.329, 146.176, 145.326, 145.257, 144.238, 145.397, 144.734, 144.339
+
+scal_read_bcm17_current = -69.8798, -69.6452, -69.4958, -69.2636, -69.2201, -69.307, -69.3852, -69.3915, -69.3479, -69.2846, -69.2793, -69.2631, -69.2305, -69.4658, -69.3841, -69.442, -69.3949, -69.274, -69.3746, -69.5564, -69.6684, -69.4324, -69.379, -69.4549, -69.3745, -69.3579, -69.3641, -68.9379, -69.1784, -82.2836, -93.7338, -93.7346, -93.7353, -93.735, -93.7347, -93.7352, -93.7353, -93.7356, -93.7361, -93.4938, -93.5672, -93.7359, -93.7353, -93.7347, -93.7351, -93.735, -93.7344, -93.7352, -93.4643, -93.1228, -92.7666, -91.5475, -90.5119, -90.2592, -89.6394, -88.5312, -87.8042, -86.42, -85.9625, -84.9424, -83.6375, -83.095, -82.48, -81.9945, -80.5547, -80.0642, -78.7286, -78.4383, -77.9765, -76.5487, -75.6857, -75.2412, -74.7671, -73.8908, -72.6633, -72.2131, -71.8891, -71.7586, -70.485, -70.4128, -69.6837, -69.4048, -69.2866, -69.2484, -69.3763, -69.2926, -69.2186, -69.2484, -69.2544, -69.164, -69.2809, -69.3035, -69.3074, -69.3337, -69.2665, -69.4394, -69.3528, -69.3322, -69.3745, -69.4168, -69.4101, -69.3223, -69.4043, -69.4373, -69.3904, -69.3356, -69.2461, -69.1745, -69.3488, -69.3819, -69.3277, -69.3576, -69.3703, -69.3104, -69.2379, -69.0981, -69.1214, -69.2539, -69.2882, -69.1907, -69.1864, -69.2208, -69.3433, -69.1819, -69.2937, -69.3854, -69.5126, -69.2363, -69.3256, -69.156, -69.1359, -69.1987, -69.1969, -69.301, -69.3223, -69.2685, -69.3953, -69.4146, -69.2831, -69.1425, -69.2863, -69.2725, -69.289, -69.2288, -69.2341, -69.2071, -69.0717, -69.0845, -69.1838, -69.2031, -69.4198, -69.2541, -69.3497, -69.4087
+
+scal_read_event = 1, 5008, 10000, 15066, 20000, 25000, 30000, 35001, 40000, 45038, 50000, 55060, 60000, 64976, 70000, 75057, 80000, 85062, 90000, 95032, 100000, 104996, 110000, 114975, 120000, 125002, 130000, 135015, 140000, 142461, 142670, 142877, 143082, 143289, 143497, 143701, 143911, 144115, 144322, 144723, 145061, 145266, 145474, 145678, 145883, 146088, 146294, 146498, 146907, 147551, 148347, 149525, 150000, 151715, 153626, 155745, 158115, 160000, 162751, 165704, 168938, 170000, 173396, 176868, 180000, 183827, 187799, 190000, 194091, 198377, 200000, 204513, 209029, 210000, 214687, 219490, 220000, 224773, 229728, 230000, 234973, 240000, 245038, 250000, 255038, 260000, 265080, 270000, 275023, 280000, 285041, 289999, 290000, 295042, 300000, 305031, 310000, 315074, 320000, 325036, 330000, 334992, 339982, 340000, 345002, 350000, 355032, 360000, 365048, 370000, 374998, 380000, 385069, 390000, 395068, 400000, 405045, 410000, 415052, 420000, 425028, 430000, 434999, 440000, 445063, 450000, 454976, 460000, 465023, 470000, 474986, 480000, 485012, 490000, 495016, 500000, 505007, 510000, 515066, 520000, 525006, 530000, 535056, 540000, 545064, 550000, 555058, 560000, 565015, 570000, 574956, 580000, 585070, 1e+38
\ No newline at end of file
diff --git a/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1136.param b/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1136.param
deleted file mode 100644
index 7c265d67..00000000
--- a/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1136.param
+++ /dev/null
@@ -1,10 +0,0 @@
-; Calibration constants for run 1136_100000, 39049 events processed
-
-hcal_pos_gain_cor= 0.00, 9.15, 10.44, 10.88, 10.86, 11.14, 12.93, 14.47, 10.02, 14.21, 12.72, 13.03, 0.00,
- 9.44, 15.69, 10.67, 13.04, 11.65, 9.33, 10.58, 10.56, 9.76, 10.34, 10.30, 12.17, 0.00,
- 23.63, 16.39, 17.25, 19.63, 17.38, 16.83, 19.07, 18.55, 18.51, 23.70, 18.56, 20.22, 0.00,
- 0.00, 19.40, 21.71, 19.02, 19.86, 20.51, 24.60, 20.31, 19.73, 21.80, 18.53, 19.00, 0.00,
-hcal_neg_gain_cor= 0.00, 12.76, 13.46, 10.86, 12.85, 14.27, 11.70, 14.84, 13.87, 11.47, 12.57, 12.83, 0.00,
- 29.74, 12.10, 13.64, 13.64, 13.63, 14.32, 16.45, 14.92, 17.14, 16.15, 17.72, 14.32, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
\ No newline at end of file
diff --git a/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1249.param b/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1249.param
deleted file mode 100644
index b4e4c557..00000000
--- a/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1249.param
+++ /dev/null
@@ -1,10 +0,0 @@
-; Calibration constants for run 1249_200000, 78006 events processed
-
-hcal_pos_gain_cor= 7.20, 14.39, 14.23, 14.22, 15.07, 14.63, 15.87, 22.08, 13.26, 17.94, 17.44, 16.69, 0.00,
- 13.39, 19.40, 16.50, 17.83, 15.40, 14.08, 17.24, 15.39, 16.85, 15.45, 13.96, 17.48, 0.00,
- 29.26, 19.92, 20.23, 23.64, 20.64, 20.75, 23.38, 22.36, 22.10, 28.24, 21.46, 23.42, 0.00,
- 0.00, 26.25, 31.65, 27.98, 29.46, 30.29, 34.00, 31.55, 29.35, 33.95, 28.08, 32.92, 0.00,
-hcal_neg_gain_cor= 29.48, 15.39, 17.31, 15.16, 16.63, 19.68, 17.94, 15.52, 19.04, 16.85, 17.30, 19.02, 0.00,
- 24.27, 19.16, 16.95, 19.24, 19.62, 17.54, 18.57, 19.75, 19.65, 20.81, 23.76, 19.20, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
\ No newline at end of file
diff --git a/PARAM/HMS/CAL/CALIB/KPP_Spring_2017/hcal_calib_303.param b/PARAM/HMS/CAL/CALIB/KPP_Spring_2017/hcal_calib_303.param
deleted file mode 100644
index 08acd2e8..00000000
--- a/PARAM/HMS/CAL/CALIB/KPP_Spring_2017/hcal_calib_303.param
+++ /dev/null
@@ -1,10 +0,0 @@
-; Calibration constants for run 303, 77272 events processed
-
-hcal_pos_gain_cor= 0.272/0.0195, 0.156/0.0195, 0.139/0.0195, 0.229/0.0195, 0.185/0.0195, 0.152/0.0195, 0.146/0.0195, 0.276/0.0195, 0.146/0.0195, 0.268/0.0195, 0.218/0.0195, 0.200/0.0195, 0.150/0.0195,
- 0.162/0.0195, 0.145/0.0195, 0.125/0.0195, 0.235/0.0195, 0.005/0.0195, 0.152/0.0195, 0.173/0.0195, 0.195/0.0195, 0.181/0.0195, 0.192/0.0195, 0.302/0.0195, 0.235/0.0195, 0.185/0.0195,
- 0.584/0.0195, 0.334/0.0195, 0.241/0.0195, 0.434/0.0195, 0.302/0.0195, 0.303/0.0195, 0.379/0.0195, 0.422/0.0195, 0.342/0.0195, 0.424/0.0195, 0.314/0.0195, 0.448/0.0195, 0.270/0.0195,
- 1.073/0.0195, 0.306/0.0195, 0.463/0.0195, 0.402/0.0195, 0.273/0.0195, 0.300/0.0195, 0.744/0.0195, 0.216/0.0195, 0.365/0.0195, 0.497/0.0195, 0.374/0.0195, 0.459/0.0195, 0.572/0.0195,
-hcal_neg_gain_cor= 0.401/0.0195, 0.174/0.0195, 0.190/0.0195, 0.223/0.0195, 0.127/0.0195, 0.183/0.0195, 0.296/0.0195, 0.437/0.0195, 0.224/0.0195, 0.300/0.0195, 0.167/0.0195, 0.139/0.0195, 0.232/0.0195,
- 0.302/0.0195, 0.378/0.0195, 0.238/0.0195, 0.313/0.0195, 0.427/0.0195, 0.262/0.0195, 0.278/0.0195, 0.234/0.0195, 0.253/0.0195, 0.288/0.0195, 0.290/0.0195, 0.229/0.0195, 0.192/0.0195,
- 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
diff --git a/PARAM/HMS/CAL/CALIB/hcal_calib.param b/PARAM/HMS/CAL/CALIB/hcal_calib.param
deleted file mode 120000
index aa4ff2bd..00000000
--- a/PARAM/HMS/CAL/CALIB/hcal_calib.param
+++ /dev/null
@@ -1 +0,0 @@
-Fall_Comm_2017/hcal_calib_1235.param
\ No newline at end of file
diff --git a/PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1235.param b/PARAM/HMS/CAL/hcal_calib.param
similarity index 100%
rename from PARAM/HMS/CAL/CALIB/Fall_Comm_2017/hcal_calib_1235.param
rename to PARAM/HMS/CAL/hcal_calib.param
diff --git a/PARAM/HMS/CAL/CUTS/hcal_cuts.param b/PARAM/HMS/CAL/hcal_cuts.param
similarity index 100%
rename from PARAM/HMS/CAL/CUTS/hcal_cuts.param
rename to PARAM/HMS/CAL/hcal_cuts.param
diff --git a/PARAM/HMS/CAL/GEOM/hcal_geom.param b/PARAM/HMS/CAL/hcal_geom.param
similarity index 100%
rename from PARAM/HMS/CAL/GEOM/hcal_geom.param
rename to PARAM/HMS/CAL/hcal_geom.param
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1130.param b/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1130.param
deleted file mode 100644
index d8909e5d..00000000
--- a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1130.param
+++ /dev/null
@@ -1 +0,0 @@
-hcer_adc_to_npe = 1./6.556, 1./5.224
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1136.param b/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1136.param
deleted file mode 100644
index 2e8b9c20..00000000
--- a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1136.param
+++ /dev/null
@@ -1 +0,0 @@
-hcer_adc_to_npe = 1./6.638, 1./5.242
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1178.param b/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1178.param
deleted file mode 100644
index 17202ac0..00000000
--- a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1178.param
+++ /dev/null
@@ -1 +0,0 @@
-hcer_adc_to_npe = 1./6.748, 1./5.310
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1179.param b/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1179.param
deleted file mode 100644
index b54472e3..00000000
--- a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1179.param
+++ /dev/null
@@ -1 +0,0 @@
-hcer_adc_to_npe = 1./6.752, 1./5.850
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1180.param b/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1180.param
deleted file mode 100644
index 665ff43f..00000000
--- a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1180.param
+++ /dev/null
@@ -1 +0,0 @@
-hcer_adc_to_npe = 1./6.732, 1./5.985
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1213.param b/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1213.param
deleted file mode 100644
index 786a5145..00000000
--- a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1213.param
+++ /dev/null
@@ -1 +0,0 @@
-hcer_adc_to_npe = 1./6.616, 1./6.564
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1214.param b/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1214.param
deleted file mode 100644
index 98c25af3..00000000
--- a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1214.param
+++ /dev/null
@@ -1 +0,0 @@
-hcer_adc_to_npe = 1./6.399, 1./5.729
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib.param b/PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib.param
deleted file mode 100644
index fa4cb59a..00000000
--- a/PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib.param
+++ /dev/null
@@ -1,3 +0,0 @@
-
-;Garth H. ?? gain calibration from run ??
-hcer_adc_to_npe = 1/323./.0195, 1/327./.0195
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib_303.param b/PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib_303.param
deleted file mode 100644
index 4767aa64..00000000
--- a/PARAM/HMS/CER/CALIB/KPP_Spring_2017/hcer_calib_303.param
+++ /dev/null
@@ -1,3 +0,0 @@
-
-;Garth H. ?? gain calibration from HMS KPP run 303
-hcer_adc_to_npe = 1/323./.0195, 1/327./.0195
diff --git a/PARAM/HMS/CER/CALIB/hcer_calib.param b/PARAM/HMS/CER/CALIB/hcer_calib.param
deleted file mode 120000
index ace5be07..00000000
--- a/PARAM/HMS/CER/CALIB/hcer_calib.param
+++ /dev/null
@@ -1 +0,0 @@
-Fall_Comm_2017/hcer_calib_1212.param
\ No newline at end of file
diff --git a/PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1212.param b/PARAM/HMS/CER/hcer_calib.param
similarity index 100%
rename from PARAM/HMS/CER/CALIB/Fall_Comm_2017/hcer_calib_1212.param
rename to PARAM/HMS/CER/hcer_calib.param
diff --git a/PARAM/HMS/CER/CUTS/hcer_cuts.param b/PARAM/HMS/CER/hcer_cuts.param
similarity index 100%
rename from PARAM/HMS/CER/CUTS/hcer_cuts.param
rename to PARAM/HMS/CER/hcer_cuts.param
diff --git a/PARAM/HMS/CER/GEOM/hcer_geom.param b/PARAM/HMS/CER/hcer_geom.param
similarity index 100%
rename from PARAM/HMS/CER/GEOM/hcer_geom.param
rename to PARAM/HMS/CER/hcer_geom.param
diff --git a/PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_303.param b/PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_303.param
deleted file mode 100644
index e58c62cb..00000000
--- a/PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_303.param
+++ /dev/null
@@ -1,175 +0,0 @@
-; Lookup Table: RUN 303
-; number of bins in Carlos's time to distance lookup table
-hdriftbins = 138
-; number of 1st bin in Carlos's table in ns
-hdrift1stbin=0
-; bin size in ns
-hdriftbinsz=2
-hwc1x1fract=0.0020833,0.00489,0.00876,0.01394,0.02062,0.02905,0.03922,0.05139,0.06502
-0.08048,0.09728,0.11528,0.13442,0.15422,0.17474,0.19559,0.21654,0.23774,0.25912
-0.28047,0.30213,0.32359,0.34477,0.36578,0.38669,0.40776,0.42815,0.44870,0.46871
-0.48868,0.50838,0.52755,0.54678,0.56563,0.58450,0.60268,0.62064,0.63843,0.65606
-0.67308,0.69026,0.70691,0.72339,0.73947,0.75507,0.77054,0.78552,0.79999,0.81397
-0.82764,0.84038,0.85263,0.86438,0.87542,0.88567,0.89528,0.90434,0.91280,0.92063
-0.92797,0.93458,0.94070,0.94661,0.95206,0.95702,0.96143,0.96553,0.96926,0.97273
-0.97587,0.97857,0.98096,0.98307,0.98483,0.98646,0.98787,0.98906,0.99000,0.99095
-0.99167,0.99232,0.99290,0.99345,0.99391,0.99435,0.99474,0.99507,0.99536,0.99566
-0.99590,0.99614,0.99635,0.99655,0.99674,0.99693,0.99711,0.99727,0.99744,0.99762
-0.99778,0.99794,0.99807,0.99818,0.99831,0.99844,0.99854,0.99862,0.99869,0.99878
-0.99886,0.99892,0.99898,0.99904,0.99910,0.99916,0.99921,0.99928,0.99932,0.99936
-0.99939,0.99944,0.99949,0.99952,0.99957,0.99960,0.99963,0.99966,0.99969,0.99973
-0.99977,0.99980,0.99984,0.99987,0.99989,0.99991,0.99994,0.99996,1.00000
-hwc1y1fract=0.00205,0.00455,0.00768,0.01195,0.01753,0.02471,0.03370,0.04490,0.05814
-0.07344,0.09075,0.10958,0.12956,0.15050,0.17182,0.19342,0.21512,0.23648,0.25785
-0.27889,0.29942,0.31985,0.33992,0.36003,0.37993,0.39944,0.41896,0.43804,0.45674
-0.47550,0.49399,0.51218,0.53005,0.54795,0.56572,0.58314,0.60048,0.61775,0.63452
-0.65122,0.66764,0.68401,0.69999,0.71549,0.73103,0.74641,0.76143,0.77607,0.79026
-0.80367,0.81676,0.82955,0.84167,0.85325,0.86410,0.87444,0.88405,0.89306,0.90131
-0.90895,0.91620,0.92291,0.92919,0.93505,0.94046,0.94567,0.95057,0.95503,0.95917
-0.96294,0.96641,0.96971,0.97263,0.97529,0.97777,0.97994,0.98189,0.98371,0.98539
-0.98682,0.98816,0.98923,0.99031,0.99117,0.99194,0.99266,0.99332,0.99388,0.99444
-0.99489,0.99532,0.99566,0.99602,0.99630,0.99655,0.99678,0.99699,0.99717,0.99735
-0.99751,0.99765,0.99779,0.99792,0.99805,0.99818,0.99831,0.99845,0.99857,0.99870
-0.99884,0.99896,0.99907,0.99913,0.99922,0.99927,0.99932,0.99938,0.99942,0.99946
-0.99950,0.99955,0.99959,0.99962,0.99966,0.99970,0.99974,0.99978,0.99981,0.99985
-0.99987,0.99988,0.99991,0.99993,0.99994,0.99996,0.99997,0.99999,1.00000
-hwc1u1fract=0.00163,0.00438,0.00852,0.01456,0.02322,0.03445,0.04830,0.06440,0.08241
-0.10195,0.12225,0.14341,0.16483,0.18632,0.20821,0.22974,0.25135,0.27244,0.29345
-0.31390,0.33434,0.35483,0.37481,0.39457,0.41407,0.43316,0.45251,0.47151,0.49016
-0.50897,0.52720,0.54549,0.56342,0.58131,0.59852,0.61614,0.63295,0.64993,0.66659
-0.68319,0.69957,0.71570,0.73149,0.74718,0.76244,0.77719,0.79158,0.80576,0.81926
-0.83227,0.84452,0.85632,0.86729,0.87761,0.88740,0.89658,0.90497,0.91252,0.91972
-0.92645,0.93255,0.93836,0.94368,0.94880,0.95353,0.95805,0.96223,0.96595,0.96935
-0.97248,0.97532,0.97786,0.98022,0.98236,0.98407,0.98562,0.98703,0.98823,0.98921
-0.99015,0.99095,0.99168,0.99236,0.99297,0.99347,0.99393,0.99435,0.99471,0.99507
-0.99539,0.99572,0.99600,0.99626,0.99645,0.99669,0.99694,0.99715,0.99733,0.99750
-0.99764,0.99779,0.99790,0.99803,0.99814,0.99824,0.99836,0.99846,0.99858,0.99868
-0.99879,0.99886,0.99892,0.99898,0.99904,0.99910,0.99916,0.99920,0.99925,0.99929
-0.99934,0.99938,0.99942,0.99946,0.99950,0.99955,0.99959,0.99964,0.99968,0.99972
-0.99975,0.99977,0.99980,0.99984,0.99987,0.99991,0.99995,0.99998,1.00000
-hwc1v1fract=0.00326,0.00757,0.01344,0.02136,0.03133,0.04381,0.05851,0.07537,0.09402
-0.11379,0.13470,0.15577,0.17671,0.19840,0.21975,0.24141,0.26240,0.28335,0.30406
-0.32477,0.34510,0.36494,0.38474,0.40449,0.42400,0.44309,0.46202,0.48081,0.49929
-0.51791,0.53613,0.55407,0.57212,0.58982,0.60751,0.62458,0.64179,0.65867,0.67544
-0.69171,0.70787,0.72383,0.73970,0.75520,0.77045,0.78516,0.79926,0.81315,0.82651
-0.83940,0.85139,0.86268,0.87328,0.88328,0.89254,0.90106,0.90906,0.91640,0.92333
-0.92974,0.93563,0.94125,0.94646,0.95143,0.95595,0.96020,0.96407,0.96776,0.97094
-0.97390,0.97646,0.97882,0.98089,0.98270,0.98438,0.98584,0.98707,0.98823,0.98923
-0.99011,0.99088,0.99162,0.99225,0.99278,0.99329,0.99374,0.99416,0.99454,0.99486
-0.99517,0.99546,0.99572,0.99597,0.99620,0.99639,0.99658,0.99674,0.99695,0.99713
-0.99729,0.99744,0.99757,0.99769,0.99783,0.99795,0.99806,0.99818,0.99828,0.99836
-0.99843,0.99853,0.99861,0.99869,0.99876,0.99883,0.99890,0.99895,0.99900,0.99906
-0.99911,0.99917,0.99922,0.99927,0.99933,0.99937,0.99942,0.99947,0.99952,0.99956
-0.99961,0.99967,0.99972,0.99977,0.99982,0.99987,0.99991,0.99996,1.00000
-hwc1y2fract=0.00193,0.00455,0.00809,0.01310,0.01984,0.02852,0.03980,0.05332,0.06932
-0.08717,0.10672,0.12719,0.14894,0.17063,0.19259,0.21465,0.23669,0.25832,0.27981
-0.30063,0.32150,0.34168,0.36171,0.38169,0.40121,0.42077,0.43999,0.45896,0.47755
-0.49607,0.51430,0.53253,0.55062,0.56831,0.58598,0.60344,0.62062,0.63795,0.65466
-0.67133,0.68776,0.70361,0.71950,0.73518,0.75072,0.76582,0.78047,0.79478,0.80840
-0.82153,0.83428,0.84640,0.85815,0.86919,0.87945,0.88897,0.89792,0.90626,0.91375
-0.92098,0.92753,0.93366,0.93938,0.94465,0.94961,0.95418,0.95848,0.96232,0.96580
-0.96912,0.97210,0.97492,0.97743,0.97973,0.98174,0.98358,0.98521,0.98663,0.98793
-0.98907,0.99004,0.99093,0.99183,0.99258,0.99323,0.99381,0.99432,0.99476,0.99516
-0.99551,0.99586,0.99613,0.99640,0.99662,0.99683,0.99702,0.99715,0.99731,0.99746
-0.99760,0.99774,0.99785,0.99796,0.99806,0.99818,0.99830,0.99840,0.99851,0.99860
-0.99871,0.99880,0.99888,0.99897,0.99905,0.99912,0.99918,0.99924,0.99928,0.99932
-0.99935,0.99938,0.99942,0.99947,0.99951,0.99956,0.99961,0.99965,0.99969,0.99973
-0.99977,0.99979,0.99982,0.99984,0.99987,0.99990,0.99994,0.99997,1.00000
-hwc1x2fract=0.00214,0.00519,0.00938,0.01501,0.02253,0.03198,0.04335,0.05660,0.07178
-0.08830,0.10580,0.12474,0.14447,0.16464,0.18488,0.20578,0.22678,0.24791,0.26913
-0.29016,0.31137,0.33272,0.35362,0.37431,0.39509,0.41542,0.43568,0.45557,0.47572
-0.49528,0.51454,0.53377,0.55269,0.57108,0.58959,0.60758,0.62559,0.64321,0.66102
-0.67839,0.69534,0.71201,0.72863,0.74462,0.76028,0.77534,0.79034,0.80487,0.81888
-0.83210,0.84518,0.85753,0.86894,0.87969,0.88974,0.89932,0.90804,0.91621,0.92378
-0.93098,0.93745,0.94357,0.94904,0.95423,0.95904,0.96349,0.96751,0.97109,0.97431
-0.97729,0.97991,0.98218,0.98416,0.98592,0.98743,0.98877,0.98989,0.99086,0.99165
-0.99229,0.99291,0.99344,0.99387,0.99428,0.99466,0.99499,0.99530,0.99557,0.99582
-0.99608,0.99631,0.99653,0.99673,0.99689,0.99706,0.99720,0.99735,0.99747,0.99762
-0.99775,0.99786,0.99795,0.99803,0.99812,0.99823,0.99830,0.99839,0.99848,0.99856
-0.99863,0.99870,0.99876,0.99882,0.99888,0.99894,0.99901,0.99907,0.99912,0.99918
-0.99922,0.99926,0.99932,0.99938,0.99943,0.99946,0.99951,0.99955,0.99958,0.99962
-0.99964,0.99967,0.99971,0.99976,0.99981,0.99987,0.99991,0.99997,1.00000
-hwc2x1fract=0.00282,0.00649,0.01120,0.01715,0.02503,0.03489,0.04686,0.06073,0.07660
-0.09394,0.11289,0.13303,0.15429,0.17570,0.19740,0.21912,0.24106,0.26292,0.28456
-0.30593,0.32713,0.34811,0.36891,0.38987,0.40995,0.43007,0.44995,0.46966,0.48954
-0.50886,0.52793,0.54689,0.56586,0.58451,0.60329,0.62154,0.63981,0.65771,0.67513
-0.69269,0.71016,0.72726,0.74359,0.75992,0.77568,0.79104,0.80590,0.82014,0.83358
-0.84665,0.85888,0.87027,0.88081,0.89071,0.89966,0.90797,0.91551,0.92240,0.92893
-0.93490,0.94039,0.94520,0.94965,0.95388,0.95779,0.96142,0.96479,0.96805,0.97099
-0.97367,0.97616,0.97832,0.98034,0.98206,0.98357,0.98488,0.98600,0.98706,0.98793
-0.98874,0.98942,0.99006,0.99061,0.99115,0.99166,0.99212,0.99255,0.99301,0.99339
-0.99370,0.99404,0.99434,0.99464,0.99491,0.99515,0.99537,0.99558,0.99580,0.99602
-0.99625,0.99649,0.99671,0.99693,0.99711,0.99731,0.99751,0.99766,0.99778,0.99791
-0.99805,0.99818,0.99834,0.99846,0.99855,0.99865,0.99876,0.99885,0.99894,0.99902
-0.99910,0.99918,0.99924,0.99930,0.99936,0.99943,0.99947,0.99952,0.99959,0.99964
-0.99967,0.99972,0.99976,0.99979,0.99983,0.99987,0.99991,0.99995,1.00000
-hwc2y1fract=0.00189,0.00437,0.00796,0.01268,0.01931,0.02809,0.03946,0.05361,0.06983
-0.08841,0.10844,0.12939,0.15122,0.17297,0.19463,0.21635,0.23751,0.25820,0.27859
-0.29834,0.31778,0.33715,0.35606,0.37499,0.39382,0.41228,0.43086,0.44913,0.46718
-0.48513,0.50297,0.52122,0.53882,0.55692,0.57474,0.59256,0.61020,0.62773,0.64512
-0.66252,0.67931,0.69625,0.71238,0.72877,0.74491,0.76074,0.77573,0.79078,0.80495
-0.81860,0.83137,0.84340,0.85471,0.86516,0.87507,0.88406,0.89236,0.89980,0.90652
-0.91281,0.91858,0.92396,0.92899,0.93378,0.93813,0.94229,0.94625,0.95001,0.95363
-0.95696,0.96011,0.96301,0.96574,0.96825,0.97064,0.97287,0.97484,0.97672,0.97846
-0.98018,0.98160,0.98298,0.98418,0.98526,0.98633,0.98721,0.98808,0.98884,0.98957
-0.99022,0.99080,0.99132,0.99180,0.99225,0.99268,0.99313,0.99357,0.99401,0.99437
-0.99471,0.99503,0.99529,0.99554,0.99578,0.99598,0.99618,0.99637,0.99657,0.99677
-0.99693,0.99711,0.99728,0.99746,0.99766,0.99782,0.99796,0.99808,0.99823,0.99835
-0.99846,0.99858,0.99872,0.99882,0.99891,0.99902,0.99912,0.99921,0.99930,0.99939
-0.99948,0.99956,0.99963,0.99971,0.99978,0.99984,0.99988,0.99994,1.00000
-hwc2u1fract=0.00156,0.00424,0.00842,0.01473,0.02373,0.03591,0.05072,0.06805,0.08744
-0.10833,0.12980,0.15167,0.17372,0.19581,0.21770,0.23906,0.25996,0.28089,0.30146
-0.32182,0.34209,0.36165,0.38152,0.40063,0.41985,0.43909,0.45814,0.47724,0.49609
-0.51464,0.53343,0.55206,0.57025,0.58844,0.60651,0.62447,0.64237,0.65996,0.67724
-0.69466,0.71149,0.72859,0.74535,0.76198,0.77795,0.79368,0.80892,0.82331,0.83711
-0.84992,0.86182,0.87306,0.88332,0.89267,0.90102,0.90889,0.91587,0.92213,0.92796
-0.93331,0.93846,0.94320,0.94751,0.95167,0.95557,0.95918,0.96257,0.96576,0.96880
-0.97157,0.97406,0.97631,0.97823,0.97996,0.98153,0.98299,0.98422,0.98533,0.98633
-0.98722,0.98809,0.98882,0.98952,0.99017,0.99071,0.99124,0.99177,0.99226,0.99265
-0.99304,0.99346,0.99383,0.99419,0.99457,0.99490,0.99523,0.99555,0.99583,0.99611
-0.99636,0.99662,0.99682,0.99704,0.99723,0.99740,0.99757,0.99771,0.99785,0.99800
-0.99815,0.99829,0.99842,0.99853,0.99862,0.99872,0.99881,0.99889,0.99896,0.99904
-0.99911,0.99916,0.99923,0.99929,0.99935,0.99942,0.99946,0.99951,0.99957,0.99962
-0.99967,0.99972,0.99975,0.99978,0.99982,0.99986,0.99992,0.99996,1.00000
-hwc2v1fract=0.00158,0.00407,0.00797,0.01387,0.02206,0.03355,0.04773,0.06452,0.08356
-0.10442,0.12599,0.14806,0.17010,0.19200,0.21382,0.23534,0.25636,0.27717,0.29774
-0.31812,0.33812,0.35791,0.37705,0.39600,0.41509,0.43412,0.45289,0.47167,0.49031
-0.50884,0.52730,0.54585,0.56407,0.58212,0.60006,0.61801,0.63583,0.65331,0.67073
-0.68820,0.70540,0.72245,0.73894,0.75542,0.77153,0.78715,0.80218,0.81685,0.83077
-0.84396,0.85623,0.86783,0.87837,0.88805,0.89689,0.90478,0.91199,0.91866,0.92445
-0.92997,0.93504,0.93977,0.94403,0.94816,0.95205,0.95578,0.95924,0.96243,0.96560
-0.96852,0.97104,0.97332,0.97548,0.97747,0.97914,0.98064,0.98199,0.98323,0.98433
-0.98536,0.98625,0.98711,0.98787,0.98863,0.98931,0.98990,0.99051,0.99108,0.99157
-0.99209,0.99252,0.99290,0.99330,0.99369,0.99405,0.99439,0.99472,0.99503,0.99535
-0.99563,0.99587,0.99615,0.99640,0.99663,0.99682,0.99704,0.99722,0.99741,0.99760
-0.99777,0.99794,0.99811,0.99827,0.99841,0.99851,0.99865,0.99877,0.99886,0.99896
-0.99904,0.99912,0.99919,0.99925,0.99932,0.99937,0.99940,0.99946,0.99953,0.99959
-0.99963,0.99969,0.99974,0.99978,0.99983,0.99989,0.99993,0.99996,1.00000
-hwc2y2fract=0.00176,0.00410,0.00723,0.01133,0.01696,0.02463,0.03465,0.04724,0.06251
-0.07971,0.09831,0.11812,0.13832,0.15820,0.17828,0.19793,0.21688,0.23560,0.25369
-0.27151,0.28900,0.30632,0.32373,0.34069,0.35720,0.37383,0.39021,0.40667,0.42293
-0.43900,0.45512,0.47122,0.48702,0.50263,0.51787,0.53271,0.54747,0.56211,0.57635
-0.58995,0.60304,0.61572,0.62822,0.64011,0.65187,0.66319,0.67409,0.68453,0.69493
-0.70498,0.71486,0.72479,0.73440,0.74361,0.75293,0.76231,0.77172,0.78120,0.79051
-0.80001,0.80955,0.81897,0.82859,0.83821,0.84788,0.85743,0.86694,0.87630,0.88540
-0.89430,0.90285,0.91078,0.91841,0.92546,0.93194,0.93804,0.94349,0.94846,0.95300
-0.95715,0.96093,0.96446,0.96766,0.97045,0.97295,0.97540,0.97753,0.97937,0.98110
-0.98269,0.98413,0.98533,0.98646,0.98744,0.98836,0.98920,0.98998,0.99069,0.99133
-0.99192,0.99251,0.99302,0.99347,0.99389,0.99432,0.99469,0.99507,0.99541,0.99575
-0.99603,0.99627,0.99649,0.99673,0.99695,0.99712,0.99731,0.99747,0.99762,0.99781
-0.99800,0.99814,0.99828,0.99843,0.99857,0.99872,0.99886,0.99900,0.99912,0.99922
-0.99932,0.99941,0.99952,0.99961,0.99970,0.99978,0.99986,0.99994,1.00000
-hwc2x2fract=0.00279,0.00651,0.01147,0.01804,0.02673,0.03748,0.05021,0.06558,0.08274
-0.10160,0.12165,0.14276,0.16451,0.18676,0.20891,0.23091,0.25266,0.27384,0.29508
-0.31632,0.33717,0.35768,0.37766,0.39763,0.41747,0.43736,0.45686,0.47616,0.49525
-0.51418,0.53309,0.55170,0.56999,0.58823,0.60620,0.62427,0.64203,0.65959,0.67702
-0.69461,0.71153,0.72839,0.74470,0.76116,0.77699,0.79246,0.80718,0.82121,0.83496
-0.84787,0.86009,0.87155,0.88195,0.89168,0.90050,0.90851,0.91583,0.92258,0.92879
-0.93451,0.93976,0.94453,0.94902,0.95315,0.95700,0.96057,0.96396,0.96712,0.97005
-0.97269,0.97517,0.97737,0.97937,0.98116,0.98278,0.98423,0.98543,0.98650,0.98745
-0.98835,0.98912,0.98979,0.99040,0.99098,0.99149,0.99197,0.99242,0.99280,0.99321
-0.99355,0.99391,0.99421,0.99456,0.99487,0.99517,0.99541,0.99566,0.99593,0.99619
-0.99640,0.99663,0.99682,0.99702,0.99717,0.99737,0.99749,0.99763,0.99775,0.99788
-0.99800,0.99814,0.99824,0.99835,0.99846,0.99858,0.99867,0.99876,0.99886,0.99895
-0.99903,0.99910,0.99917,0.99923,0.99932,0.99939,0.99943,0.99948,0.99954,0.99959
-0.99964,0.99971,0.99976,0.99980,0.99984,0.99989,0.99993,0.99997,1.00000
diff --git a/PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_6gev.param b/PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_6gev.param
deleted file mode 100644
index e58c62cb..00000000
--- a/PARAM/HMS/DC/CALIB/KPP_Spring_2017/hdc_calib_6gev.param
+++ /dev/null
@@ -1,175 +0,0 @@
-; Lookup Table: RUN 303
-; number of bins in Carlos's time to distance lookup table
-hdriftbins = 138
-; number of 1st bin in Carlos's table in ns
-hdrift1stbin=0
-; bin size in ns
-hdriftbinsz=2
-hwc1x1fract=0.0020833,0.00489,0.00876,0.01394,0.02062,0.02905,0.03922,0.05139,0.06502
-0.08048,0.09728,0.11528,0.13442,0.15422,0.17474,0.19559,0.21654,0.23774,0.25912
-0.28047,0.30213,0.32359,0.34477,0.36578,0.38669,0.40776,0.42815,0.44870,0.46871
-0.48868,0.50838,0.52755,0.54678,0.56563,0.58450,0.60268,0.62064,0.63843,0.65606
-0.67308,0.69026,0.70691,0.72339,0.73947,0.75507,0.77054,0.78552,0.79999,0.81397
-0.82764,0.84038,0.85263,0.86438,0.87542,0.88567,0.89528,0.90434,0.91280,0.92063
-0.92797,0.93458,0.94070,0.94661,0.95206,0.95702,0.96143,0.96553,0.96926,0.97273
-0.97587,0.97857,0.98096,0.98307,0.98483,0.98646,0.98787,0.98906,0.99000,0.99095
-0.99167,0.99232,0.99290,0.99345,0.99391,0.99435,0.99474,0.99507,0.99536,0.99566
-0.99590,0.99614,0.99635,0.99655,0.99674,0.99693,0.99711,0.99727,0.99744,0.99762
-0.99778,0.99794,0.99807,0.99818,0.99831,0.99844,0.99854,0.99862,0.99869,0.99878
-0.99886,0.99892,0.99898,0.99904,0.99910,0.99916,0.99921,0.99928,0.99932,0.99936
-0.99939,0.99944,0.99949,0.99952,0.99957,0.99960,0.99963,0.99966,0.99969,0.99973
-0.99977,0.99980,0.99984,0.99987,0.99989,0.99991,0.99994,0.99996,1.00000
-hwc1y1fract=0.00205,0.00455,0.00768,0.01195,0.01753,0.02471,0.03370,0.04490,0.05814
-0.07344,0.09075,0.10958,0.12956,0.15050,0.17182,0.19342,0.21512,0.23648,0.25785
-0.27889,0.29942,0.31985,0.33992,0.36003,0.37993,0.39944,0.41896,0.43804,0.45674
-0.47550,0.49399,0.51218,0.53005,0.54795,0.56572,0.58314,0.60048,0.61775,0.63452
-0.65122,0.66764,0.68401,0.69999,0.71549,0.73103,0.74641,0.76143,0.77607,0.79026
-0.80367,0.81676,0.82955,0.84167,0.85325,0.86410,0.87444,0.88405,0.89306,0.90131
-0.90895,0.91620,0.92291,0.92919,0.93505,0.94046,0.94567,0.95057,0.95503,0.95917
-0.96294,0.96641,0.96971,0.97263,0.97529,0.97777,0.97994,0.98189,0.98371,0.98539
-0.98682,0.98816,0.98923,0.99031,0.99117,0.99194,0.99266,0.99332,0.99388,0.99444
-0.99489,0.99532,0.99566,0.99602,0.99630,0.99655,0.99678,0.99699,0.99717,0.99735
-0.99751,0.99765,0.99779,0.99792,0.99805,0.99818,0.99831,0.99845,0.99857,0.99870
-0.99884,0.99896,0.99907,0.99913,0.99922,0.99927,0.99932,0.99938,0.99942,0.99946
-0.99950,0.99955,0.99959,0.99962,0.99966,0.99970,0.99974,0.99978,0.99981,0.99985
-0.99987,0.99988,0.99991,0.99993,0.99994,0.99996,0.99997,0.99999,1.00000
-hwc1u1fract=0.00163,0.00438,0.00852,0.01456,0.02322,0.03445,0.04830,0.06440,0.08241
-0.10195,0.12225,0.14341,0.16483,0.18632,0.20821,0.22974,0.25135,0.27244,0.29345
-0.31390,0.33434,0.35483,0.37481,0.39457,0.41407,0.43316,0.45251,0.47151,0.49016
-0.50897,0.52720,0.54549,0.56342,0.58131,0.59852,0.61614,0.63295,0.64993,0.66659
-0.68319,0.69957,0.71570,0.73149,0.74718,0.76244,0.77719,0.79158,0.80576,0.81926
-0.83227,0.84452,0.85632,0.86729,0.87761,0.88740,0.89658,0.90497,0.91252,0.91972
-0.92645,0.93255,0.93836,0.94368,0.94880,0.95353,0.95805,0.96223,0.96595,0.96935
-0.97248,0.97532,0.97786,0.98022,0.98236,0.98407,0.98562,0.98703,0.98823,0.98921
-0.99015,0.99095,0.99168,0.99236,0.99297,0.99347,0.99393,0.99435,0.99471,0.99507
-0.99539,0.99572,0.99600,0.99626,0.99645,0.99669,0.99694,0.99715,0.99733,0.99750
-0.99764,0.99779,0.99790,0.99803,0.99814,0.99824,0.99836,0.99846,0.99858,0.99868
-0.99879,0.99886,0.99892,0.99898,0.99904,0.99910,0.99916,0.99920,0.99925,0.99929
-0.99934,0.99938,0.99942,0.99946,0.99950,0.99955,0.99959,0.99964,0.99968,0.99972
-0.99975,0.99977,0.99980,0.99984,0.99987,0.99991,0.99995,0.99998,1.00000
-hwc1v1fract=0.00326,0.00757,0.01344,0.02136,0.03133,0.04381,0.05851,0.07537,0.09402
-0.11379,0.13470,0.15577,0.17671,0.19840,0.21975,0.24141,0.26240,0.28335,0.30406
-0.32477,0.34510,0.36494,0.38474,0.40449,0.42400,0.44309,0.46202,0.48081,0.49929
-0.51791,0.53613,0.55407,0.57212,0.58982,0.60751,0.62458,0.64179,0.65867,0.67544
-0.69171,0.70787,0.72383,0.73970,0.75520,0.77045,0.78516,0.79926,0.81315,0.82651
-0.83940,0.85139,0.86268,0.87328,0.88328,0.89254,0.90106,0.90906,0.91640,0.92333
-0.92974,0.93563,0.94125,0.94646,0.95143,0.95595,0.96020,0.96407,0.96776,0.97094
-0.97390,0.97646,0.97882,0.98089,0.98270,0.98438,0.98584,0.98707,0.98823,0.98923
-0.99011,0.99088,0.99162,0.99225,0.99278,0.99329,0.99374,0.99416,0.99454,0.99486
-0.99517,0.99546,0.99572,0.99597,0.99620,0.99639,0.99658,0.99674,0.99695,0.99713
-0.99729,0.99744,0.99757,0.99769,0.99783,0.99795,0.99806,0.99818,0.99828,0.99836
-0.99843,0.99853,0.99861,0.99869,0.99876,0.99883,0.99890,0.99895,0.99900,0.99906
-0.99911,0.99917,0.99922,0.99927,0.99933,0.99937,0.99942,0.99947,0.99952,0.99956
-0.99961,0.99967,0.99972,0.99977,0.99982,0.99987,0.99991,0.99996,1.00000
-hwc1y2fract=0.00193,0.00455,0.00809,0.01310,0.01984,0.02852,0.03980,0.05332,0.06932
-0.08717,0.10672,0.12719,0.14894,0.17063,0.19259,0.21465,0.23669,0.25832,0.27981
-0.30063,0.32150,0.34168,0.36171,0.38169,0.40121,0.42077,0.43999,0.45896,0.47755
-0.49607,0.51430,0.53253,0.55062,0.56831,0.58598,0.60344,0.62062,0.63795,0.65466
-0.67133,0.68776,0.70361,0.71950,0.73518,0.75072,0.76582,0.78047,0.79478,0.80840
-0.82153,0.83428,0.84640,0.85815,0.86919,0.87945,0.88897,0.89792,0.90626,0.91375
-0.92098,0.92753,0.93366,0.93938,0.94465,0.94961,0.95418,0.95848,0.96232,0.96580
-0.96912,0.97210,0.97492,0.97743,0.97973,0.98174,0.98358,0.98521,0.98663,0.98793
-0.98907,0.99004,0.99093,0.99183,0.99258,0.99323,0.99381,0.99432,0.99476,0.99516
-0.99551,0.99586,0.99613,0.99640,0.99662,0.99683,0.99702,0.99715,0.99731,0.99746
-0.99760,0.99774,0.99785,0.99796,0.99806,0.99818,0.99830,0.99840,0.99851,0.99860
-0.99871,0.99880,0.99888,0.99897,0.99905,0.99912,0.99918,0.99924,0.99928,0.99932
-0.99935,0.99938,0.99942,0.99947,0.99951,0.99956,0.99961,0.99965,0.99969,0.99973
-0.99977,0.99979,0.99982,0.99984,0.99987,0.99990,0.99994,0.99997,1.00000
-hwc1x2fract=0.00214,0.00519,0.00938,0.01501,0.02253,0.03198,0.04335,0.05660,0.07178
-0.08830,0.10580,0.12474,0.14447,0.16464,0.18488,0.20578,0.22678,0.24791,0.26913
-0.29016,0.31137,0.33272,0.35362,0.37431,0.39509,0.41542,0.43568,0.45557,0.47572
-0.49528,0.51454,0.53377,0.55269,0.57108,0.58959,0.60758,0.62559,0.64321,0.66102
-0.67839,0.69534,0.71201,0.72863,0.74462,0.76028,0.77534,0.79034,0.80487,0.81888
-0.83210,0.84518,0.85753,0.86894,0.87969,0.88974,0.89932,0.90804,0.91621,0.92378
-0.93098,0.93745,0.94357,0.94904,0.95423,0.95904,0.96349,0.96751,0.97109,0.97431
-0.97729,0.97991,0.98218,0.98416,0.98592,0.98743,0.98877,0.98989,0.99086,0.99165
-0.99229,0.99291,0.99344,0.99387,0.99428,0.99466,0.99499,0.99530,0.99557,0.99582
-0.99608,0.99631,0.99653,0.99673,0.99689,0.99706,0.99720,0.99735,0.99747,0.99762
-0.99775,0.99786,0.99795,0.99803,0.99812,0.99823,0.99830,0.99839,0.99848,0.99856
-0.99863,0.99870,0.99876,0.99882,0.99888,0.99894,0.99901,0.99907,0.99912,0.99918
-0.99922,0.99926,0.99932,0.99938,0.99943,0.99946,0.99951,0.99955,0.99958,0.99962
-0.99964,0.99967,0.99971,0.99976,0.99981,0.99987,0.99991,0.99997,1.00000
-hwc2x1fract=0.00282,0.00649,0.01120,0.01715,0.02503,0.03489,0.04686,0.06073,0.07660
-0.09394,0.11289,0.13303,0.15429,0.17570,0.19740,0.21912,0.24106,0.26292,0.28456
-0.30593,0.32713,0.34811,0.36891,0.38987,0.40995,0.43007,0.44995,0.46966,0.48954
-0.50886,0.52793,0.54689,0.56586,0.58451,0.60329,0.62154,0.63981,0.65771,0.67513
-0.69269,0.71016,0.72726,0.74359,0.75992,0.77568,0.79104,0.80590,0.82014,0.83358
-0.84665,0.85888,0.87027,0.88081,0.89071,0.89966,0.90797,0.91551,0.92240,0.92893
-0.93490,0.94039,0.94520,0.94965,0.95388,0.95779,0.96142,0.96479,0.96805,0.97099
-0.97367,0.97616,0.97832,0.98034,0.98206,0.98357,0.98488,0.98600,0.98706,0.98793
-0.98874,0.98942,0.99006,0.99061,0.99115,0.99166,0.99212,0.99255,0.99301,0.99339
-0.99370,0.99404,0.99434,0.99464,0.99491,0.99515,0.99537,0.99558,0.99580,0.99602
-0.99625,0.99649,0.99671,0.99693,0.99711,0.99731,0.99751,0.99766,0.99778,0.99791
-0.99805,0.99818,0.99834,0.99846,0.99855,0.99865,0.99876,0.99885,0.99894,0.99902
-0.99910,0.99918,0.99924,0.99930,0.99936,0.99943,0.99947,0.99952,0.99959,0.99964
-0.99967,0.99972,0.99976,0.99979,0.99983,0.99987,0.99991,0.99995,1.00000
-hwc2y1fract=0.00189,0.00437,0.00796,0.01268,0.01931,0.02809,0.03946,0.05361,0.06983
-0.08841,0.10844,0.12939,0.15122,0.17297,0.19463,0.21635,0.23751,0.25820,0.27859
-0.29834,0.31778,0.33715,0.35606,0.37499,0.39382,0.41228,0.43086,0.44913,0.46718
-0.48513,0.50297,0.52122,0.53882,0.55692,0.57474,0.59256,0.61020,0.62773,0.64512
-0.66252,0.67931,0.69625,0.71238,0.72877,0.74491,0.76074,0.77573,0.79078,0.80495
-0.81860,0.83137,0.84340,0.85471,0.86516,0.87507,0.88406,0.89236,0.89980,0.90652
-0.91281,0.91858,0.92396,0.92899,0.93378,0.93813,0.94229,0.94625,0.95001,0.95363
-0.95696,0.96011,0.96301,0.96574,0.96825,0.97064,0.97287,0.97484,0.97672,0.97846
-0.98018,0.98160,0.98298,0.98418,0.98526,0.98633,0.98721,0.98808,0.98884,0.98957
-0.99022,0.99080,0.99132,0.99180,0.99225,0.99268,0.99313,0.99357,0.99401,0.99437
-0.99471,0.99503,0.99529,0.99554,0.99578,0.99598,0.99618,0.99637,0.99657,0.99677
-0.99693,0.99711,0.99728,0.99746,0.99766,0.99782,0.99796,0.99808,0.99823,0.99835
-0.99846,0.99858,0.99872,0.99882,0.99891,0.99902,0.99912,0.99921,0.99930,0.99939
-0.99948,0.99956,0.99963,0.99971,0.99978,0.99984,0.99988,0.99994,1.00000
-hwc2u1fract=0.00156,0.00424,0.00842,0.01473,0.02373,0.03591,0.05072,0.06805,0.08744
-0.10833,0.12980,0.15167,0.17372,0.19581,0.21770,0.23906,0.25996,0.28089,0.30146
-0.32182,0.34209,0.36165,0.38152,0.40063,0.41985,0.43909,0.45814,0.47724,0.49609
-0.51464,0.53343,0.55206,0.57025,0.58844,0.60651,0.62447,0.64237,0.65996,0.67724
-0.69466,0.71149,0.72859,0.74535,0.76198,0.77795,0.79368,0.80892,0.82331,0.83711
-0.84992,0.86182,0.87306,0.88332,0.89267,0.90102,0.90889,0.91587,0.92213,0.92796
-0.93331,0.93846,0.94320,0.94751,0.95167,0.95557,0.95918,0.96257,0.96576,0.96880
-0.97157,0.97406,0.97631,0.97823,0.97996,0.98153,0.98299,0.98422,0.98533,0.98633
-0.98722,0.98809,0.98882,0.98952,0.99017,0.99071,0.99124,0.99177,0.99226,0.99265
-0.99304,0.99346,0.99383,0.99419,0.99457,0.99490,0.99523,0.99555,0.99583,0.99611
-0.99636,0.99662,0.99682,0.99704,0.99723,0.99740,0.99757,0.99771,0.99785,0.99800
-0.99815,0.99829,0.99842,0.99853,0.99862,0.99872,0.99881,0.99889,0.99896,0.99904
-0.99911,0.99916,0.99923,0.99929,0.99935,0.99942,0.99946,0.99951,0.99957,0.99962
-0.99967,0.99972,0.99975,0.99978,0.99982,0.99986,0.99992,0.99996,1.00000
-hwc2v1fract=0.00158,0.00407,0.00797,0.01387,0.02206,0.03355,0.04773,0.06452,0.08356
-0.10442,0.12599,0.14806,0.17010,0.19200,0.21382,0.23534,0.25636,0.27717,0.29774
-0.31812,0.33812,0.35791,0.37705,0.39600,0.41509,0.43412,0.45289,0.47167,0.49031
-0.50884,0.52730,0.54585,0.56407,0.58212,0.60006,0.61801,0.63583,0.65331,0.67073
-0.68820,0.70540,0.72245,0.73894,0.75542,0.77153,0.78715,0.80218,0.81685,0.83077
-0.84396,0.85623,0.86783,0.87837,0.88805,0.89689,0.90478,0.91199,0.91866,0.92445
-0.92997,0.93504,0.93977,0.94403,0.94816,0.95205,0.95578,0.95924,0.96243,0.96560
-0.96852,0.97104,0.97332,0.97548,0.97747,0.97914,0.98064,0.98199,0.98323,0.98433
-0.98536,0.98625,0.98711,0.98787,0.98863,0.98931,0.98990,0.99051,0.99108,0.99157
-0.99209,0.99252,0.99290,0.99330,0.99369,0.99405,0.99439,0.99472,0.99503,0.99535
-0.99563,0.99587,0.99615,0.99640,0.99663,0.99682,0.99704,0.99722,0.99741,0.99760
-0.99777,0.99794,0.99811,0.99827,0.99841,0.99851,0.99865,0.99877,0.99886,0.99896
-0.99904,0.99912,0.99919,0.99925,0.99932,0.99937,0.99940,0.99946,0.99953,0.99959
-0.99963,0.99969,0.99974,0.99978,0.99983,0.99989,0.99993,0.99996,1.00000
-hwc2y2fract=0.00176,0.00410,0.00723,0.01133,0.01696,0.02463,0.03465,0.04724,0.06251
-0.07971,0.09831,0.11812,0.13832,0.15820,0.17828,0.19793,0.21688,0.23560,0.25369
-0.27151,0.28900,0.30632,0.32373,0.34069,0.35720,0.37383,0.39021,0.40667,0.42293
-0.43900,0.45512,0.47122,0.48702,0.50263,0.51787,0.53271,0.54747,0.56211,0.57635
-0.58995,0.60304,0.61572,0.62822,0.64011,0.65187,0.66319,0.67409,0.68453,0.69493
-0.70498,0.71486,0.72479,0.73440,0.74361,0.75293,0.76231,0.77172,0.78120,0.79051
-0.80001,0.80955,0.81897,0.82859,0.83821,0.84788,0.85743,0.86694,0.87630,0.88540
-0.89430,0.90285,0.91078,0.91841,0.92546,0.93194,0.93804,0.94349,0.94846,0.95300
-0.95715,0.96093,0.96446,0.96766,0.97045,0.97295,0.97540,0.97753,0.97937,0.98110
-0.98269,0.98413,0.98533,0.98646,0.98744,0.98836,0.98920,0.98998,0.99069,0.99133
-0.99192,0.99251,0.99302,0.99347,0.99389,0.99432,0.99469,0.99507,0.99541,0.99575
-0.99603,0.99627,0.99649,0.99673,0.99695,0.99712,0.99731,0.99747,0.99762,0.99781
-0.99800,0.99814,0.99828,0.99843,0.99857,0.99872,0.99886,0.99900,0.99912,0.99922
-0.99932,0.99941,0.99952,0.99961,0.99970,0.99978,0.99986,0.99994,1.00000
-hwc2x2fract=0.00279,0.00651,0.01147,0.01804,0.02673,0.03748,0.05021,0.06558,0.08274
-0.10160,0.12165,0.14276,0.16451,0.18676,0.20891,0.23091,0.25266,0.27384,0.29508
-0.31632,0.33717,0.35768,0.37766,0.39763,0.41747,0.43736,0.45686,0.47616,0.49525
-0.51418,0.53309,0.55170,0.56999,0.58823,0.60620,0.62427,0.64203,0.65959,0.67702
-0.69461,0.71153,0.72839,0.74470,0.76116,0.77699,0.79246,0.80718,0.82121,0.83496
-0.84787,0.86009,0.87155,0.88195,0.89168,0.90050,0.90851,0.91583,0.92258,0.92879
-0.93451,0.93976,0.94453,0.94902,0.95315,0.95700,0.96057,0.96396,0.96712,0.97005
-0.97269,0.97517,0.97737,0.97937,0.98116,0.98278,0.98423,0.98543,0.98650,0.98745
-0.98835,0.98912,0.98979,0.99040,0.99098,0.99149,0.99197,0.99242,0.99280,0.99321
-0.99355,0.99391,0.99421,0.99456,0.99487,0.99517,0.99541,0.99566,0.99593,0.99619
-0.99640,0.99663,0.99682,0.99702,0.99717,0.99737,0.99749,0.99763,0.99775,0.99788
-0.99800,0.99814,0.99824,0.99835,0.99846,0.99858,0.99867,0.99876,0.99886,0.99895
-0.99903,0.99910,0.99917,0.99923,0.99932,0.99939,0.99943,0.99948,0.99954,0.99959
-0.99964,0.99971,0.99976,0.99980,0.99984,0.99989,0.99993,0.99997,1.00000
diff --git a/PARAM/HMS/DC/CUTS/KPP_Spring_2017/hdc_cuts_6gev.param b/PARAM/HMS/DC/CUTS/KPP_Spring_2017/hdc_cuts_6gev.param
deleted file mode 100644
index 868d7d01..00000000
--- a/PARAM/HMS/DC/CUTS/KPP_Spring_2017/hdc_cuts_6gev.param
+++ /dev/null
@@ -1,22 +0,0 @@
-;Utilize per wire tzero offsets, 1 means true
-h_using_tzero_per_wire = 0
-
-; TEST STAND PARAMETER
-; Custom parameter which should be loaded when aiming to analyze HMS DC
-; data with no tracking
-hsel_using_scin = 0
-; hsel_using_prune = 0
-
-
-; TDC window limits for each plane.
-hdc_tdc_min_win = -14000, -14000, -14000, -14000, -14000, -14000
- -14000, -14000, -14000, -14000, -14000, -14000
-hdc_tdc_max_win = -6000, -6000, -6000, -6000, -6000, -6000
- -6000, -6000, -6000, -6000, -8000, -6000
-hdc_fix_lr = 0
-hdc_fix_propcorr = 0
-
-; Zero time correction for each plane in ns that is added to TDC time.
-hdc_plane_time_zero = 1312.50,1316.50,1310.8,1313.0,1311.45,1312.76,
- 1315.00,1313.40,1310.8,1312.0,1317.40,1313.50
-
diff --git a/PARAM/HMS/DC/GEOM/hdc_geom_6gev.param b/PARAM/HMS/DC/GEOM/hdc_geom_6gev.param
deleted file mode 100644
index e94ed1bf..00000000
--- a/PARAM/HMS/DC/GEOM/hdc_geom_6gev.param
+++ /dev/null
@@ -1,132 +0,0 @@
-; Geometrical parameters
-
-; Conversion factor from TDC clicks to ns.
-hdc_tdc_time_per_channel = -0.10
-
-; Number of drift chambers.
-hdc_num_chambers = 2
-
-; Total number of planes.
-hdc_num_planes = 12
-
-; Names of planes.
-hdc_plane_names = "1x1 1y1 1u1 1v1 1y2 1x2 2x1 2y1 2u1 2v1 2y2 2x2"
-
-; Chamber index for each plane.
-hdc_chamber_planes = 1, 1, 1, 1, 1, 1
- 2, 2, 2, 2, 2, 2
-
-; Number of wires in each plane.
-hdc_nrwire = 113, 52, 107, 107, 52, 113
- 113, 52, 107, 107, 52, 113
-
-
-; Sigma of wire chamber resolution for each plane.
-; From SANE.
-hdc_sigma = 0.020, 0.020, 0.020, 0.020, 0.020, 0.020
- 0.020, 0.020, 0.020, 0.020, 0.020, 0.020
-
-; For wire velocity corrections.
-; From SANE.
-hdc_wire_velocity = 12.0
-hdc_central_time = 7, 9, 3, 4, 6, 5
- 7, 5, 3, 4, 6, 6
-hdc_drifttime_sign = -1, -1, -1, -1, -1, -1
- -1, -1, -1, -1, -1, -1
-
-
-; CHAMBER POSITION PARAMETERS
-
-; x, y and z position of center for each wire chamber in cm.
-; From SANE with correction from C1768 using 2007 controls.
-hdc_xcenter = 1.6345 - 0.37 ; TODO - final survey
- 2.7825 - 0.40
-hdc_ycenter = 1.2052 - 0.11 ; TODO - final survey
- 2.6510 - 0.06
-hdc_1_zpos = -51.920 - 0.44 ; TODO - final survey
-hdc_2_zpos = 29.291 - 1.76 ; TODO - final survey
-
-; Roll, pitch and yaw for each wire chamber in degrees.
-; From C1768 using 2007 controls.
-pdc_1_roll = 0.155 ; TODO - final survey
-pdc_2_roll = 0.186 ; TODO - final survey
-pdc_1_pitch = 0.080 ; TODO - final survey
-pdc_2_pitch = 0.077 ; TODO - final survey
-pdc_1_yaw = 0.324 ; TODO - final survey
-pdc_2_yaw = 0.118 ; TODO - final survey
-
-
-; PLANE POSITION PARAMETERS
-
-; Wire number of center of wire chamber for each plane.
-; From SANE.
-hdc_central_wire = 57.257, 26.240, 54.001, 53.999, 26.760 , 56.743
- 57.244, 26.242, 53.998, 54.002, 26.758 , 56.756
-
-; Distance between wires for each plane in cm.
-; From SANE.
-hdc_pitch = 1.000252, 1.000252, 1.000252, 1.000252, 1.000252, 1.000252
- 1.000252, 1.000252, 1.000252, 1.000252, 1.000252, 1.000252
-
-; Order in which wires are counted in each plane.
-hdc_wire_counting = 1, 1, 0, 1, 0, 0
- 1, 1, 0, 1, 0, 0
-
-; z position in cm of each plane measured from focal plane.
-; From SANE.
-hdc_zpos = hdc_1_zpos - 3.6
- hdc_1_zpos - 1.8
- hdc_1_zpos - 0.0
- hdc_1_zpos + 1.8
- hdc_1_zpos + 3.6
- hdc_1_zpos + 5.4
- hdc_2_zpos - 3.6
- hdc_2_zpos - 1.8
- hdc_2_zpos - 0.0
- hdc_2_zpos + 1.8
- hdc_2_zpos + 3.6
- hdc_2_zpos + 5.4
-
-; Alpha angle of wires for each plane in radians.
-; From SANE.
-hdc_alpha_angle = ( 90.00000 + pdc_1_roll)*raddeg
- ( 0.00000 + pdc_1_roll)*raddeg
- ( 74.92500 + pdc_1_roll)*raddeg
- (105.07500 + pdc_1_roll)*raddeg
- ( 0.00000 + pdc_1_roll)*raddeg
- ( 90.00000 + pdc_1_roll)*raddeg
- ( 89.90814 + pdc_2_roll)*raddeg
- ( 0.01611 + pdc_2_roll)*raddeg
- ( 74.85000 + pdc_2_roll)*raddeg
- (105.05000 + pdc_2_roll)*raddeg
- ( 0.01611 + pdc_2_roll)*raddeg
- ( 89.90814 + pdc_2_roll)*raddeg
-
-; Beta angle of wires for each plane in radians.
-hdc_beta_angle = pdc_1_pitch*raddeg
- pdc_1_pitch*raddeg
- pdc_1_pitch*raddeg
- pdc_1_pitch*raddeg
- pdc_1_pitch*raddeg
- pdc_1_pitch*raddeg
- pdc_2_pitch*raddeg
- pdc_2_pitch*raddeg
- pdc_2_pitch*raddeg
- pdc_2_pitch*raddeg
- pdc_2_pitch*raddeg
- pdc_2_pitch*raddeg
-
-; Gamma angle of wires for each plane in radians
-hdc_gamma_angle = pdc_1_yaw*raddeg
- pdc_1_yaw*raddeg
- pdc_1_yaw*raddeg
- pdc_1_yaw*raddeg
- pdc_1_yaw*raddeg
- pdc_1_yaw*raddeg
- pdc_2_yaw*raddeg
- pdc_2_yaw*raddeg
- pdc_2_yaw*raddeg
- pdc_2_yaw*raddeg
- pdc_2_yaw*raddeg
- pdc_2_yaw*raddeg
-
diff --git a/PARAM/HMS/DC/CALIB/hdc_calib.param b/PARAM/HMS/DC/hdc_calib.param
similarity index 100%
rename from PARAM/HMS/DC/CALIB/hdc_calib.param
rename to PARAM/HMS/DC/hdc_calib.param
diff --git a/PARAM/HMS/DC/CUTS/hdc_cuts.param b/PARAM/HMS/DC/hdc_cuts.param
similarity index 100%
rename from PARAM/HMS/DC/CUTS/hdc_cuts.param
rename to PARAM/HMS/DC/hdc_cuts.param
diff --git a/PARAM/HMS/DC/GEOM/hdc_geom.param b/PARAM/HMS/DC/hdc_geom.param
similarity index 100%
rename from PARAM/HMS/DC/GEOM/hdc_geom.param
rename to PARAM/HMS/DC/hdc_geom.param
diff --git a/PARAM/HMS/DC/CALIB/hdc_tzero_per_wire.param b/PARAM/HMS/DC/hdc_tzero_per_wire.param
similarity index 100%
rename from PARAM/HMS/DC/CALIB/hdc_tzero_per_wire.param
rename to PARAM/HMS/DC/hdc_tzero_per_wire.param
diff --git a/PARAM/HMS/HODO/CALIB/KPP_Spring_2017/hhodo_calib_303.param b/PARAM/HMS/HODO/CALIB/KPP_Spring_2017/hhodo_calib_303.param
deleted file mode 100644
index 10dde9a3..00000000
--- a/PARAM/HMS/HODO/CALIB/KPP_Spring_2017/hhodo_calib_303.param
+++ /dev/null
@@ -1,172 +0,0 @@
-;HMS Hodo Calibration paramters
-
-
-; new param from KPP HMS run 303
-hhodo_pos_invadc_offset = -0.00, -0.00, -0.70, -0.00
- -0.00, -0.00, -0.31, -2.63
- -0.00, 0.13, -1.03, -0.58
- 1.43, -0.51, -0.87, -0.63
- 0.60, -0.75, -0.66, -1.54
- 1.73, -0.66, -0.82, -1.46
- 0.89, 0.08, -0.92, -0.88
- 2.10, 0.20, -0.32, -0.39
- 0.31, -0.89, -1.14, -2.15
- -0.00, -0.00, -1.52, -0.00
- 0.80, -0.00, -0.75, -0.00
- -0.25, -0.00, -2.36, -0.00
- 0.54, -0.00, -0.00, -0.00
- 0.47, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-hhodo_neg_invadc_offset = -0.00, -0.00, -0.97, -0.00
- -0.00, -0.00, 0.06, -2.16
- -0.00, -0.58, -1.60, -0.95
- -0.09, 0.95, -0.45, -0.49
- -0.79, -0.05, 0.21, -1.82
- 0.32, -1.02, -0.05, -0.52
- 0.02, 0.19, 0.90, 3.75
- -0.35, 0.35, 0.26, -1.65
- -0.27, -1.32, 0.33, -2.44
- -1.42, -0.00, -1.48, -0.00
- 0.14, -0.00, 0.14, -0.00
- 0.24, -0.00, -0.06, -0.00
- 0.16, -0.00, -0.00, -0.00
- -0.83, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-hhodo_pos_invadc_linear = 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 14.56, 15.00, 15.00, 15.00
- 12.91, 15.00, 15.00, 15.00
- 12.81, 14.97, 15.00, 15.00
- 14.29, 15.00, 15.00, 15.00
- 12.94, 14.21, 14.85, 15.00
- 13.27, 13.60, 15.00, 15.00
- 13.44, 15.00, 15.00, 15.00
- 14.24, 15.00, 15.00, 15.00
- 13.24, 15.00, 14.33, 15.00
- 13.20, 15.00, 15.00, 15.00
- 13.94, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
-
-hhodo_neg_invadc_linear = 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 14.56, 15.00, 15.00
- 14.55, 14.16, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 13.47, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 14.69, 14.21, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 14.74, 15.00, 15.00, 15.00
- 14.66, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 13.71, 15.00, 15.00, 15.00
- 12.33, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
- 15.00, 15.00, 15.00, 15.00
-
-hhodo_pos_invadc_adc= -0.00, -0.00, 106.88*0.14, -0.00
- -0.00, -0.00, 109.67*0.14, 122.91*0.14
- -0.00, 102.28*0.14, 127.88*0.14, 117.82*0.14
- 100.32*0.14, 76.55*0.14, 109.30*0.14, 139.97*0.14
- 72.45*0.14, 90.73*0.14, 111.62*0.14, 121.49*0.14
- 59.46*0.14, 83.45*0.14, 116.54*0.14, 123.92*0.14
- 95.04*0.14, 91.79*0.14, 125.49*0.14, 127.74*0.14
- 62.95*0.14, 53.50*0.14, 113.46*0.14, 106.91*0.14
- 78.26*0.14, 49.84*0.14, 100.37*0.14, 141.06*0.14
- 73.52*0.14, -0.00, 101.78*0.14, -0.00
- 94.23*0.14, -0.00, 129.39*0.14, -0.00
- 75.59*0.14, -0.00, 94.17*0.14, -0.00
- 79.87*0.14, -0.00, -0.00, -0.00
- 63.90*0.14, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-hhodo_neg_invadc_adc= -0.00, -0.00, 128.32*0.14, -0.00
- -0.00, -0.00, 113.16*0.14, 159.99*0.14
- -0.00, 68.41*0.14, 116.51*0.14, 119.18*0.14
- 73.18*0.14, 65.95*0.14, 112.50*0.14, 122.16*0.14
- 96.71*0.14, 91.23*0.14, 96.00*0.14, 103.37*0.14
- 52.93*0.14, 87.48*0.14, 103.59*0.14, 122.65*0.14
- 72.72*0.14, 82.28*0.14, 118.40*0.14, 140.72*0.14
- 76.58*0.14, 68.02*0.14, 104.25*0.14, 120.16*0.14
- 73.69*0.14, 98.85*0.14, 91.95*0.14, 119.78*0.14
- 72.26*0.14, -0.00, 89.16*0.14, -0.00
- 70.89*0.14, -0.00, 113.44*0.14, -0.00
- 72.26*0.14, -0.00, 101.96*0.14, -0.00
- 76.14*0.14, -0.00, -0.00, -0.00
- 36.51*0.14, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
- -0.00, -0.00, -0.00, -0.00
-
-hhodo_pos_sigma = 100.00, 100.00, 0.28, 100.00
- 100.00, 100.00, 0.31, 0.47
- 100.00, 0.27, 0.33, 0.34
- 0.26, 0.32, 0.35, 0.44
- 0.30, 0.30, 0.33, 0.51
- 0.38, 0.28, 0.22, 0.41
- 0.25, 0.30, 0.32, 0.46
- 0.35, 0.30, 0.31, 0.34
- 0.26, 0.25, 0.24, 0.41
- 0.27, 100.00, 0.27, 100.00
- 0.25, 100.00, 0.37, 100.00
- 0.26, 100.00, 0.24, 100.00
- 0.34, 100.00, 100.00, 100.00
- 0.37, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
-
-hhodo_neg_sigma = 100.00, 100.00, 0.32, 100.00
- 100.00, 100.00, 0.33, 0.52
- 100.00, 0.31, 0.35, 0.31
- 0.25, 0.30, 0.34, 0.32
- 0.28, 0.32, 0.27, 0.56
- 0.36, 0.33, 0.28, 0.31
- 0.26, 0.31, 0.37, 0.42
- 0.32, 0.30, 0.28, 0.33
- 0.24, 0.28, 0.20, 0.44
- 0.27, 100.00, 0.24, 100.00
- 0.24, 100.00, 0.29, 100.00
- 0.25, 100.00, 0.25, 100.00
- 0.28, 100.00, 100.00, 100.00
- 0.33, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
- 100.00, 100.00, 100.00, 100.00
-hhodo_pos_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
-;
-hhodo_neg_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- hhodo_vel_light = 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
- 15.0,15.0,15.0,15.0
-
\ No newline at end of file
diff --git a/PARAM/HMS/HODO/CUTS/KPP_Spring_2017/hhodo_cuts.param b/PARAM/HMS/HODO/CUTS/KPP_Spring_2017/hhodo_cuts.param
deleted file mode 100644
index cae48924..00000000
--- a/PARAM/HMS/HODO/CUTS/KPP_Spring_2017/hhodo_cuts.param
+++ /dev/null
@@ -1,43 +0,0 @@
-; HMS Hodo Cuts parameters
-
-; Cosmic flag for beta calculation
-hcosmicflag=0
-
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-hhodo_adc_mode=1
-;
-; hhodo_tdc_offset is array of time offsets for all paddles in a plane
-; to move the tdc to between 0 and 4000 channels.
- hhodo_tdc_offset = 1120, 1120, 1120, 1120
-; hhodo_tdc_offset = 1000, 1000, 1000, 1000
-
-; hhodo set min and max fADC time window for all paddles in a plane in units of ns
-; the conversion is 0.0625 ns / channel for flash ADC 250
-hhodo_AdcTimeWindowMin = 0., 0., 0., 0.
-hhodo_AdcTimeWindowMax = 200., 200., 200., 200.
-
-; hstart_time_center center of allowed time window (ns)
- hstart_time_center = 32.
-; hstart_time_slop 1/2 width of time window
- hstart_time_slop = 100.
-; hscin_tdc_min minimum tdc value in hms scin
- hscin_tdc_min = -500
-; hscin_tdc_max maximum allowed tdc value
- hscin_tdc_max = 4000
-; hscin_tdc_to_time scin tdc time per channel
- hscin_tdc_to_time = 0.1
-; tof and you figured out good values
- htof_tolerance = 50.0
-;
-; hms_tof_params
-; hnum_scin_counters, hhodo_zpos, hhodo_center_coord, hhodo_width
-; are all calculated within h_init_scin
-; hhodo_pos_coord and hhodo_neg_coord are not yet used
-;
- hhodo_slop = 2., 2., 4., 4.
-;
-htofusinginvadc=1
\ No newline at end of file
diff --git a/PARAM/HMS/HODO/hhodo_3of4trigger.param b/PARAM/HMS/HODO/hhodo_3of4trigger.param
deleted file mode 100644
index c59e5c44..00000000
--- a/PARAM/HMS/HODO/hhodo_3of4trigger.param
+++ /dev/null
@@ -1,191 +0,0 @@
-hcosmicflag=1
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-hhodo_adc_mode=1
-;
-; hhodo_tdc_offset is array of time offsets for all paddles in a plane
-; to move the tdc to between 0 and 4000 channels.
- hhodo_tdc_offset = 1050, 1050, 1050, 1050
-; hstart_time_center center of allowed time window (ns)
- hstart_time_center = 32.
-; hstart_time_slop 1/2 width of time window
- hstart_time_slop = 25.
-; hscin_tdc_min minimum tdc value in hms scin
- hscin_tdc_min = 0
-; hscin_tdc_max maximum allowed tdc value
- hscin_tdc_max = 4000
-; hscin_tdc_to_time scin tdc time per channel
- hscin_tdc_to_time = 0.1
-; tof and you figured out good values
- htof_tolerance = 30.0
-;
-; hms_tof_params
-; hnum_scin_counters, hhodo_zpos, hhodo_center_coord, hhodo_width
-; are all calculated within h_init_scin
-; hhodo_pos_coord and hhodo_neg_coord are not yet used
-;
- hhodo_slop = 2., 2., 4., 4.
-;
-htofusinginvadc=1
-;
-
-hhodo_pos_invadc_offset = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-hhodo_neg_invadc_offset = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-hhodo_pos_invadc_linear = 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
-hhodo_neg_invadc_linear = 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
-
-hhodo_pos_invadc_adc = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-hhodo_neg_invadc_adc = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
- hhodo_vel_light = 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
-;
- hhodo_pos_sigma = .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
-;
- hhodo_neg_sigma = .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
-
-
-
-;
-hhodo_pos_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
-;
-hhodo_neg_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
-
diff --git a/PARAM/HMS/HODO/hhodo_4of4trigger.param b/PARAM/HMS/HODO/hhodo_4of4trigger.param
deleted file mode 100644
index 54596af4..00000000
--- a/PARAM/HMS/HODO/hhodo_4of4trigger.param
+++ /dev/null
@@ -1,191 +0,0 @@
-hcosmicflag=1
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-hhodo_adc_mode=1
-;
-; hhodo_tdc_offset is array of time offsets for all paddles in a plane
-; to move the tdc to between 0 and 4000 channels.
- hhodo_tdc_offset = 1280, 1280, 1280, 1290
-; hstart_time_center center of allowed time window (ns)
- hstart_time_center = 32.
-; hstart_time_slop 1/2 width of time window
- hstart_time_slop = 25.
-; hscin_tdc_min minimum tdc value in hms scin
- hscin_tdc_min = 0
-; hscin_tdc_max maximum allowed tdc value
- hscin_tdc_max = 4000
-; hscin_tdc_to_time scin tdc time per channel
- hscin_tdc_to_time = 0.1
-; tof and you figured out good values
- htof_tolerance = 30.0
-;
-; hms_tof_params
-; hnum_scin_counters, hhodo_zpos, hhodo_center_coord, hhodo_width
-; are all calculated within h_init_scin
-; hhodo_pos_coord and hhodo_neg_coord are not yet used
-;
- hhodo_slop = 2., 2., 4., 4.
-;
-htofusinginvadc=1
-;
-
-hhodo_pos_invadc_offset = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-hhodo_neg_invadc_offset = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-hhodo_pos_invadc_linear = 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
-hhodo_neg_invadc_linear = 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
-
-hhodo_pos_invadc_adc = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
-hhodo_neg_invadc_adc = 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
- 0.000, 0.0000, 0.000, 0.000
-;
- hhodo_vel_light = 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
- 14.0,14.8,15.5,15.8
-;
- hhodo_pos_sigma = .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
-;
- hhodo_neg_sigma = .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
- .3,.3,.3,.3,.3,.3,.3,.3
-
-
-
-;
-hhodo_pos_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
-;
-hhodo_neg_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
- 1000,1000,1000,1000,1000,1000,1000,1000
-
diff --git a/PARAM/HMS/HODO/CALIB/hhodo_calib.param b/PARAM/HMS/HODO/hhodo_calib.param
similarity index 100%
rename from PARAM/HMS/HODO/CALIB/hhodo_calib.param
rename to PARAM/HMS/HODO/hhodo_calib.param
diff --git a/PARAM/HMS/HODO/CUTS/hhodo_cuts.param b/PARAM/HMS/HODO/hhodo_cuts.param
similarity index 100%
rename from PARAM/HMS/HODO/CUTS/hhodo_cuts.param
rename to PARAM/HMS/HODO/hhodo_cuts.param
diff --git a/PARAM/HMS/HODO/GEOM/hhodo_geom.param b/PARAM/HMS/HODO/hhodo_geom.param
similarity index 100%
rename from PARAM/HMS/HODO/GEOM/hhodo_geom.param
rename to PARAM/HMS/HODO/hhodo_geom.param
diff --git a/PARAM/HMS/HODO/CALIB/htofcalib.param b/PARAM/HMS/HODO/htofcalib.param
similarity index 100%
rename from PARAM/HMS/HODO/CALIB/htofcalib.param
rename to PARAM/HMS/HODO/htofcalib.param
diff --git a/PARAM/SHMS/AERO/CALIB/paero_calib.param b/PARAM/SHMS/AERO/CALIB/paero_calib.param
deleted file mode 120000
index 4b55a5d9..00000000
--- a/PARAM/SHMS/AERO/CALIB/paero_calib.param
+++ /dev/null
@@ -1 +0,0 @@
-Fall_Comm_2017/paero_calib_1585.param
\ No newline at end of file
diff --git a/PARAM/SHMS/AERO/CALIB/Fall_Comm_2017/paero_calib_1585.param b/PARAM/SHMS/AERO/paero_calib.param
similarity index 100%
rename from PARAM/SHMS/AERO/CALIB/Fall_Comm_2017/paero_calib_1585.param
rename to PARAM/SHMS/AERO/paero_calib.param
diff --git a/PARAM/SHMS/AERO/CUTS/paero_cuts.param b/PARAM/SHMS/AERO/paero_cuts.param
similarity index 100%
rename from PARAM/SHMS/AERO/CUTS/paero_cuts.param
rename to PARAM/SHMS/AERO/paero_cuts.param
diff --git a/PARAM/SHMS/AERO/GEOM/paero_geom.param b/PARAM/SHMS/AERO/paero_geom.param
similarity index 100%
rename from PARAM/SHMS/AERO/GEOM/paero_geom.param
rename to PARAM/SHMS/AERO/paero_geom.param
diff --git a/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1585.param b/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1585.param
deleted file mode 100644
index a21809fd..00000000
--- a/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1585.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 1585_500000, 54113 events processed
-
-pcal_neg_gain_cor = 0.00, 27.47, 28.76, 31.14, 32.36, 29.39, 32.87, 33.42, 35.05, 30.82, 30.72, 28.89, 0.00, 0.00,
-pcal_pos_gain_cor = 0.00, 30.99, 29.82, 31.08, 33.47, 36.42, 33.37, 26.25, 29.50, 28.50, 32.08, 28.19, 0.00, 0.00,
-pcal_arr_gain_cor = 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 49.15, 62.45, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 36.57, 48.02, 57.60, 36.71, 69.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 49.36, 30.66, 31.17, 67.58, 60.18, 48.33, 36.48, 52.01, 0.00, 0.00, 40.80, 41.89, 77.89, 0.00, 0.00,
- 0.00, 39.59, 33.79, 74.64, 20.14, 45.04, 47.54, 60.57, 79.52, 38.23, 51.27, 56.64, 78.09, 19.41, 0.00, 0.00,
- 0.00, 34.92, 57.07, 48.45, 27.70, 47.30, 61.26, 47.87, 43.42, 42.32, 36.35, 24.29, 44.10, 37.91, 0.00, 0.00,
- 0.00, 19.57, 18.80, 15.50, 19.93, 14.58, 20.18, 24.46, 13.08, 19.84, 28.17, 22.76, 30.04, 18.58, 13.79, 0.00,
- 0.00, 47.84, 33.91, 37.30, 54.40, 48.51, 27.96, 48.41, 74.16, 73.54, 31.07, 68.04, 30.65, 28.99, 0.00, 0.00,
- 0.00, 0.00, 19.90, 44.34, 32.10, 65.18, 53.96, 80.39, 0.00, 82.78, 40.40, 42.19, 59.48, 36.94, 0.00, 0.00,
- 0.00, 0.00,150.71, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 42.11, 38.34, 27.87, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
diff --git a/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1586.param b/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1586.param
deleted file mode 100644
index 682ab117..00000000
--- a/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1586.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 1586_500000, 36985 events processed
-
-pcal_neg_gain_cor = 0.00, 31.51, 28.13, 30.86, 32.42, 29.27, 32.86, 33.42, 35.00, 30.49, 30.49, 29.10, 0.00, 0.00,
-pcal_pos_gain_cor = 0.00, 28.80, 29.54, 31.20, 33.48, 36.21, 33.23, 26.37, 29.64, 28.06, 32.26, 28.24, 0.00, 0.00,
-pcal_arr_gain_cor = 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 54.80, 46.82, 43.98, 36.03, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 77.37, 30.65, 31.22, 67.97, 60.92, 49.36, 40.42, 0.00, 0.00, 0.00, 37.38, 41.68, 71.29, 0.00, 0.00,
- 0.00, 47.40, 34.05, 75.12, 20.23, 45.25, 48.05, 60.94, 80.89, 34.90, 51.37, 56.13, 77.35, 20.30, 0.00, 0.00,
- 0.00, 39.61, 58.86, 49.32, 27.50, 47.19, 61.69, 47.89, 43.02, 42.17, 36.82, 24.33, 43.74, 38.94, 0.00, 0.00,
- 0.00, 10.36, 18.93, 15.62, 20.03, 14.50, 20.29, 24.44, 13.14, 19.73, 28.33, 22.92, 30.20, 18.36, 10.17, 0.00,
- 0.00, 26.11, 33.75, 36.52, 54.50, 48.39, 27.74, 48.42, 71.14, 72.21, 31.29, 68.47, 30.96, 28.41, 0.00, 0.00,
- 0.00, 0.00, 23.28, 45.52, 28.62, 63.17, 51.75, 0.00, 0.00, 0.00, 44.32, 43.23, 59.05, 36.97, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 38.05, 39.57, 27.08, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
diff --git a/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1969.param b/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1969.param
deleted file mode 100644
index 9e2fd297..00000000
--- a/PARAM/SHMS/CAL/CALIB/Fall_Comm_2017/pcal_calib_1969.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 1969_400000, 32287 events processed
-
-pcal_neg_gain_cor = 43.54, 18.53, 27.48, 29.66, 31.37, 27.98, 31.29, 48.98, 26.99, 28.91, 32.37, 29.46, 36.33, 49.04,
-pcal_pos_gain_cor = 41.08, 17.84, 26.91, 27.67, 30.64, 32.34, 28.31, 24.01, 27.93, 25.98, 30.58, 26.75, 24.00, 25.00,
-pcal_arr_gain_cor = 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0,
- 14.56, 40.0, 40.0, 32.96, 59.08, 49.25, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0,
- 40.0, 40.0, 9.80, 21.97, 46.21, 59.91, 58.99, 74.33, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0,
- 40.0, 67.23, 27.92, 46.84, 38.90, 31.64, 84.10, 63.79, 50.88, 40.0, 40.0, 40.0, 40.0, 39.44, 51.22, 40.0,
- 4.04,40.0, 31.43, 28.42, 64.73, 57.99, 47.88, 32.49, 35.05,148.79, 40.0, 40.0, 42.21, 73.94, 39.95, 82.72,
- 45.94, 8.40, 33.01, 71.45, 18.71, 42.92, 45.68, 57.90, 75.64, 39.23, 57.67, 51.90, 76.50, 19.18, 27.55, 53.63,
- 29.51, 1.35, 53.28, 46.69, 25.90, 45.39, 58.98, 45.60, 40.63, 39.63, 34.46, 23.45, 42.02, 38.42, 31.82, 40.0,
- 22.75, 50.29, 17.00, 14.07, 18.62, 13.30, 19.12, 23.62, 7.51, 18.47, 27.17, 21.75, 28.68, 17.15, 12.17,117.68,
- -9.35, 25.52, 25.50, 35.28, 51.08, 44.57, 26.10, 47.38, 49.22, 71.07, 28.12, 66.22, 28.81, 26.92, 47.26, 40.0,
- 40.0, 40.0, 20.36, 43.09, 25.22, 60.80, 49.06, 61.20, 20.11, 40.0, 40.0, 37.81, 55.16, 34.19, 19.32, 4.46,
- 40.0, 5.65, 62.22, 28.48, 32.43, 41.48, 21.16, 52.10, 40.0, 40.0, 40.0, 40.0, 45.00, 25.76, 33.54,40.0,
- 40.0, 40.0, 32.74, 28.59, 40.0, 40.0, 5.11, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 15.89,
- 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0,
- 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0,
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param
deleted file mode 100644
index 0cd734fc..00000000
--- a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_464.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run report_464, 66161 events processed
-
-pcal_neg_gain_cor = 0.3/0.0195, 0.281/0.0195, 0.242/0.0195, 0.295/0.0195, 0.218/0.0195, 0.370/0.0195, 0.474/0.0195, 0.379/0.0195, 0.249/0.0195, 0.316/0.0195, 0.339/0.0195, 0.215/0.0195, 0.490/0.0195, 0.3/0.0195,
-pcal_pos_gain_cor = 0.307/0.0195, 0.216/0.0195, 0.211/0.0195, 0.282/0.0195, 0.238/0.0195, 0.228/0.0195, 0.287/0.0195, 0.228/0.0195, 0.472/0.0195, 0.194/0.0195, 0.377/0.0195, 0.360/0.0195, 0.633/0.0195, 0.3/0.0195,
-pcal_arr_gain_cor = 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 0.750/0.0195, 0.890/0.0195, 0.805/0.0195, 0.591/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 0.651/0.0195, 0.586/0.0195, 0.559/0.0195, 1.262/0.0195, 1.123/0.0195, 0.940/0.0195, 0.598/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 0.772/0.0195, 0.752/0.0195, 1.446/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 0.719/0.0195, 0.623/0.0195, 1.394/0.0195, 0.366/0.0195, 0.826/0.0195, 0.892/0.0195, 1.124/0.0195, 1.468/0.0195, 0.669/0.0195, 0.947/0.0195, 1.030/0.0195, 1.429/0.0195, 0.353/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 0.571/0.0195, 1.019/0.0195, 0.888/0.0195, 0.508/0.0195, 0.832/0.0195, 1.136/0.0195, 0.885/0.0195, 0.819/0.0195, 0.791/0.0195, 0.670/0.0195, 0.456/0.0195, 0.817/0.0195, 0.752/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 0.198/0.0195, 0.311/0.0195, 0.270/0.0195, 0.363/0.0195, 0.262/0.0195, 0.362/0.0195, 0.439/0.0195, 0.229/0.0195, 0.365/0.0195, 0.529/0.0195, 0.418/0.0195, 0.568/0.0195, 0.341/0.0195, 0.231/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 0.614/0.0195, 0.664/0.0195, 0.945/0.0195, 0.897/0.0195, 0.520/0.0195, 0.922/0.0195, 1.258/0.0195, 1.413/0.0195, 0.550/0.0195, 1.286/0.0195, 0.563/0.0195, 0.546/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 0.389/0.0195, 0.826/0.0195, 0.508/0.0195, 1.221/0.0195, 0.966/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 0.821/0.0195, 0.782/0.0195, 1.091/0.0195, 0.683/0.0195, 0.489/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 0.713/0.0195, 0.742/0.0195, 0.541/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195,
- 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195, 1.000/0.0195,
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param
deleted file mode 100644
index d1b89f46..00000000
--- a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_475.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 475_-1, 283000 events processed
-
-pcal_neg_gain_cor = 0.191/0.0195, 0.273/0.0195, 0.231/0.0195, 0.281/0.0195, 0.209/0.0195, 0.354/0.0195, 0.467/0.0195, 0.373/0.0195, 0.246/0.0195, 0.312/0.0195, 0.333/0.0195, 0.214/0.0195, 0.305/0.0195, 1.480/0.0195,
-pcal_pos_gain_cor = 0.966/0.0195, 0.206/0.0195, 0.206/0.0195, 0.278/0.0195, 0.234/0.0195, 0.224/0.0195, 0.284/0.0195, 0.227/0.0195, 0.468/0.0195, 0.190/0.0195, 0.375/0.0195, 0.359/0.0195, 0.445/0.0195, 2.266/0.0195,
-pcal_arr_gain_cor = 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.542/0.0195, 1.126/0.0195, 0.922/0.0195, 0.734/0.0195, 0.782/0.0195, 0.000/0.0195, 3.196/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 1.134/0.0195, 0.644/0.0195, 0.788/0.0195, 1.130/0.0195, 1.296/0.0195, 0.978/0.0195, 0.000/0.0195, 1.145/0.0195, 0.000/0.0195, 7.212/0.0195, 0.000/0.0195, 2.063/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.939/0.0195, 0.785/0.0195, 0.895/0.0195, 0.777/0.0195, 0.579/0.0195, 1.616/0.0195, 1.389/0.0195, 0.999/0.0195, 3.832/0.0195, 4.220/0.0195, 0.528/0.0195, 0.964/0.0195, 0.468/0.0195, 3.595/0.0195, 0.000/0.0195,
- -0.227/0.0195, 0.585/0.0195, 0.595/0.0195, 0.557/0.0195, 1.276/0.0195, 1.120/0.0195, 0.925/0.0195, 0.614/0.0195, 0.605/0.0195, 0.852/0.0195, 0.745/0.0195, 0.741/0.0195, 0.756/0.0195, 1.402/0.0195, 1.004/0.0195, 0.465/0.0195,
- 0.000/0.0195, 0.657/0.0195, 0.631/0.0195, 1.401/0.0195, 0.368/0.0195, 0.828/0.0195, 0.896/0.0195, 1.129/0.0195, 1.472/0.0195, 0.677/0.0195, 0.956/0.0195, 1.033/0.0195, 1.439/0.0195, 0.356/0.0195, 0.462/0.0195, 2.643/0.0195,
- 0.060/0.0195, 0.691/0.0195, 1.024/0.0195, 0.898/0.0195, 0.509/0.0195, 0.839/0.0195, 1.144/0.0195, 0.889/0.0195, 0.816/0.0195, 0.790/0.0195, 0.675/0.0195, 0.458/0.0195, 0.821/0.0195, 0.742/0.0195, 0.826/0.0195, 0.000/0.0195,
- 0.623/0.0195, 0.086/0.0195, 0.331/0.0195, 0.275/0.0195, 0.368/0.0195, 0.265/0.0195, 0.365/0.0195, 0.442/0.0195, 0.231/0.0195, 0.365/0.0195, 0.531/0.0195, 0.419/0.0195, 0.572/0.0195, 0.341/0.0195, 0.263/0.0195, 0.324/0.0195,
- 5.728/0.0195,-0.410/0.0195, 0.650/0.0195, 0.673/0.0195, 0.953/0.0195, 0.895/0.0195, 0.521/0.0195, 0.927/0.0195, 1.299/0.0195, 1.417/0.0195, 0.547/0.0195, 1.288/0.0195, 0.564/0.0195, 0.548/0.0195, 0.381/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.375/0.0195, 0.396/0.0195, 0.817/0.0195, 0.511/0.0195, 1.214/0.0195, 0.937/0.0195, 1.398/0.0195, 0.592/0.0195, 0.722/0.0195, 0.809/0.0195, 0.781/0.0195, 1.094/0.0195, 0.686/0.0195, 0.432/0.0195, 2.337/0.0195,
- 1.343/0.0195, 0.103/0.0195, 3.296/0.0195, 1.010/0.0195, 0.722/0.0195, 0.780/0.0195, 0.514/0.0195, 0.772/0.0195, 2.186/0.0195, 0.985/0.0195, 0.724/0.0195, 0.846/0.0195, 0.739/0.0195, 0.533/0.0195, 0.589/0.0195, 3.208/0.0195,
- -0.532/0.0195, 2.021/0.0195, 0.137/0.0195,-3.405/0.0195, 0.807/0.0195, 0.784/0.0195, 1.370/0.0195,-0.242/0.0195, 0.000/0.0195, 1.989/0.0195, 0.654/0.0195, 0.700/0.0195, 0.952/0.0195, 0.584/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.059/0.0195,-0.518/0.0195, 1.216/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,-0.040/0.0195, 0.000/0.0195, 0.000/0.0195, 9.954/0.0195,-0.309/0.0195, 0.000/0.0195, 0.000/0.0195, 3.539/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.135/0.0195,-0.479/0.0195,-0.128/0.0195,-0.065/0.0195,-0.072/0.0195, 0.122/0.0195, 0.748/0.0195, 0.000/0.0195, 1.168/0.0195, 0.000/0.0195, 0.091/0.0195, 0.000/0.0195, 0.613/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param
deleted file mode 100644
index 75dec056..00000000
--- a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_478.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 478_-1, 282423 events processed
-
-pcal_neg_gain_cor = 0.304/0.0195, 0.208/0.0195, 0.227/0.0195, 0.280/0.0195, 0.208/0.0195, 0.352/0.0195, 0.468/0.0195, 0.373/0.0195, 0.243/0.0195, 0.310/0.0195, 0.333/0.0195, 0.214/0.0195, 0.295/0.0195, 0.734/0.0195,
-pcal_pos_gain_cor = 1.257/0.0195, 0.219/0.0195, 0.207/0.0195, 0.280/0.0195, 0.235/0.0195, 0.225/0.0195, 0.282/0.0195, 0.227/0.0195, 0.470/0.0195, 0.190/0.0195, 0.375/0.0195, 0.359/0.0195, 0.457/0.0195, 4.229/0.0195,
-pcal_arr_gain_cor = 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 1.541/0.0195, 1.256/0.0195, 0.757/0.0195, 3.973/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.585/0.0195, 0.601/0.0195, 0.632/0.0195, 0.930/0.0195, 1.148/0.0195, 0.946/0.0195, 0.000/0.0195, 2.458/0.0195, 0.000/0.0195, 4.041/0.0195, 0.000/0.0195, 0.032/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 1.191/0.0195, 0.482/0.0195, 0.955/0.0195, 0.784/0.0195, 0.607/0.0195, 1.493/0.0195, 1.282/0.0195, 0.000/0.0195, 0.000/0.0195, 1.919/0.0195, 0.543/0.0195, 0.932/0.0195, 0.534/0.0195,-1.355/0.0195, 0.000/0.0195,
- -0.131/0.0195, 0.597/0.0195, 0.599/0.0195, 0.555/0.0195, 1.276/0.0195, 1.115/0.0195, 0.926/0.0195, 0.610/0.0195, 0.822/0.0195, 0.887/0.0195, 0.640/0.0195, 0.729/0.0195, 0.759/0.0195, 1.383/0.0195, 1.760/0.0195, 2.086/0.0195,
- -0.892/0.0195, 0.478/0.0195, 0.624/0.0195, 1.387/0.0195, 0.366/0.0195, 0.827/0.0195, 0.895/0.0195, 1.132/0.0195, 1.459/0.0195, 0.675/0.0195, 0.956/0.0195, 1.034/0.0195, 1.435/0.0195, 0.357/0.0195, 0.456/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.575/0.0195, 1.032/0.0195, 0.887/0.0195, 0.508/0.0195, 0.835/0.0195, 1.140/0.0195, 0.892/0.0195, 0.815/0.0195, 0.791/0.0195, 0.673/0.0195, 0.458/0.0195, 0.820/0.0195, 0.739/0.0195, 0.610/0.0195, 0.000/0.0195,
- 0.406/0.0195, 0.159/0.0195, 0.332/0.0195, 0.274/0.0195, 0.367/0.0195, 0.265/0.0195, 0.366/0.0195, 0.441/0.0195, 0.231/0.0195, 0.366/0.0195, 0.532/0.0195, 0.420/0.0195, 0.572/0.0195, 0.343/0.0195, 0.180/0.0195, 0.659/0.0195,
- -0.027/0.0195, 0.852/0.0195, 0.642/0.0195, 0.676/0.0195, 0.954/0.0195, 0.895/0.0195, 0.522/0.0195, 0.922/0.0195, 1.219/0.0195, 1.410/0.0195, 0.548/0.0195, 1.293/0.0195, 0.563/0.0195, 0.549/0.0195, 0.913/0.0195, 0.000/0.0195,
- 1.548/0.0195, 0.018/0.0195, 0.414/0.0195, 0.847/0.0195, 0.513/0.0195, 1.218/0.0195, 0.943/0.0195, 1.041/0.0195, 0.912/0.0195, 0.822/0.0195, 0.805/0.0195, 0.780/0.0195, 1.097/0.0195, 0.686/0.0195, 0.380/0.0195, 3.226/0.0195,
- -1.747/0.0195, 2.302/0.0195, 0.744/0.0195, 0.831/0.0195, 0.686/0.0195, 0.884/0.0195, 0.372/0.0195, 0.658/0.0195, 0.000/0.0195, 1.157/0.0195, 0.803/0.0195, 0.842/0.0195, 0.739/0.0195, 0.534/0.0195, 0.580/0.0195, 0.000/0.0195,
- 0.464/0.0195, 1.631/0.0195, 2.294/0.0195, 0.602/0.0195, 1.149/0.0195, 0.531/0.0195, 0.799/0.0195, 0.510/0.0195, 0.000/0.0195, 1.311/0.0195, 0.470/0.0195, 0.744/0.0195, 0.971/0.0195, 0.816/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.013/0.0195, 0.199/0.0195, 0.627/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 2.157/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 3.832/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.161/0.0195, 0.924/0.0195,-0.236/0.0195, 0.067/0.0195, 0.000/0.0195, 0.124/0.0195,-0.332/0.0195, 0.000/0.0195, 0.862/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.881/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param
deleted file mode 100644
index 46d33c69..00000000
--- a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_479.param
+++ /dev/null
@@ -1,25 +0,0 @@
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-pcal_ADCmode=1
-pcal_AdcTimeWindowMin = 81.25
-; Calibration constants for run 479_-1, 278685 events processed
-
-pcal_neg_gain_cor = 0.226/0.0195, 0.312/0.0195, 0.229/0.0195, 0.281/0.0195, 0.209/0.0195, 0.351/0.0195, 0.467/0.0195, 0.372/0.0195, 0.244/0.0195, 0.310/0.0195, 0.333/0.0195, 0.214/0.0195, 0.282/0.0195, 0.879/0.0195,
-pcal_pos_gain_cor = 1.012/0.0195, 0.237/0.0195, 0.204/0.0195, 0.278/0.0195, 0.234/0.0195, 0.224/0.0195, 0.282/0.0195, 0.226/0.0195, 0.470/0.0195, 0.191/0.0195, 0.374/0.0195, 0.359/0.0195, 0.418/0.0195, 1.238/0.0195,
-pcal_arr_gain_cor = 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- -0.724/0.0195, 0.482/0.0195, 1.062/0.0195, 0.714/0.0195, 1.032/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 1.218/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.875/0.0195, 0.765/0.0195, 0.733/0.0195, 0.803/0.0195, 1.149/0.0195, 0.861/0.0195, 0.000/0.0195, 3.282/0.0195, 0.000/0.0195, 3.856/0.0195, 0.000/0.0195, 0.814/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 0.782/0.0195, 0.644/0.0195, 0.932/0.0195, 0.790/0.0195, 0.599/0.0195, 1.557/0.0195, 1.240/0.0195, 0.000/0.0195, 0.000/0.0195, 0.947/0.0195, 0.679/0.0195, 0.462/0.0195, 0.551/0.0195, 1.957/0.0195, 0.000/0.0195,
- 0.964/0.0195, 0.360/0.0195, 0.601/0.0195, 0.560/0.0195, 1.278/0.0195, 1.119/0.0195, 0.932/0.0195, 0.613/0.0195, 0.772/0.0195, 1.108/0.0195, 0.707/0.0195, 0.737/0.0195, 0.760/0.0195, 1.407/0.0195, 0.820/0.0195, 3.763/0.0195,
- 0.000/0.0195,-0.034/0.0195, 0.639/0.0195, 1.391/0.0195, 0.369/0.0195, 0.830/0.0195, 0.898/0.0195, 1.131/0.0195, 1.449/0.0195, 0.682/0.0195, 0.952/0.0195, 1.035/0.0195, 1.437/0.0195, 0.357/0.0195, 0.356/0.0195, 1.327/0.0195,
- -3.506/0.0195, 0.111/0.0195, 1.059/0.0195, 0.896/0.0195, 0.507/0.0195, 0.838/0.0195, 1.145/0.0195, 0.894/0.0195, 0.819/0.0195, 0.790/0.0195, 0.674/0.0195, 0.459/0.0195, 0.820/0.0195, 0.742/0.0195, 0.532/0.0195, 2.701/0.0195,
- 1.179/0.0195, 0.142/0.0195, 0.329/0.0195, 0.274/0.0195, 0.366/0.0195, 0.263/0.0195, 0.366/0.0195, 0.442/0.0195, 0.231/0.0195, 0.365/0.0195, 0.532/0.0195, 0.419/0.0195, 0.573/0.0195, 0.339/0.0195, 0.228/0.0195,-0.411/0.0195,
- 0.370/0.0195, 0.138/0.0195, 0.644/0.0195, 0.671/0.0195, 0.948/0.0195, 0.894/0.0195, 0.526/0.0195, 0.931/0.0195, 1.262/0.0195, 1.412/0.0195, 0.547/0.0195, 1.292/0.0195, 0.563/0.0195, 0.548/0.0195, 1.027/0.0195, 0.000/0.0195,
- 1.332/0.0195, 1.186/0.0195, 0.391/0.0195, 0.829/0.0195, 0.524/0.0195, 1.229/0.0195, 0.943/0.0195, 1.230/0.0195, 0.589/0.0195, 0.906/0.0195, 0.811/0.0195, 0.781/0.0195, 1.098/0.0195, 0.687/0.0195, 0.414/0.0195, 0.806/0.0195,
- 2.454/0.0195, 1.831/0.0195, 0.000/0.0195, 0.915/0.0195, 0.547/0.0195, 0.716/0.0195, 0.336/0.0195, 0.704/0.0195, 2.243/0.0195, 5.368/0.0195, 0.540/0.0195, 0.784/0.0195, 0.737/0.0195, 0.529/0.0195, 0.994/0.0195, 0.636/0.0195,
- 1.871/0.0195, 0.414/0.0195, 0.600/0.0195, 0.384/0.0195, 0.839/0.0195, 0.890/0.0195, 0.396/0.0195, 1.352/0.0195, 0.000/0.0195, 0.996/0.0195, 1.358/0.0195,-0.914/0.0195, 1.065/0.0195, 1.114/0.0195, 0.000/0.0195, 5.720/0.0195,
- 0.284/0.0195, 0.169/0.0195, 0.751/0.0195,-1.613/0.0195, 0.000/0.0195, 0.000/0.0195, 0.311/0.0195, 0.587/0.0195, 0.000/0.0195, 0.000/0.0195, 3.068/0.0195, 0.000/0.0195, 0.000/0.0195, 0.170/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.089/0.0195, 0.000/0.0195, 0.443/0.0195, 1.049/0.0195, 0.000/0.0195, 0.047/0.0195,-1.034/0.0195, 0.000/0.0195, 0.362/0.0195, 0.000/0.0195, 0.000/0.0195, 1.360/0.0195, 7.498/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param
deleted file mode 100644
index 67b25a42..00000000
--- a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_480.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 480_-1, 282142 events processed
-
-pcal_neg_gain_cor = 0.164/0.0195, 0.257/0.0195, 0.230/0.0195, 0.279/0.0195, 0.206/0.0195, 0.349/0.0195, 0.467/0.0195, 0.371/0.0195, 0.242/0.0195, 0.309/0.0195, 0.331/0.0195, 0.213/0.0195, 0.321/0.0195, 2.724/0.0195,
-pcal_pos_gain_cor = 1.187/0.0195, 0.235/0.0195, 0.206/0.0195, 0.278/0.0195, 0.233/0.0195, 0.224/0.0195, 0.281/0.0195, 0.226/0.0195, 0.469/0.0195, 0.190/0.0195, 0.374/0.0195, 0.358/0.0195, 0.538/0.0195, 1.814/0.0195,
-pcal_arr_gain_cor = 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 2.200/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- -0.201/0.0195, 0.441/0.0195, 1.261/0.0195, 0.766/0.0195, 0.464/0.0195, 0.886/0.0195, 0.670/0.0195, 1.079/0.0195, 2.181/0.0195, 0.000/0.0195, 0.000/0.0195,10.649/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.000/0.0195, 1.791/0.0195, 0.723/0.0195, 0.698/0.0195, 1.117/0.0195, 1.202/0.0195, 0.788/0.0195, 0.895/0.0195, 0.687/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 1.925/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.635/0.0195, 0.855/0.0195, 0.747/0.0195, 0.870/0.0195, 0.785/0.0195, 0.617/0.0195, 1.548/0.0195, 1.302/0.0195, 0.958/0.0195, 0.000/0.0195,-1.934/0.0195, 0.377/0.0195, 0.763/0.0195, 0.512/0.0195,-5.008/0.0195, 0.000/0.0195,
- 1.087/0.0195, 0.312/0.0195, 0.595/0.0195, 0.559/0.0195, 1.274/0.0195, 1.116/0.0195, 0.930/0.0195, 0.609/0.0195, 0.621/0.0195, 1.929/0.0195, 0.785/0.0195, 0.747/0.0195, 0.760/0.0195, 1.406/0.0195, 0.512/0.0195,-5.311/0.0195,
- 0.293/0.0195, 0.517/0.0195, 0.623/0.0195, 1.389/0.0195, 0.367/0.0195, 0.829/0.0195, 0.896/0.0195, 1.133/0.0195, 1.453/0.0195, 0.673/0.0195, 0.954/0.0195, 1.033/0.0195, 1.436/0.0195, 0.357/0.0195, 0.776/0.0195,-1.928/0.0195,
- 2.840/0.0195, 0.502/0.0195, 1.035/0.0195, 0.891/0.0195, 0.506/0.0195, 0.839/0.0195, 1.142/0.0195, 0.893/0.0195, 0.817/0.0195, 0.792/0.0195, 0.674/0.0195, 0.459/0.0195, 0.820/0.0195, 0.742/0.0195, 0.364/0.0195, 0.000/0.0195,
- 0.298/0.0195,-0.060/0.0195, 0.334/0.0195, 0.274/0.0195, 0.367/0.0195, 0.265/0.0195, 0.366/0.0195, 0.442/0.0195, 0.231/0.0195, 0.366/0.0195, 0.532/0.0195, 0.420/0.0195, 0.572/0.0195, 0.340/0.0195, 0.226/0.0195, 1.261/0.0195,
- 3.062/0.0195, 0.500/0.0195, 0.634/0.0195, 0.672/0.0195, 0.954/0.0195, 0.898/0.0195, 0.523/0.0195, 0.933/0.0195, 1.285/0.0195, 1.420/0.0195, 0.547/0.0195, 1.293/0.0195, 0.564/0.0195, 0.551/0.0195, 0.927/0.0195, 0.000/0.0195,
- 1.503/0.0195, 1.418/0.0195, 0.367/0.0195, 0.852/0.0195, 0.517/0.0195, 1.202/0.0195, 0.947/0.0195, 1.145/0.0195, 0.653/0.0195, 0.817/0.0195, 0.805/0.0195, 0.781/0.0195, 1.098/0.0195, 0.684/0.0195, 0.706/0.0195,-1.969/0.0195,
- -0.189/0.0195, 1.592/0.0195, 0.000/0.0195, 0.834/0.0195, 0.680/0.0195, 0.823/0.0195, 0.222/0.0195, 0.643/0.0195, 1.669/0.0195, 0.993/0.0195, 0.641/0.0195, 0.841/0.0195, 0.736/0.0195, 0.532/0.0195, 0.648/0.0195, 2.064/0.0195,
- -0.012/0.0195, 2.522/0.0195, 0.427/0.0195, 0.617/0.0195, 0.711/0.0195, 0.824/0.0195, 0.858/0.0195, 1.583/0.0195, 0.474/0.0195, 1.898/0.0195, 1.613/0.0195, 0.794/0.0195, 0.832/0.0195, 0.978/0.0195, 0.320/0.0195,-5.513/0.0195,
- -0.044/0.0195, 2.564/0.0195, 1.350/0.0195,-1.409/0.0195, 1.190/0.0195, 0.000/0.0195,-0.138/0.0195, 0.000/0.0195, 0.000/0.0195, 2.478/0.0195, 1.496/0.0195, 0.000/0.0195, 0.000/0.0195, 0.066/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.071/0.0195, 0.000/0.0195,-0.021/0.0195, 0.409/0.0195, 0.000/0.0195, 0.130/0.0195, 0.000/0.0195, 0.000/0.0195, 0.124/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.118/0.0195, 0.000/0.0195, 0.302/0.0195, 0.000/0.0195,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param
deleted file mode 100644
index 9e7218e0..00000000
--- a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_481.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 481_-1, 273901 events processed
-
-pcal_neg_gain_cor = 0.193/0.0195, 0.204/0.0195, 0.225/0.0195, 0.274/0.0195, 0.200/0.0195, 0.342/0.0195, 0.461/0.0195, 0.352/0.0195, 0.238/0.0195, 0.307/0.0195, 0.332/0.0195, 0.211/0.0195, 0.273/0.0195, 0.946/0.0195,
-pcal_pos_gain_cor = 1.158/0.0195, 0.215/0.0195, 0.203/0.0195, 0.274/0.0195, 0.230/0.0195, 0.221/0.0195, 0.278/0.0195, 0.243/0.0195, 0.467/0.0195, 0.188/0.0195, 0.367/0.0195, 0.355/0.0195, 0.436/0.0195, 1.753/0.0195,
-pcal_arr_gain_cor = 0.000/0.0195, 1.450/0.0195, 0.000/0.0195,12.046/0.0195,-0.762/0.0195, 7.309/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,-1.849/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- -1.525/0.0195, 0.198/0.0195, 1.760/0.0195, 0.734/0.0195, 0.574/0.0195, 0.279/0.0195, 0.000/0.0195, 4.672/0.0195, 1.347/0.0195, 0.000/0.0195, 0.000/0.0195, 3.856/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.685/0.0195, 0.304/0.0195, 0.494/0.0195, 0.477/0.0195, 0.776/0.0195, 1.037/0.0195, 0.568/0.0195, 0.000/0.0195, 0.000/0.0195, 0.576/0.0195, 0.182/0.0195, 0.000/0.0195, 0.136/0.0195, 0.000/0.0195, 3.319/0.0195, 2.186/0.0195,
- -0.291/0.0195, 0.406/0.0195, 0.459/0.0195, 0.599/0.0195, 0.540/0.0195, 0.391/0.0195, 1.114/0.0195, 0.696/0.0195, 0.699/0.0195, 0.000/0.0195, 0.844/0.0195, 0.264/0.0195, 0.753/0.0195, 0.274/0.0195, 1.143/0.0195, 0.000/0.0195,
- 0.125/0.0195, 0.182/0.0195, 0.408/0.0195, 0.373/0.0195, 0.875/0.0195, 0.760/0.0195, 0.622/0.0195, 0.398/0.0195, 0.602/0.0195, 0.000/0.0195, 0.564/0.0195, 0.529/0.0195, 0.510/0.0195, 0.958/0.0195, 0.721/0.0195,-0.116/0.0195,
- 0.308/0.0195, 0.342/0.0195, 0.420/0.0195, 0.952/0.0195, 0.244/0.0195, 0.554/0.0195, 0.596/0.0195, 0.799/0.0195, 0.000/0.0195, 0.480/0.0195, 0.644/0.0195, 0.693/0.0195, 0.980/0.0195, 0.237/0.0195, 0.469/0.0195, 0.289/0.0195,
- 0.407/0.0195, 0.400/0.0195, 0.711/0.0195, 0.601/0.0195, 0.346/0.0195, 0.559/0.0195, 0.772/0.0195, 0.599/0.0195, 0.527/0.0195, 0.535/0.0195, 0.455/0.0195, 0.309/0.0195, 0.556/0.0195, 0.511/0.0195, 0.347/0.0195, 0.000/0.0195,
- 0.246/0.0195, 0.056/0.0195, 0.324/0.0195, 0.185/0.0195, 0.249/0.0195, 0.180/0.0195, 0.246/0.0195, 0.299/0.0195, 0.163/0.0195, 0.246/0.0195, 0.356/0.0195, 0.283/0.0195, 0.392/0.0195, 0.233/0.0195, 0.169/0.0195,-0.707/0.0195,
- 1.176/0.0195, 1.029/0.0195, 0.424/0.0195, 0.453/0.0195, 0.654/0.0195, 0.612/0.0195, 0.348/0.0195, 0.627/0.0195, 0.863/0.0195, 0.979/0.0195, 0.363/0.0195, 0.887/0.0195, 0.378/0.0195, 0.369/0.0195, 0.716/0.0195, 2.447/0.0195,
- 2.712/0.0195, 0.233/0.0195, 0.264/0.0195, 0.566/0.0195, 0.345/0.0195, 0.823/0.0195, 0.655/0.0195, 0.766/0.0195, 0.476/0.0195, 0.548/0.0195, 0.558/0.0195, 0.524/0.0195, 0.737/0.0195, 0.471/0.0195, 0.263/0.0195, 1.255/0.0195,
- 0.994/0.0195, 0.410/0.0195, 1.141/0.0195, 0.489/0.0195, 0.464/0.0195, 0.608/0.0195, 0.252/0.0195, 0.678/0.0195, 2.341/0.0195, 0.577/0.0195, 0.498/0.0195, 0.578/0.0195, 0.495/0.0195, 0.359/0.0195, 0.362/0.0195, 3.317/0.0195,
- 0.204/0.0195,-0.126/0.0195, 0.393/0.0195, 0.607/0.0195, 0.512/0.0195, 0.627/0.0195, 0.296/0.0195, 1.025/0.0195, 0.224/0.0195, 0.233/0.0195, 0.217/0.0195, 0.476/0.0195, 0.687/0.0195, 0.399/0.0195, 0.000/0.0195, 1.362/0.0195,
- -0.378/0.0195, 1.637/0.0195, 0.059/0.0195,-0.895/0.0195, 0.327/0.0195, 0.512/0.0195, 0.878/0.0195, 0.266/0.0195, 0.000/0.0195,-0.035/0.0195,-0.524/0.0195,-0.446/0.0195, 5.124/0.0195, 1.312/0.0195, 2.956/0.0195, 0.898/0.0195,
- 0.025/0.0195, 0.117/0.0195, 0.058/0.0195, 0.095/0.0195, 0.022/0.0195,-0.037/0.0195, 1.242/0.0195, 0.000/0.0195,-0.123/0.0195, 0.000/0.0195,-0.728/0.0195,-1.078/0.0195, 0.152/0.0195, 0.000/0.0195, 0.027/0.0195,-0.035/0.0195,
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param b/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param
deleted file mode 100644
index abb7ee5f..00000000
--- a/PARAM/SHMS/CAL/CALIB/KPP_Spring_2017/pcal_calib_488.param
+++ /dev/null
@@ -1,18 +0,0 @@
-; Calibration constants for run 488_-1, 194924 events processed -- Updated from Varden July 21
-
-pcal_neg_gain_cor = 0.367/0.0195, 0.282/0.0195, 0.233/0.0195, 0.278/0.0195, 0.200/0.0195, 0.313/0.0195, 0.376/0.0195, 0.432/0.0195, 0.502/0.0195, 0.336/0.0195, 0.335/0.0195, 0.214/0.0195, 0.332/0.0195, 2.185/0.0195,
-pcal_pos_gain_cor = 1.419/0.0195, 0.221/0.0195, 0.205/0.0195, 0.273/0.0195, 0.230/0.0195, 0.198/0.0195, 0.212/0.0195, 0.174/0.0195, 0.443/0.0195, 0.190/0.0195, 0.373/0.0195, 0.358/0.0195, 0.823/0.0195, 4.152/0.0195,
-pcal_arr_gain_cor = 0.000/0.0195, 0.263/0.0195, 0.000/0.0195,-1.119/0.0195, 1.501/0.0195, 0.759/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 9.276/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 4.852/0.0195, 0.000/0.0195, 0.000/0.0195,
- 0.822/0.0195,-1.711/0.0195, 1.058/0.0195, 0.586/0.0195, 0.546/0.0195, 0.353/0.0195, 0.000/0.0195, 1.503/0.0195, 3.639/0.0195, 3.773/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- -12.996/0.0195, 3.347/0.0195, 0.396/0.0195, 0.536/0.0195, 0.871/0.0195, 0.845/0.0195, 1.862/0.0195, 0.816/0.0195, 0.376/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195, 2.140/0.0195, 0.000/0.0195, 0.000/0.0195, 0.000/0.0195,
- 2.826/0.0195,-0.740/0.0195, 0.576/0.0195, 0.624/0.0195, 0.562/0.0195, 0.426/0.0195, 1.340/0.0195, 0.991/0.0195, 0.184/0.0195, 0.000/0.0195, 5.350/0.0195, 0.481/0.0195, 0.867/0.0195, 0.423/0.0195, 0.497/0.0195, 0.000/0.0195,
- 0.487/0.0195, 0.530/0.0195, 0.405/0.0195, 0.381/0.0195, 0.891/0.0195, 0.777/0.0195, 0.638/0.0195, 0.437/0.0195, 1.830/0.0195, 0.858/0.0195, 0.257/0.0195, 0.534/0.0195, 0.514/0.0195, 0.949/0.0195, 0.970/0.0195, 2.885/0.0195,
- 3.660/0.0195, 0.413/0.0195, 0.418/0.0195, 0.966/0.0195, 0.249/0.0195, 0.551/0.0195, 0.086/0.0195, 0.107/0.0195, 3.171/0.0195, 0.000/0.0195, 0.670/0.0195, 0.700/0.0195, 0.987/0.0195, 0.240/0.0195, 0.521/0.0195, 1.517/0.0195,
- 3.396/0.0195, 0.379/0.0195, 0.717/0.0195, 0.612/0.0195, 0.352/0.0195, 0.553/0.0195, 0.100/0.0195, 0.087/0.0195, 0.087/0.0195, 0.623/0.0195, 0.465/0.0195, 0.312/0.0195, 0.561/0.0195, 0.516/0.0195,-0.029/0.0195, 0.000/0.0195,
- 0.251/0.0195, 0.068/0.0195, 0.330/0.0195, 0.184/0.0195, 0.250/0.0195, 0.175/0.0195, 0.041/0.0195, 0.047/0.0195, 0.029/0.0195, 0.000/0.0195, 0.329/0.0195, 0.282/0.0195, 0.395/0.0195, 0.233/0.0195, 0.163/0.0195, 0.109/0.0195,
- 0.176/0.0195, 0.583/0.0195, 0.425/0.0195, 0.456/0.0195, 0.655/0.0195, 0.620/0.0195, 0.354/0.0195, 0.651/0.0195, 1.341/0.0195, 0.569/0.0195, 0.334/0.0195, 0.885/0.0195, 0.381/0.0195, 0.373/0.0195, 0.324/0.0195,-0.448/0.0195,
- 2.017/0.0195, 1.563/0.0195, 0.244/0.0195, 0.581/0.0195, 0.346/0.0195, 0.853/0.0195, 0.721/0.0195, 0.901/0.0195, 0.367/0.0195, 0.166/0.0195, 0.536/0.0195, 0.522/0.0195, 0.743/0.0195, 0.477/0.0195, 0.226/0.0195, 0.288/0.0195,
- 0.992/0.0195,-1.118/0.0195, 0.000/0.0195, 0.668/0.0195, 0.475/0.0195, 0.598/0.0195, 0.239/0.0195, 1.150/0.0195, 0.536/0.0195, 1.111/0.0195, 0.325/0.0195, 0.562/0.0195, 0.495/0.0195, 0.362/0.0195, 0.392/0.0195, 1.468/0.0195,
- 2.263/0.0195, 0.454/0.0195, 0.086/0.0195, 0.898/0.0195, 0.451/0.0195, 0.781/0.0195, 0.523/0.0195,-1.817/0.0195, 7.839/0.0195, 2.955/0.0195, 2.542/0.0195, 0.039/0.0195, 1.033/0.0195, 0.538/0.0195, 5.071/0.0195, 6.466/0.0195,
- 1.142/0.0195, 1.085/0.0195, 0.645/0.0195, 0.228/0.0195, 0.000/0.0195, 0.014/0.0195, 3.795/0.0195, 4.740/0.0195, 0.000/0.0195, 1.572/0.0195, 1.285/0.0195, 0.969/0.0195, 0.000/0.0195, 3.814/0.0195, 6.030/0.0195, 3.028/0.0195,
- 0.006/0.0195, 1.953/0.0195, 0.115/0.0195, 0.438/0.0195,-0.446/0.0195,-0.137/0.0195,-0.345/0.0195, 0.000/0.0195, 0.887/0.0195, 0.000/0.0195, 0.229/0.0195,-3.800/0.0195, 2.320/0.0195, 0.000/0.0195, 0.000/0.0195, 3.655/0.0195,
diff --git a/PARAM/SHMS/CAL/CALIB/pcal_calib.param b/PARAM/SHMS/CAL/CALIB/pcal_calib.param
deleted file mode 120000
index 3be66e21..00000000
--- a/PARAM/SHMS/CAL/CALIB/pcal_calib.param
+++ /dev/null
@@ -1 +0,0 @@
-Fall_Comm_2017/pcal_calib_1969.param
\ No newline at end of file
diff --git a/PARAM/SHMS/CAL/pcal_calib.param b/PARAM/SHMS/CAL/pcal_calib.param
new file mode 100644
index 00000000..39ef2f15
--- /dev/null
+++ b/PARAM/SHMS/CAL/pcal_calib.param
@@ -0,0 +1,18 @@
+; Calibration constants for run 1791_-1, 229102 events processed
+
+pcal_neg_gain_cor = 96.88, 43.42, 26.93, 28.75, 31.69, 27.26, 29.74, 34.82, 30.97, 28.54, 29.88, 28.69, 32.24,322.93,
+pcal_pos_gain_cor = 49.57, 48.30, 27.70, 28.45, 32.19, 34.07, 28.52, 23.09, 26.06, 27.00, 31.76, 26.70, 25.27, 53.31,
+pcal_arr_gain_cor = 0.00, 0.00, 0.00, 41.18, 19.52, 33.97, 61.75, 60.76, 51.74, 25.21, 62.44,232.98, 0.00, 0.00, 0.00, 0.00,
+ 0.00,126.77, 53.05, 39.15, 41.76, 34.85, 42.18, 26.82, 23.60, 36.68, 72.62, 47.42,158.46, 0.00, 0.00, 0.00,
+ 0.00, 49.40, 33.85, 32.71, 58.90, 64.51, 41.46, 60.81, 30.39, 43.49, 36.70, 71.23, 44.71, 88.80, 0.00, 0.00,
+ 0.00,207.98, 35.77, 47.40, 41.66, 31.86, 85.56, 64.62, 55.19, 54.59, 57.67, 20.60,207.33, 68.68, 0.00, 0.00,
+ 276.40, 65.35, 30.21, 29.69, 67.56, 60.81, 49.45, 33.80, 36.42, 49.73, 41.62, 40.25, 42.75, 72.47,167.46, 0.00,
+ 0.00, 53.60, 33.61, 73.13, 19.61, 44.58, 48.06, 61.38, 78.47, 39.97, 52.01, 55.30, 76.32, 19.81, 26.67, 0.00,
+ 0.00, 98.22, 52.89, 46.95, 27.01, 46.75, 61.17, 48.36, 43.27, 42.95, 36.11, 24.00, 42.65, 38.06, 30.11, 0.00,
+ 34.01, 37.89, 17.87, 15.25, 19.49, 14.81, 20.13, 24.30, 13.60, 19.82, 27.99, 22.31, 29.53, 17.69, 16.55,338.81,
+ 0.00, 0.89, 33.23, 35.66, 53.98, 47.92, 28.10, 50.21, 63.71, 78.47, 31.23, 67.49, 29.25, 28.54, 50.58, 0.00,
+ 0.00, 62.04, 21.30, 43.28, 26.87, 63.86, 49.76, 61.35, 34.91, 45.68, 44.43, 41.95, 57.38, 36.00, 19.81, 0.00,
+ 0.00, 54.86, 65.72, 42.66, 34.18, 43.50, 21.59, 39.36, 55.02, 60.69, 39.00, 45.78, 39.72, 27.81, 0.00, 0.00,
+ 0.00, 32.79, 29.24, 33.81, 40.95, 39.85, 20.72, 24.77, 38.51, 29.09, 25.53, 42.81, 53.28, 0.00, 0.00, 0.00,
+ 0.00,126.55, 24.18, 62.74, 71.39, 46.27, 22.21, 32.16, 52.76, 30.10, 27.94, 49.61, 0.00, 0.00, 0.00, 0.00,
+ 0.00, 0.00, 0.00, 76.56,101.62, 39.03,118.52,105.08, 33.92, 69.13, 88.28, 0.00, 0.00, 0.00, 0.00, 0.00,
diff --git a/PARAM/SHMS/CAL/CUTS/pcal_cuts.param b/PARAM/SHMS/CAL/pcal_cuts.param
similarity index 100%
rename from PARAM/SHMS/CAL/CUTS/pcal_cuts.param
rename to PARAM/SHMS/CAL/pcal_cuts.param
diff --git a/PARAM/SHMS/CAL/GEOM/pcal_geom.param b/PARAM/SHMS/CAL/pcal_geom.param
similarity index 100%
rename from PARAM/SHMS/CAL/GEOM/pcal_geom.param
rename to PARAM/SHMS/CAL/pcal_geom.param
diff --git a/PARAM/SHMS/DC/CALIB/pdc_calib.param b/PARAM/SHMS/DC/CALIB/pdc_calib.param
deleted file mode 100644
index 4e725db4..00000000
--- a/PARAM/SHMS/DC/CALIB/pdc_calib.param
+++ /dev/null
@@ -1,175 +0,0 @@
-; Lookup Table: RUN 1585
-; number of bins in time to distance lookup table
-pdriftbins = 275
-; number of 1st bin in table in ns
-pdrift1stbin=0
-; bin size in ns
-pdriftbinsz=1
-pwc1u1fract=0.00075,0.00161,0.00270,0.00389,0.00543,0.00726,0.00920,0.01150,0.01397,0.01684,0.02018,0.02422,0.02868,0.03366,0.03907,0.04497,0.05112,0.05811,0.06523
-0.07304,0.08078,0.08880,0.09721,0.10561,0.11449,0.12409,0.13367,0.14364,0.15348,0.16333,0.17321,0.18356,0.19417,0.20463,0.21524,0.22612,0.23716,0.24822,0.25906
-0.27043,0.28167,0.29297,0.30407,0.31511,0.32663,0.33782,0.34918,0.36047,0.37148,0.38271,0.39361,0.40463,0.41577,0.42658,0.43762,0.44835,0.45917,0.47021,0.48080
-0.49154,0.50241,0.51331,0.52435,0.53495,0.54620,0.55707,0.56743,0.57797,0.58849,0.59893,0.60936,0.61944,0.62971,0.64041,0.65076,0.66139,0.67159,0.68156,0.69134
-0.70129,0.71127,0.72092,0.73055,0.74039,0.74998,0.75961,0.76906,0.77852,0.78796,0.79709,0.80599,0.81466,0.82328,0.83172,0.83995,0.84814,0.85596,0.86404,0.87157
-0.87885,0.88578,0.89234,0.89898,0.90529,0.91149,0.91681,0.92223,0.92740,0.93207,0.93657,0.94048,0.94416,0.94763,0.95083,0.95396,0.95679,0.95933,0.96171,0.96372
-0.96577,0.96767,0.96937,0.97098,0.97245,0.97368,0.97509,0.97625,0.97730,0.97854,0.97957,0.98061,0.98159,0.98249,0.98346,0.98431,0.98505,0.98572,0.98647,0.98724
-0.98787,0.98847,0.98903,0.98968,0.99016,0.99065,0.99110,0.99165,0.99211,0.99258,0.99297,0.99337,0.99375,0.99409,0.99443,0.99470,0.99496,0.99522,0.99552,0.99572
-0.99598,0.99623,0.99650,0.99669,0.99688,0.99706,0.99727,0.99739,0.99750,0.99763,0.99775,0.99784,0.99795,0.99807,0.99816,0.99825,0.99830,0.99837,0.99846,0.99853
-0.99858,0.99866,0.99870,0.99872,0.99877,0.99880,0.99884,0.99886,0.99890,0.99893,0.99895,0.99897,0.99899,0.99906,0.99910,0.99911,0.99914,0.99915,0.99917,0.99919
-0.99922,0.99925,0.99928,0.99929,0.99930,0.99932,0.99933,0.99934,0.99936,0.99938,0.99939,0.99941,0.99942,0.99943,0.99945,0.99946,0.99948,0.99950,0.99950,0.99951
-0.99953,0.99954,0.99955,0.99956,0.99957,0.99958,0.99960,0.99961,0.99962,0.99963,0.99964,0.99966,0.99966,0.99966,0.99968,0.99969,0.99971,0.99971,0.99971,0.99971
-0.99973,0.99974,0.99977,0.99977,0.99978,0.99978,0.99980,0.99981,0.99983,0.99984,0.99985,0.99986,0.99987,0.99988,0.99988,0.99988,0.99988,0.99989,0.99991,0.99992
-0.99992,0.99993,0.99993,0.99994,0.99994,0.99994,0.99995,0.99996,0.99996,0.99996,0.99996,0.99996,0.99997,0.99998,0.99999,1.00000
-pwc1u2fract=0.00071,0.00157,0.00273,0.00396,0.00538,0.00716,0.00906,0.01148,0.01404,0.01717,0.02082,0.02469,0.02924,0.03394,0.03951,0.04533,0.05173,0.05845,0.06565
-0.07313,0.08112,0.08972,0.09816,0.10743,0.11667,0.12616,0.13560,0.14582,0.15627,0.16662,0.17643,0.18709,0.19785,0.20880,0.21957,0.23048,0.24119,0.25174,0.26248
-0.27375,0.28503,0.29623,0.30741,0.31826,0.32956,0.34080,0.35166,0.36301,0.37398,0.38457,0.39578,0.40658,0.41773,0.42835,0.43929,0.44994,0.46074,0.47180,0.48258
-0.49333,0.50399,0.51477,0.52543,0.53578,0.54651,0.55735,0.56780,0.57827,0.58856,0.59897,0.60943,0.61970,0.63012,0.64089,0.65107,0.66132,0.67140,0.68139,0.69124
-0.70084,0.71084,0.72051,0.73026,0.73986,0.74958,0.75917,0.76845,0.77773,0.78712,0.79604,0.80443,0.81311,0.82156,0.82988,0.83822,0.84616,0.85412,0.86208,0.86951
-0.87671,0.88382,0.89067,0.89704,0.90336,0.90913,0.91479,0.92025,0.92522,0.92995,0.93468,0.93867,0.94245,0.94610,0.94937,0.95234,0.95526,0.95787,0.96025,0.96246
-0.96463,0.96644,0.96802,0.96954,0.97102,0.97249,0.97388,0.97521,0.97637,0.97763,0.97872,0.97990,0.98082,0.98177,0.98260,0.98342,0.98415,0.98482,0.98552,0.98624
-0.98682,0.98746,0.98808,0.98871,0.98919,0.98975,0.99030,0.99082,0.99122,0.99175,0.99213,0.99258,0.99294,0.99327,0.99364,0.99404,0.99438,0.99467,0.99493,0.99522
-0.99551,0.99579,0.99600,0.99625,0.99644,0.99663,0.99685,0.99701,0.99713,0.99728,0.99742,0.99760,0.99771,0.99788,0.99798,0.99806,0.99816,0.99825,0.99832,0.99838
-0.99842,0.99851,0.99854,0.99859,0.99864,0.99867,0.99869,0.99873,0.99876,0.99878,0.99882,0.99884,0.99886,0.99888,0.99892,0.99895,0.99899,0.99901,0.99903,0.99904
-0.99905,0.99908,0.99911,0.99912,0.99914,0.99915,0.99920,0.99924,0.99925,0.99928,0.99929,0.99931,0.99932,0.99934,0.99935,0.99937,0.99939,0.99942,0.99942,0.99943
-0.99944,0.99946,0.99948,0.99950,0.99952,0.99954,0.99954,0.99954,0.99957,0.99959,0.99960,0.99960,0.99962,0.99965,0.99967,0.99968,0.99969,0.99971,0.99971,0.99973
-0.99974,0.99975,0.99977,0.99977,0.99979,0.99981,0.99981,0.99982,0.99984,0.99984,0.99985,0.99985,0.99985,0.99986,0.99986,0.99987,0.99988,0.99989,0.99990,0.99992
-0.99992,0.99992,0.99992,0.99992,0.99993,0.99993,0.99994,0.99994,0.99995,0.99995,0.99996,0.99997,0.99998,0.99999,1.00000,1.00000
-pwc1x1fract=0.00078,0.00161,0.00268,0.00407,0.00568,0.00742,0.00973,0.01234,0.01536,0.01871,0.02298,0.02749,0.03259,0.03834,0.04458,0.05169,0.05932,0.06714,0.07552
-0.08443,0.09325,0.10258,0.11189,0.12134,0.13081,0.14099,0.15126,0.16218,0.17244,0.18288,0.19365,0.20468,0.21570,0.22646,0.23736,0.24819,0.25910,0.27035,0.28138
-0.29254,0.30343,0.31393,0.32451,0.33505,0.34613,0.35686,0.36781,0.37898,0.39002,0.40081,0.41182,0.42211,0.43310,0.44391,0.45482,0.46569,0.47650,0.48695,0.49761
-0.50820,0.51875,0.52915,0.53979,0.55049,0.56105,0.57155,0.58174,0.59229,0.60286,0.61292,0.62305,0.63334,0.64355,0.65368,0.66407,0.67416,0.68383,0.69365,0.70350
-0.71360,0.72331,0.73295,0.74246,0.75183,0.76109,0.77048,0.77938,0.78880,0.79741,0.80612,0.81473,0.82328,0.83169,0.83995,0.84790,0.85575,0.86334,0.87067,0.87762
-0.88439,0.89100,0.89709,0.90314,0.90912,0.91452,0.91993,0.92455,0.92936,0.93381,0.93761,0.94133,0.94463,0.94757,0.95051,0.95333,0.95600,0.95821,0.96024,0.96212
-0.96412,0.96602,0.96773,0.96930,0.97084,0.97229,0.97365,0.97488,0.97609,0.97716,0.97823,0.97927,0.98023,0.98123,0.98223,0.98305,0.98391,0.98475,0.98560,0.98635
-0.98706,0.98771,0.98834,0.98903,0.98963,0.99022,0.99076,0.99129,0.99182,0.99227,0.99270,0.99308,0.99349,0.99391,0.99425,0.99469,0.99510,0.99547,0.99572,0.99598
-0.99626,0.99648,0.99675,0.99701,0.99722,0.99741,0.99756,0.99775,0.99788,0.99800,0.99816,0.99832,0.99844,0.99852,0.99856,0.99866,0.99873,0.99879,0.99883,0.99892
-0.99899,0.99901,0.99907,0.99912,0.99916,0.99920,0.99923,0.99928,0.99930,0.99933,0.99935,0.99938,0.99938,0.99939,0.99941,0.99942,0.99943,0.99946,0.99947,0.99949
-0.99950,0.99951,0.99951,0.99952,0.99953,0.99953,0.99954,0.99956,0.99957,0.99957,0.99959,0.99960,0.99961,0.99961,0.99961,0.99963,0.99963,0.99964,0.99964,0.99965
-0.99966,0.99968,0.99969,0.99969,0.99970,0.99971,0.99972,0.99972,0.99972,0.99973,0.99975,0.99976,0.99977,0.99977,0.99977,0.99977,0.99978,0.99978,0.99979,0.99979
-0.99979,0.99980,0.99980,0.99980,0.99981,0.99982,0.99983,0.99984,0.99984,0.99984,0.99984,0.99984,0.99984,0.99984,0.99985,0.99987,0.99987,0.99988,0.99988,0.99989
-0.99989,0.99990,0.99990,0.99991,0.99992,0.99994,0.99995,0.99995,0.99996,0.99996,0.99997,0.99997,0.99998,1.00000,1.00000,1.00000
-pwc1x2fract=0.00054,0.00136,0.00247,0.00371,0.00513,0.00676,0.00883,0.01124,0.01408,0.01763,0.02150,0.02614,0.03123,0.03685,0.04294,0.04952,0.05687,0.06466,0.07282
-0.08156,0.09034,0.09932,0.10879,0.11870,0.12857,0.13831,0.14858,0.15851,0.16872,0.17916,0.18965,0.20045,0.21135,0.22183,0.23212,0.24252,0.25331,0.26395,0.27464
-0.28545,0.29590,0.30678,0.31750,0.32878,0.33971,0.35091,0.36198,0.37284,0.38343,0.39451,0.40546,0.41631,0.42696,0.43767,0.44827,0.45882,0.46920,0.47999,0.49057
-0.50135,0.51212,0.52250,0.53296,0.54318,0.55383,0.56434,0.57480,0.58524,0.59548,0.60574,0.61644,0.62610,0.63648,0.64677,0.65679,0.66694,0.67680,0.68682,0.69611
-0.70535,0.71463,0.72374,0.73308,0.74244,0.75182,0.76119,0.77014,0.77962,0.78874,0.79741,0.80623,0.81491,0.82357,0.83187,0.84031,0.84843,0.85648,0.86398,0.87103
-0.87803,0.88471,0.89105,0.89761,0.90351,0.90912,0.91445,0.91974,0.92484,0.92913,0.93329,0.93713,0.94069,0.94419,0.94728,0.95032,0.95320,0.95584,0.95831,0.96038
-0.96246,0.96437,0.96602,0.96781,0.96931,0.97073,0.97203,0.97343,0.97472,0.97578,0.97688,0.97801,0.97899,0.98000,0.98103,0.98198,0.98290,0.98374,0.98434,0.98510
-0.98584,0.98655,0.98730,0.98803,0.98874,0.98931,0.98986,0.99049,0.99105,0.99154,0.99208,0.99260,0.99301,0.99340,0.99382,0.99420,0.99449,0.99479,0.99513,0.99542
-0.99576,0.99609,0.99633,0.99656,0.99680,0.99704,0.99724,0.99748,0.99766,0.99777,0.99790,0.99802,0.99817,0.99832,0.99843,0.99858,0.99868,0.99874,0.99880,0.99888
-0.99894,0.99900,0.99907,0.99911,0.99916,0.99919,0.99925,0.99927,0.99930,0.99935,0.99939,0.99942,0.99943,0.99943,0.99945,0.99947,0.99949,0.99952,0.99952,0.99953
-0.99955,0.99956,0.99957,0.99958,0.99960,0.99961,0.99964,0.99964,0.99965,0.99965,0.99966,0.99968,0.99968,0.99969,0.99971,0.99972,0.99973,0.99973,0.99974,0.99975
-0.99975,0.99976,0.99977,0.99978,0.99978,0.99978,0.99978,0.99978,0.99979,0.99979,0.99979,0.99980,0.99982,0.99982,0.99982,0.99982,0.99983,0.99984,0.99984,0.99984
-0.99985,0.99986,0.99986,0.99986,0.99986,0.99986,0.99987,0.99987,0.99988,0.99988,0.99989,0.99989,0.99990,0.99990,0.99991,0.99992,0.99993,0.99993,0.99993,0.99994
-0.99994,0.99994,0.99995,0.99995,0.99995,0.99996,0.99996,0.99997,0.99997,0.99997,0.99998,0.99999,0.99999,1.00000,1.00000,1.00000
-pwc1v1fract=0.00076,0.00173,0.00282,0.00398,0.00554,0.00744,0.00951,0.01194,0.01450,0.01765,0.02133,0.02535,0.03002,0.03495,0.04028,0.04632,0.05296,0.05995,0.06696
-0.07456,0.08262,0.09086,0.09979,0.10917,0.11855,0.12806,0.13848,0.14834,0.15859,0.16908,0.18011,0.19101,0.20178,0.21264,0.22343,0.23458,0.24556,0.25690,0.26856
-0.27966,0.29092,0.30175,0.31297,0.32417,0.33574,0.34710,0.35819,0.36929,0.38022,0.39132,0.40272,0.41366,0.42499,0.43618,0.44665,0.45751,0.46831,0.47916,0.49022
-0.50090,0.51196,0.52262,0.53325,0.54434,0.55510,0.56580,0.57651,0.58712,0.59738,0.60772,0.61797,0.62790,0.63821,0.64835,0.65913,0.66930,0.67923,0.68957,0.69930
-0.70917,0.71879,0.72846,0.73850,0.74819,0.75794,0.76696,0.77640,0.78546,0.79467,0.80322,0.81176,0.82043,0.82870,0.83702,0.84498,0.85281,0.86058,0.86794,0.87507
-0.88236,0.88912,0.89573,0.90221,0.90814,0.91374,0.91901,0.92396,0.92861,0.93295,0.93708,0.94101,0.94467,0.94813,0.95128,0.95414,0.95710,0.95964,0.96199,0.96415
-0.96620,0.96800,0.96975,0.97137,0.97301,0.97447,0.97577,0.97712,0.97830,0.97960,0.98051,0.98160,0.98264,0.98349,0.98437,0.98516,0.98593,0.98665,0.98747,0.98811
-0.98874,0.98941,0.98995,0.99063,0.99116,0.99164,0.99209,0.99257,0.99300,0.99337,0.99374,0.99422,0.99453,0.99489,0.99525,0.99554,0.99583,0.99613,0.99634,0.99658
-0.99681,0.99703,0.99723,0.99744,0.99764,0.99781,0.99796,0.99810,0.99824,0.99834,0.99843,0.99854,0.99864,0.99874,0.99882,0.99891,0.99896,0.99901,0.99904,0.99909
-0.99914,0.99917,0.99921,0.99924,0.99928,0.99931,0.99933,0.99937,0.99938,0.99941,0.99942,0.99944,0.99945,0.99947,0.99947,0.99949,0.99952,0.99954,0.99955,0.99957
-0.99957,0.99957,0.99959,0.99961,0.99961,0.99962,0.99963,0.99963,0.99964,0.99964,0.99965,0.99965,0.99966,0.99966,0.99968,0.99968,0.99968,0.99969,0.99970,0.99971
-0.99971,0.99971,0.99972,0.99973,0.99973,0.99973,0.99974,0.99975,0.99976,0.99976,0.99976,0.99976,0.99977,0.99977,0.99977,0.99978,0.99978,0.99979,0.99980,0.99980
-0.99982,0.99982,0.99982,0.99982,0.99982,0.99983,0.99983,0.99983,0.99983,0.99983,0.99983,0.99984,0.99985,0.99985,0.99987,0.99988,0.99988,0.99990,0.99991,0.99992
-0.99992,0.99993,0.99993,0.99995,0.99995,0.99995,0.99996,0.99997,0.99998,0.99998,0.99998,0.99999,1.00000,1.00000,1.00000,1.00000
-pwc1v2fract=0.00078,0.00165,0.00283,0.00434,0.00574,0.00763,0.00989,0.01233,0.01524,0.01858,0.02243,0.02691,0.03222,0.03760,0.04383,0.04982,0.05695,0.06437,0.07236
-0.08027,0.08874,0.09761,0.10684,0.11622,0.12588,0.13558,0.14542,0.15583,0.16600,0.17617,0.18654,0.19709,0.20804,0.21919,0.23022,0.24123,0.25204,0.26297,0.27402
-0.28473,0.29555,0.30649,0.31749,0.32812,0.33864,0.34949,0.36062,0.37167,0.38261,0.39334,0.40429,0.41486,0.42587,0.43653,0.44734,0.45827,0.46942,0.48027,0.49082
-0.50163,0.51245,0.52324,0.53402,0.54442,0.55512,0.56540,0.57625,0.58688,0.59798,0.60832,0.61869,0.62852,0.63863,0.64842,0.65886,0.66888,0.67896,0.68905,0.69922
-0.70888,0.71891,0.72861,0.73814,0.74769,0.75702,0.76641,0.77542,0.78431,0.79346,0.80256,0.81161,0.82014,0.82841,0.83685,0.84494,0.85274,0.86038,0.86799,0.87541
-0.88243,0.88893,0.89533,0.90143,0.90743,0.91284,0.91835,0.92338,0.92783,0.93217,0.93602,0.93996,0.94348,0.94713,0.95024,0.95297,0.95564,0.95798,0.96027,0.96236
-0.96440,0.96611,0.96782,0.96959,0.97104,0.97258,0.97392,0.97520,0.97642,0.97769,0.97873,0.97974,0.98069,0.98168,0.98255,0.98337,0.98409,0.98491,0.98565,0.98650
-0.98717,0.98783,0.98843,0.98892,0.98959,0.99014,0.99069,0.99116,0.99160,0.99211,0.99256,0.99295,0.99337,0.99377,0.99413,0.99450,0.99480,0.99514,0.99551,0.99584
-0.99616,0.99640,0.99662,0.99686,0.99711,0.99726,0.99743,0.99759,0.99771,0.99783,0.99796,0.99811,0.99824,0.99836,0.99847,0.99855,0.99860,0.99870,0.99876,0.99886
-0.99891,0.99896,0.99900,0.99907,0.99912,0.99917,0.99920,0.99926,0.99928,0.99930,0.99932,0.99935,0.99937,0.99938,0.99940,0.99941,0.99943,0.99946,0.99948,0.99949
-0.99951,0.99953,0.99954,0.99956,0.99957,0.99959,0.99961,0.99962,0.99964,0.99965,0.99966,0.99968,0.99968,0.99969,0.99970,0.99971,0.99973,0.99974,0.99974,0.99975
-0.99976,0.99976,0.99977,0.99978,0.99979,0.99980,0.99981,0.99981,0.99981,0.99981,0.99981,0.99981,0.99981,0.99982,0.99983,0.99984,0.99984,0.99984,0.99984,0.99985
-0.99985,0.99986,0.99986,0.99986,0.99987,0.99987,0.99988,0.99988,0.99988,0.99988,0.99988,0.99989,0.99990,0.99991,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994
-0.99995,0.99995,0.99996,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99999,0.99999,1.00000,1.00000
-pwc2v2fract=0.00087,0.00182,0.00296,0.00416,0.00569,0.00744,0.00927,0.01151,0.01419,0.01703,0.02022,0.02384,0.02809,0.03276,0.03766,0.04326,0.04926,0.05592,0.06285
-0.07024,0.07786,0.08597,0.09410,0.10303,0.11236,0.12159,0.13139,0.14149,0.15148,0.16182,0.17233,0.18259,0.19307,0.20339,0.21442,0.22511,0.23584,0.24672,0.25713
-0.26783,0.27861,0.28944,0.30056,0.31129,0.32205,0.33262,0.34371,0.35416,0.36492,0.37581,0.38650,0.39700,0.40760,0.41826,0.42910,0.43981,0.45068,0.46118,0.47182
-0.48270,0.49348,0.50441,0.51523,0.52584,0.53613,0.54671,0.55716,0.56754,0.57795,0.58873,0.59907,0.60948,0.61991,0.62990,0.63976,0.64981,0.65984,0.66975,0.67980
-0.68985,0.69926,0.70860,0.71799,0.72737,0.73612,0.74537,0.75443,0.76333,0.77262,0.78188,0.79038,0.79898,0.80753,0.81599,0.82414,0.83231,0.84056,0.84827,0.85575
-0.86319,0.87019,0.87707,0.88389,0.89019,0.89648,0.90248,0.90800,0.91340,0.91840,0.92302,0.92749,0.93162,0.93549,0.93911,0.94263,0.94566,0.94865,0.95141,0.95399
-0.95623,0.95863,0.96077,0.96262,0.96433,0.96604,0.96758,0.96894,0.97032,0.97192,0.97322,0.97431,0.97557,0.97687,0.97800,0.97892,0.97977,0.98077,0.98158,0.98242
-0.98315,0.98388,0.98468,0.98536,0.98602,0.98666,0.98739,0.98800,0.98854,0.98914,0.98979,0.99047,0.99091,0.99148,0.99192,0.99237,0.99276,0.99310,0.99349,0.99383
-0.99419,0.99444,0.99475,0.99502,0.99528,0.99551,0.99580,0.99605,0.99624,0.99643,0.99664,0.99680,0.99695,0.99708,0.99727,0.99739,0.99751,0.99761,0.99773,0.99781
-0.99786,0.99794,0.99797,0.99807,0.99815,0.99823,0.99831,0.99836,0.99842,0.99848,0.99854,0.99859,0.99865,0.99869,0.99875,0.99881,0.99884,0.99887,0.99891,0.99895
-0.99898,0.99902,0.99903,0.99906,0.99908,0.99911,0.99913,0.99915,0.99916,0.99917,0.99918,0.99922,0.99925,0.99928,0.99930,0.99932,0.99935,0.99937,0.99940,0.99941
-0.99944,0.99945,0.99947,0.99948,0.99950,0.99951,0.99954,0.99955,0.99958,0.99962,0.99965,0.99966,0.99966,0.99967,0.99967,0.99969,0.99969,0.99970,0.99971,0.99972
-0.99974,0.99975,0.99976,0.99977,0.99978,0.99978,0.99980,0.99980,0.99980,0.99981,0.99982,0.99982,0.99983,0.99983,0.99984,0.99984,0.99985,0.99986,0.99988,0.99990
-0.99990,0.99991,0.99993,0.99993,0.99993,0.99994,0.99995,0.99996,0.99997,0.99998,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc2v1fract=0.00085,0.00177,0.00292,0.00432,0.00592,0.00774,0.00966,0.01200,0.01476,0.01785,0.02165,0.02558,0.03003,0.03504,0.04057,0.04666,0.05320,0.05998,0.06731
-0.07495,0.08271,0.09111,0.09991,0.10914,0.11837,0.12781,0.13756,0.14758,0.15764,0.16817,0.17868,0.18944,0.20036,0.21110,0.22229,0.23320,0.24387,0.25462,0.26559
-0.27692,0.28801,0.29948,0.31030,0.32161,0.33229,0.34322,0.35395,0.36509,0.37604,0.38693,0.39774,0.40880,0.42014,0.43095,0.44204,0.45268,0.46373,0.47447,0.48542
-0.49657,0.50747,0.51815,0.52870,0.53937,0.54968,0.56000,0.57078,0.58096,0.59124,0.60169,0.61208,0.62238,0.63265,0.64285,0.65281,0.66272,0.67284,0.68290,0.69307
-0.70276,0.71234,0.72187,0.73139,0.74062,0.75001,0.75927,0.76841,0.77740,0.78619,0.79500,0.80397,0.81243,0.82080,0.82911,0.83712,0.84512,0.85308,0.86070,0.86805
-0.87512,0.88179,0.88867,0.89524,0.90116,0.90719,0.91263,0.91796,0.92270,0.92738,0.93161,0.93570,0.93951,0.94288,0.94612,0.94909,0.95204,0.95470,0.95728,0.95967
-0.96185,0.96395,0.96581,0.96754,0.96926,0.97073,0.97230,0.97354,0.97478,0.97607,0.97722,0.97844,0.97952,0.98053,0.98153,0.98252,0.98330,0.98429,0.98515,0.98589
-0.98657,0.98722,0.98786,0.98850,0.98916,0.98977,0.99033,0.99081,0.99135,0.99193,0.99236,0.99286,0.99323,0.99356,0.99389,0.99428,0.99457,0.99495,0.99530,0.99552
-0.99582,0.99608,0.99634,0.99668,0.99685,0.99705,0.99720,0.99734,0.99745,0.99762,0.99773,0.99781,0.99795,0.99805,0.99812,0.99822,0.99834,0.99845,0.99850,0.99860
-0.99866,0.99868,0.99873,0.99875,0.99880,0.99887,0.99892,0.99895,0.99898,0.99903,0.99908,0.99910,0.99914,0.99917,0.99920,0.99923,0.99926,0.99928,0.99931,0.99932
-0.99933,0.99934,0.99937,0.99938,0.99939,0.99939,0.99942,0.99942,0.99943,0.99944,0.99945,0.99947,0.99948,0.99950,0.99951,0.99953,0.99955,0.99957,0.99957,0.99958
-0.99958,0.99961,0.99962,0.99963,0.99965,0.99966,0.99967,0.99967,0.99968,0.99968,0.99968,0.99968,0.99969,0.99970,0.99973,0.99974,0.99976,0.99976,0.99977,0.99977
-0.99978,0.99979,0.99980,0.99982,0.99983,0.99984,0.99984,0.99985,0.99986,0.99986,0.99987,0.99987,0.99988,0.99989,0.99989,0.99989,0.99990,0.99990,0.99990,0.99992
-0.99992,0.99994,0.99994,0.99994,0.99994,0.99996,0.99996,0.99996,0.99998,0.99998,0.99998,0.99999,0.99999,1.00000,1.00000,1.00000
-pwc2x2fract=0.00069,0.00142,0.00253,0.00375,0.00534,0.00712,0.00915,0.01162,0.01453,0.01778,0.02162,0.02618,0.03129,0.03681,0.04274,0.04949,0.05694,0.06450,0.07233
-0.08051,0.08908,0.09846,0.10743,0.11719,0.12675,0.13670,0.14676,0.15671,0.16683,0.17739,0.18797,0.19871,0.20942,0.22011,0.23127,0.24181,0.25239,0.26286,0.27384
-0.28428,0.29516,0.30580,0.31709,0.32791,0.33838,0.34900,0.35937,0.36997,0.38048,0.39122,0.40149,0.41215,0.42307,0.43396,0.44477,0.45555,0.46688,0.47770,0.48848
-0.49876,0.50921,0.51967,0.53033,0.54103,0.55141,0.56191,0.57244,0.58300,0.59344,0.60380,0.61397,0.62460,0.63513,0.64535,0.65547,0.66510,0.67512,0.68479,0.69466
-0.70424,0.71354,0.72299,0.73268,0.74140,0.75101,0.76026,0.76957,0.77828,0.78737,0.79639,0.80483,0.81331,0.82200,0.83057,0.83856,0.84623,0.85400,0.86177,0.86933
-0.87664,0.88337,0.88993,0.89615,0.90189,0.90763,0.91283,0.91792,0.92257,0.92718,0.93123,0.93492,0.93858,0.94173,0.94495,0.94812,0.95090,0.95351,0.95600,0.95829
-0.96040,0.96233,0.96416,0.96574,0.96737,0.96899,0.97034,0.97190,0.97316,0.97445,0.97573,0.97682,0.97793,0.97892,0.97992,0.98089,0.98186,0.98258,0.98340,0.98422
-0.98505,0.98578,0.98661,0.98733,0.98805,0.98870,0.98924,0.98987,0.99047,0.99102,0.99160,0.99211,0.99255,0.99297,0.99334,0.99376,0.99414,0.99456,0.99488,0.99514
-0.99546,0.99581,0.99605,0.99630,0.99651,0.99668,0.99690,0.99715,0.99735,0.99751,0.99763,0.99779,0.99794,0.99806,0.99816,0.99828,0.99834,0.99841,0.99851,0.99859
-0.99867,0.99874,0.99879,0.99886,0.99891,0.99897,0.99901,0.99906,0.99909,0.99912,0.99914,0.99917,0.99918,0.99922,0.99926,0.99927,0.99929,0.99932,0.99935,0.99937
-0.99938,0.99941,0.99942,0.99943,0.99944,0.99946,0.99946,0.99948,0.99949,0.99950,0.99952,0.99952,0.99953,0.99955,0.99955,0.99956,0.99956,0.99956,0.99957,0.99958
-0.99960,0.99961,0.99961,0.99962,0.99962,0.99963,0.99963,0.99964,0.99966,0.99966,0.99966,0.99967,0.99968,0.99969,0.99971,0.99972,0.99974,0.99975,0.99976,0.99977
-0.99978,0.99980,0.99980,0.99981,0.99981,0.99982,0.99982,0.99983,0.99983,0.99985,0.99986,0.99987,0.99987,0.99988,0.99989,0.99991,0.99992,0.99992,0.99993,0.99993
-0.99993,0.99994,0.99994,0.99995,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99998,0.99999,0.99999,0.99999,1.00000
-pwc2x1fract=0.00065,0.00142,0.00241,0.00367,0.00514,0.00681,0.00885,0.01132,0.01420,0.01756,0.02148,0.02613,0.03110,0.03690,0.04304,0.04989,0.05692,0.06458,0.07269
-0.08145,0.08997,0.09884,0.10794,0.11742,0.12732,0.13754,0.14778,0.15786,0.16821,0.17891,0.18959,0.20009,0.21065,0.22127,0.23199,0.24297,0.25379,0.26446,0.27532
-0.28628,0.29691,0.30740,0.31804,0.32873,0.33932,0.35038,0.36131,0.37192,0.38247,0.39341,0.40415,0.41491,0.42574,0.43648,0.44733,0.45791,0.46844,0.47888,0.48969
-0.50012,0.51066,0.52136,0.53218,0.54288,0.55324,0.56359,0.57403,0.58425,0.59464,0.60499,0.61558,0.62600,0.63634,0.64650,0.65678,0.66683,0.67632,0.68629,0.69604
-0.70553,0.71498,0.72466,0.73396,0.74384,0.75340,0.76243,0.77146,0.78023,0.78929,0.79830,0.80704,0.81548,0.82421,0.83258,0.84073,0.84856,0.85626,0.86381,0.87110
-0.87814,0.88480,0.89135,0.89750,0.90333,0.90908,0.91447,0.91968,0.92450,0.92878,0.93297,0.93665,0.94023,0.94349,0.94673,0.94971,0.95221,0.95467,0.95716,0.95935
-0.96136,0.96331,0.96508,0.96675,0.96828,0.96975,0.97110,0.97247,0.97376,0.97499,0.97618,0.97728,0.97837,0.97943,0.98046,0.98140,0.98233,0.98318,0.98400,0.98483
-0.98568,0.98652,0.98723,0.98788,0.98853,0.98911,0.98970,0.99028,0.99089,0.99146,0.99201,0.99244,0.99292,0.99337,0.99372,0.99407,0.99440,0.99469,0.99507,0.99539
-0.99570,0.99601,0.99626,0.99651,0.99673,0.99691,0.99707,0.99727,0.99747,0.99761,0.99772,0.99782,0.99793,0.99804,0.99817,0.99828,0.99838,0.99847,0.99856,0.99864
-0.99871,0.99878,0.99886,0.99892,0.99895,0.99900,0.99904,0.99907,0.99913,0.99914,0.99917,0.99920,0.99922,0.99925,0.99929,0.99931,0.99934,0.99936,0.99939,0.99941
-0.99943,0.99944,0.99945,0.99947,0.99948,0.99949,0.99950,0.99952,0.99954,0.99955,0.99955,0.99957,0.99958,0.99958,0.99960,0.99960,0.99961,0.99962,0.99964,0.99964
-0.99966,0.99966,0.99966,0.99968,0.99969,0.99971,0.99971,0.99972,0.99972,0.99973,0.99974,0.99974,0.99975,0.99975,0.99976,0.99976,0.99977,0.99978,0.99980,0.99980
-0.99980,0.99980,0.99980,0.99981,0.99982,0.99984,0.99984,0.99985,0.99986,0.99986,0.99987,0.99988,0.99989,0.99989,0.99989,0.99989,0.99989,0.99990,0.99990,0.99991
-0.99991,0.99992,0.99992,0.99992,0.99992,0.99993,0.99994,0.99995,0.99995,0.99995,0.99996,0.99996,0.99997,0.99999,1.00000,1.00000
-pwc2u2fract=0.00085,0.00183,0.00310,0.00452,0.00613,0.00805,0.01013,0.01261,0.01535,0.01841,0.02201,0.02613,0.03085,0.03596,0.04156,0.04753,0.05414,0.06160,0.06931
-0.07729,0.08582,0.09446,0.10321,0.11227,0.12178,0.13127,0.14108,0.15089,0.16101,0.17135,0.18201,0.19267,0.20308,0.21396,0.22469,0.23601,0.24691,0.25795,0.26852
-0.27969,0.29063,0.30116,0.31249,0.32369,0.33450,0.34557,0.35674,0.36771,0.37880,0.38959,0.40071,0.41160,0.42271,0.43348,0.44402,0.45490,0.46582,0.47692,0.48780
-0.49863,0.50904,0.51987,0.53070,0.54104,0.55129,0.56192,0.57212,0.58283,0.59320,0.60397,0.61403,0.62457,0.63475,0.64498,0.65536,0.66553,0.67556,0.68574,0.69556
-0.70548,0.71544,0.72512,0.73453,0.74397,0.75325,0.76247,0.77148,0.78063,0.78965,0.79841,0.80733,0.81605,0.82460,0.83312,0.84115,0.84890,0.85643,0.86362,0.87104
-0.87825,0.88506,0.89124,0.89744,0.90352,0.90921,0.91476,0.91996,0.92467,0.92910,0.93335,0.93712,0.94084,0.94437,0.94766,0.95077,0.95373,0.95623,0.95869,0.96095
-0.96312,0.96510,0.96709,0.96872,0.97031,0.97181,0.97313,0.97453,0.97572,0.97692,0.97810,0.97924,0.98024,0.98115,0.98207,0.98304,0.98399,0.98485,0.98563,0.98634
-0.98700,0.98767,0.98845,0.98906,0.98968,0.99023,0.99072,0.99127,0.99165,0.99210,0.99255,0.99297,0.99344,0.99378,0.99417,0.99449,0.99485,0.99524,0.99557,0.99585
-0.99616,0.99639,0.99667,0.99690,0.99713,0.99731,0.99745,0.99761,0.99774,0.99786,0.99796,0.99804,0.99815,0.99828,0.99838,0.99850,0.99859,0.99865,0.99874,0.99880
-0.99888,0.99893,0.99899,0.99902,0.99905,0.99908,0.99913,0.99917,0.99920,0.99924,0.99926,0.99928,0.99932,0.99934,0.99936,0.99937,0.99937,0.99939,0.99940,0.99941
-0.99941,0.99942,0.99944,0.99945,0.99947,0.99947,0.99948,0.99949,0.99950,0.99950,0.99951,0.99953,0.99955,0.99955,0.99956,0.99956,0.99957,0.99958,0.99958,0.99959
-0.99960,0.99961,0.99962,0.99962,0.99962,0.99962,0.99963,0.99965,0.99966,0.99967,0.99967,0.99969,0.99970,0.99970,0.99970,0.99971,0.99973,0.99973,0.99973,0.99973
-0.99973,0.99974,0.99974,0.99975,0.99975,0.99975,0.99975,0.99976,0.99977,0.99978,0.99979,0.99980,0.99980,0.99980,0.99981,0.99983,0.99983,0.99985,0.99986,0.99987
-0.99987,0.99988,0.99989,0.99990,0.99991,0.99992,0.99993,0.99994,0.99994,0.99995,0.99997,0.99997,0.99998,0.99999,0.99999,1.00000
-pwc2u1fract=0.00081,0.00172,0.00291,0.00425,0.00578,0.00754,0.00957,0.01197,0.01469,0.01799,0.02165,0.02589,0.03056,0.03570,0.04113,0.04750,0.05384,0.06093,0.06833
-0.07565,0.08390,0.09222,0.10064,0.10979,0.11894,0.12828,0.13764,0.14757,0.15755,0.16793,0.17814,0.18843,0.19919,0.21009,0.22098,0.23167,0.24244,0.25389,0.26504
-0.27600,0.28691,0.29785,0.30869,0.31978,0.33114,0.34229,0.35319,0.36417,0.37532,0.38618,0.39683,0.40779,0.41863,0.42968,0.44049,0.45140,0.46243,0.47320,0.48367
-0.49423,0.50516,0.51624,0.52682,0.53750,0.54814,0.55870,0.56924,0.57986,0.59049,0.60097,0.61130,0.62155,0.63196,0.64223,0.65247,0.66243,0.67272,0.68261,0.69264
-0.70234,0.71215,0.72128,0.73091,0.74029,0.74954,0.75902,0.76816,0.77735,0.78655,0.79564,0.80424,0.81257,0.82117,0.82975,0.83804,0.84581,0.85370,0.86121,0.86817
-0.87563,0.88241,0.88904,0.89526,0.90118,0.90662,0.91203,0.91696,0.92156,0.92612,0.93019,0.93426,0.93805,0.94142,0.94454,0.94734,0.95013,0.95268,0.95501,0.95734
-0.95945,0.96139,0.96325,0.96496,0.96672,0.96835,0.96985,0.97133,0.97274,0.97410,0.97536,0.97650,0.97759,0.97857,0.97963,0.98062,0.98148,0.98235,0.98329,0.98410
-0.98498,0.98573,0.98643,0.98712,0.98785,0.98859,0.98916,0.98983,0.99036,0.99085,0.99132,0.99187,0.99234,0.99272,0.99310,0.99348,0.99384,0.99420,0.99442,0.99477
-0.99507,0.99539,0.99569,0.99593,0.99617,0.99638,0.99661,0.99676,0.99690,0.99703,0.99717,0.99730,0.99746,0.99758,0.99769,0.99782,0.99790,0.99801,0.99809,0.99818
-0.99824,0.99831,0.99842,0.99847,0.99852,0.99857,0.99864,0.99866,0.99871,0.99877,0.99883,0.99887,0.99891,0.99893,0.99897,0.99901,0.99905,0.99906,0.99910,0.99914
-0.99916,0.99917,0.99922,0.99924,0.99926,0.99928,0.99931,0.99932,0.99934,0.99935,0.99938,0.99940,0.99943,0.99944,0.99947,0.99949,0.99949,0.99951,0.99952,0.99952
-0.99952,0.99953,0.99954,0.99955,0.99956,0.99957,0.99958,0.99960,0.99962,0.99962,0.99964,0.99965,0.99967,0.99968,0.99969,0.99971,0.99971,0.99971,0.99973,0.99974
-0.99975,0.99976,0.99976,0.99976,0.99977,0.99979,0.99980,0.99980,0.99981,0.99981,0.99982,0.99982,0.99984,0.99984,0.99986,0.99988,0.99989,0.99990,0.99990,0.99990
-0.99991,0.99992,0.99993,0.99994,0.99994,0.99995,0.99995,0.99996,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,1.00000,1.00000
diff --git a/PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param b/PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param
deleted file mode 100644
index 77a087e8..00000000
--- a/PARAM/SHMS/DC/CALIB/pdc_tzero_per_wire.param
+++ /dev/null
@@ -1,88 +0,0 @@
-ptzero1u1=
-0,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000, 0.000000, -149.878788, -27.044944, 0.000000
--53.019139, 0.000000, -50.260274, -34.982213, 0.000000, -8.738622, -2.897827, -88.957606, -18.247487, -26.435768, -38.257075, -36.920949, -38.544987, -13.574403, -17.136405, -12.768693
--11.092262, -11.061283, -19.158681, -10.282248, -17.411800, -10.213980, -11.033041, -8.103336, -5.369464, -10.136824, -10.862941, -11.013567, -10.354999, -9.999297, -8.140986, -7.639592
--5.799753, -6.435159, -9.697298, -9.642149, -4.895693, -10.338910, -5.416720, -10.027175, -9.820353, -9.574116, -6.576418, -6.836446, -9.342115, -8.921875, -5.399340, -6.071421
--2.716801, -4.730585, -4.643014, -2.137888, -4.612864, -9.812626, -4.797696, -4.509772, -2.417883, -2.518058, -1.660606, -4.268741, -1.007727, -5.595541, -0.655227, -5.729748
--2.941562, 1.433470, -7.022648, -6.793346, -1.093934, -2.692041, -5.368772, -2.313670, -0.535338, -12.419597, 1.408650, -14.922182, -7.045547, -14.334220, -26.732339, -21.333777
--62.979622, 0.000000, -16.515590, 18.826460, -12.593894, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000
-ptzero1u2=
-0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000, 0.000000, 0.000000, -22.040449, 0.000000
--147.617801, -26.966667, -137.021097, 0.000000, 0.000000, -28.627119, -14.941176, -18.415159, -14.696208, -20.579096, -24.697445, -15.578857, -2.278401, -15.425544, -13.576342, -59.057637
--8.297497, -26.335095, -6.240710, -14.332306, -9.337662, -12.442006, -9.433869, -9.249966, -8.051778, -11.105034, -6.037478, -8.480620, -6.585192, -6.478281, -4.910990, -5.934368
--5.792950, -6.462753, -5.570910, -6.088373, -5.744581, -9.204169, -6.527237, -8.423529, -9.576156, -9.370759, -6.563131, -5.764756, -6.671697, -5.313134, -5.915043, -5.329033
--4.410204, -5.632653, -5.348871, -5.392322, -5.405967, -11.284143, -5.301896, -5.339511, -4.985511, -5.867321, -5.500457, -5.734196, -1.442971, -3.832532, -5.857560, -2.569853
--1.827402, -8.447736, -1.181206, -5.493012, -1.700444, -2.188999, -5.561278, -4.939513, -9.105898, -25.358637, 2.580938, -2.166078, 0.623079, -9.780517, 0.000000, -11.418421
-0.000000, -21.878234, 0.000000, 0.000000, -24.397692, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000
-ptzero1x1=
--14.539519,-8.623913,0.000000,-22.548968,-39.793914,-23.867460,-41.345389,-22.868744,-13.010130,-12.959581,-23.284333,-27.007979, -32.538955, -32.146932, -33.583155, -29.170812
--32.200802, -41.787854, -17.212203, -13.699141, -14.948461, -14.830713, -14.430041, -11.112643, -16.164051, -13.123006, -11.650473, -15.210152, -16.715404, -11.721185, -10.330664, -2.128493
--3.845541, -5.415209, -1.560923, -4.819262, -5.766017, -10.070796, -10.309841, -7.251039, -10.295419, -10.118901, -9.514578, -9.468954, -9.871537, -9.983389, -10.026513, -10.342800
--5.348445, -4.752431, -4.853999, -3.959887, -1.829495, -4.700794, -4.777136, -4.851488, -5.526942, -9.317676, -9.738987, -5.912226, -4.995086, -4.632347, -3.811859, -1.226331
--0.045974, 0.896840, 0.243041, 4.615494, 4.224372, 4.327548, 5.834475, 7.556615, 5.410825, 5.367559, -1.476670, 4.559396, 0.715059, 0.053429, 0.849818
-ptzero1x2=
--55.016592,-13.562510,0.000000,-7.071631,-29.550145,0.000000,-22.168330,-10.668464,2.518435,-7.765819,-36.406271,-27.288225, -24.274907, -29.412507, -34.249801, -32.342973
--33.732782, -12.958052, -7.562686, -11.194995, -10.163004, -8.617651, -13.815932, -7.049287, -9.748398, -7.260630, -6.175684, -9.203265, -9.922077, -8.954731, -5.104794, -10.736535
--9.508698, -7.150723, -10.348552, -11.662765, -10.549808, -12.163057, -14.422396, -13.753539, -13.775856, -14.785803, -13.984077, -14.952515, -14.085753, -12.802270, -13.614471, -13.480726
--9.107323, -8.930448, -8.381766, -9.187436, -9.413030, -9.552128, -10.785366, -9.733731, -9.359220, -11.928057, -10.227059, -10.720464, -10.581628, -10.242276, -9.692433, -4.530073
--2.439071, -4.827234, -4.876435, -4.496282, -0.172116, -0.435153, 0.558391, -0.645408, -4.992914, -1.934176, -6.736845, -6.368848, -8.862971, -7.762419, -6.199756
-ptzero1v1=
-0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000, 0.000000, 0.000000, -4.139535, 0.000000
--21.717791, 8.010711, 0.000000, -25.931994, -43.034869, 0.000000, -22.131820, -10.702413, -24.088542, -37.512365, -38.294182, -16.242332, -18.438581, -15.414381, -8.578510, -11.498629
--5.332179, -20.315479, -11.095732, -12.538967, -8.769620, -6.286713, -10.829366, -9.172376, -9.341210, -6.659007, -13.908270, -5.783285, -3.245108, -6.094821, -7.826354, -0.549628
--0.441000, -1.689331, -0.590571, -1.707346, -4.145973, -0.822943, -1.327281, -1.220626, -0.536079, -0.637542, -0.200010, -1.158473, -0.598535, 3.447180, -1.180473, -11.337340
--12.689179, -10.053754, -10.673945, -11.422185, -10.543570, -14.101587, -10.838693, -10.516069, -10.615855, -10.769534, -8.436408, -8.684230, -7.335055, -10.559893, -6.995956, -8.959999
--5.076826, -9.446906, -5.124875, -10.036038, -4.975952, -2.396953, -6.659327, -9.439645, -1.740431, -1.938473, -4.583190, -11.003341, -2.208335, -15.226037, -26.731099, -3.348519
--11.609876, -3.843486, -22.384964, -20.842342, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000
-ptzero1v2=
-0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000, 0.000000, -28.632075, 0.000000, 3.286842
--70.933333, 0.000000, 0.000000, -15.203762, -8.337360, -20.358362, -13.460231, -67.406504, -12.580107, -14.753963, -21.513033, -28.971014, -11.214427, -13.092499, -7.807551, -2.676841
--2.818912, -1.250374, -10.839249, -11.383036, -3.556444, -6.107571, -5.522785, -5.283835, -5.052643, -4.718076, -4.551138, -1.958875, -10.787063, -8.959363, -9.440976, -10.247301
--10.226974, -9.174320, -10.996215, -10.374791, -9.785427, -10.734714, -10.340582, -12.953363, -10.006269, -10.570451, -10.160367, -10.087976, -10.335959, -10.962595, -9.626739, -10.299623
--9.353292, -9.707042, -10.380186, -6.945875, -11.010234, -9.477172, -10.766120, -10.720449, -9.501830, -8.815282, -10.708544, -5.791427, -3.993972, -5.845197, -4.532529, -5.050685
--4.386009, -6.971782, -5.995297, -3.750091, -4.318816, -4.732792, -5.568521, -2.121042, -1.830385, -9.028361, -2.175074, -3.636017, -2.960751, -15.161597, -2.215909, -18.768914
-0.610858, 0.000000, -7.642458, -53.660256, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000
-ptzero2v2=
-0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-37.604317, 0.000000, -28.504655, 0.000000, 0.000000
--141.533875, -100.961039, 0.000000, 0.000000, -45.978988, -24.858311, -48.209091, 0.000000, -15.880583, -32.436479, -13.257749, -5.943507, -9.743805, -4.174598, 1.944014, -4.606719
--3.619679, -4.413314, -8.416052, -3.738153, -3.967478, -5.204751, -4.326619, -5.534777, -0.146787, -4.514669, -6.606637, -4.138715, -1.043111, -1.946207, -3.997393, 2.159741
--0.618348, -0.741102, -0.999896, -1.359879, -1.231328, -4.741489, -5.112739, -1.542339, -4.440641, -5.471449, -2.035940, -5.662694, -5.896362, -6.323800, -6.010244, -8.580261
--4.939808, -9.398299, -10.299962, -10.304598, -8.514383, -7.123578, -11.229174, -8.725849, -9.808477, -5.563397, -10.383741, -7.472473, -3.801143, 0.424204, 0.343059, 0.156063
--5.490818, -4.624278, -5.172937, -6.128613, -1.328373, -5.685114, -3.825429, -1.085119, -5.675205, -11.406518, -15.548282, -3.319362, -4.981827, -2.869266, 0.000000, -10.741921
--6.196717, -3.110506, -13.799576, -4.631239, -42.127820, -79.386014, -14.186013, -2.197506, -79.979565, -27.679421, 0.000000
-ptzero2v1=
-0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-23.717949, 0.000000, 10.398050, -70.818182, 0.000000
-0.000000, -37.765432, 5.294833, -32.638458, -106.886325, -26.785085, -15.467999, 0.000000, -9.784420, -48.878698, -18.789244, -17.402737, -11.181371, -22.856217, -5.695332, -5.187437
--3.622592, -6.500670, -8.583221, -2.716535, -2.337439, -3.040457, -5.724634, -5.902688, -7.303507, -1.385484, -5.207856, -0.802869, 0.441249, -2.325590, -1.465976, -0.890137
-5.723925, -0.188723, -0.350376, -0.509607, -4.973295, -1.052429, -0.448172, -0.347411, -0.566278, -1.374477, -0.344245, -2.462067, -0.960446, -1.854361, -0.955282, -4.076119
--5.403027, -7.440255, -7.580016, -6.106551, -6.131781, -8.215242, -6.260587, -8.727596, -5.116322, 0.000000, -6.745580, -5.667905, -0.395179, -4.817931, -4.566938, -6.167591
--11.664066, -9.883788, -9.377983, -9.866910, -6.976637, -10.706406, -5.624295, -4.503593, -9.032694, -15.123819, 1.862564, -5.068974, -10.039419, -5.442039, -1.402360, -3.141545
--8.040079, -27.290684, -7.068054, -9.742514, -7.595452, -22.079152, -1.876697, 0.000000, 15.698869, 0.000000, 0.000000
-ptzero2x2=
--7.738709,-70.165316,-6.778759,-13.764117,-27.065317,-23.415934,-17.194655,-32.699601,-34.090713,-37.035109,-32.996523,-33.416789, -26.246494, -26.327377, -10.998414, -13.029878
--14.652574, -10.386117, -12.131754, -12.286646, -14.152385, -14.475647, -11.020836, -14.694305, -14.474492, -16.713307, -10.652424, -12.319482, -11.017516, -5.329535, -6.552903, -4.802238
-0.855594, -0.721039, 1.002864, 0.459430, -7.862938, -9.045182, -7.344548, -6.580071, -9.110956, -9.287062, 0.000000, -8.688518, -10.256260, -9.307199, -6.432222, -5.467464
--4.650088, -5.403934, -4.191673, -0.163439, -1.132885, -1.036952, -4.044332, -3.430422, -4.508107, -4.117001, -5.147563, -6.028815, -8.373154, -6.008642, -5.595526, -4.718886
--1.546568, 0.668340, 1.664058, -0.259384, 0.654934, 0.893969, 2.780482, -0.471069, 5.497857, 4.915438, 5.129543, 6.600802, 5.493347, 4.513854, 5.567586
-ptzero2x1=
--8.857006,-6.835762,-8.484922,-15.677214,-9.409408,-14.555694,-13.642859,-35.808231,-29.308084,-30.489463,-37.113694,-28.112563, -30.181444, -30.955687, -7.661478, -6.118341
--6.180800, -8.272982, -8.337601, -10.322435, -8.070147, -8.491810, -14.802555, -12.198166, -9.234541, -8.114398, -8.991789, -10.072549, -11.045203, -4.585136, 1.404827, -0.609479
--4.773475, -4.896687, -4.048970, -4.378171, -10.217971, -10.124770, -11.094293, -9.980148, -12.214139, -10.953473, -10.269857, -9.963092, -14.123446, -10.783189, -10.851340, -13.852492
--10.431783, -10.157741, -8.648322, -8.160446, -5.828140, -9.402243, -9.365602, -10.101056, -9.612244, -9.349151, -10.275707, -10.118141, -13.031918, -9.895050, -10.145918, -10.306377
--2.659682, 2.059506, 0.234932, 1.138859, 0.429106, 3.781635, 3.738539, 0.588026, 0.565674, 5.183043, 6.945067, 5.702568, 5.653212, 5.811678, 8.052763
-ptzero2u2=
-0.000000,0.000000,-81.805825,-7.658573,-8.680902,-68.963470,-33.917553,-36.558713,-32.231096,-5.307131,-17.958774,0.000000, -9.610909, -14.067282, -16.838356, -11.458683
--9.701599, -21.271680, -13.891508, -9.943052, -14.318237, -30.289808, -15.009664, -8.159707, -9.232988, -12.693153, -9.734148, -6.638037, -6.247705, -7.278174, -6.063763, 1.480555
--14.340321, -11.903690, -2.567057, -7.702670, -9.941212, -7.062838, -5.498039, -5.550918, -3.195592, -5.536720, -5.446182, -6.451206, -10.212149, -9.793741, -8.009971, -10.404054
--8.521498, -10.661369, -9.431566, -6.425367, -10.590730, -10.130491, -10.225396, -10.547321, -9.656655, -13.286903, -10.160071, -9.599908, -6.151144, -5.618537, -9.326286, -5.199788
--6.177496, -9.190011, -9.702095, -6.602321, -6.063407, -5.440984, -6.818605, -11.648772, -6.125139, -5.912331, -4.403718, -4.929408, -5.212071, -5.223724, -2.841251, -6.659634
--2.975184, -4.912972, -0.692701, -8.634152, -3.194877, -4.144765, -6.415722, -5.628076, -1.587482, -3.581284, -4.916867, 1.103407, 2.399031, 4.770044, -0.261184, 6.489866
-7.266291, 3.784884, -16.433059, -4.263158, 0.000000, -29.595142, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000
-ptzero2u1=
-0.000000,0.000000,-63.037657,-34.284483,0.000000,-8.707799,-50.888000,-31.113381,-70.600000,-31.520131,-15.295504,-1.667615, -5.243772, -35.168736, -18.141328, -17.221143
--18.488463, -87.874825, -14.268102, -23.799658, -24.382426, -20.739753, -24.863127, -28.851869, -10.930956, -12.241507, -13.317629, -14.289803, -9.875598, -10.442230, -9.411930, -6.766031
--6.790662, -5.792764, -10.864811, -5.354368, -7.010249, -7.171546, -7.032583, -5.426115, -5.829093, -2.389591, -3.407211, -5.828068, -5.240366, -3.042670, -4.573502, -1.026990
--1.809500, -0.471448, -0.251271, -0.511999, -0.751282, -0.520347, -0.509400, -0.790324, 0.091822, -0.524368, -1.068919, 0.080391, 1.838865, 0.877236, -0.767351, -9.350918
--5.444959, -5.702062, -5.332267, -4.095361, -5.956872, -6.089232, -6.195348, -4.682092, -6.267510, -5.609456, -6.422312, -0.757417, -1.239823, -1.593755, -4.907500, -6.934397
--6.196614, -5.828755, -6.517036, -5.751733, -6.479484, -5.859008, -5.016583, -3.053465, -1.025906, -2.524233, -1.884888, -2.146358, -7.397653, -6.470846, -7.458407, 7.569476
--0.303899, 9.642446, 1.733973, -5.403836, 0.000000, -87.060625, 37.472809, -49.069767, 0.000000, 0.000000, 0.000000
diff --git a/PARAM/SHMS/DC/pdc_calib.param b/PARAM/SHMS/DC/pdc_calib.param
new file mode 100644
index 00000000..bbd1fb6e
--- /dev/null
+++ b/PARAM/SHMS/DC/pdc_calib.param
@@ -0,0 +1,175 @@
+; Lookup Table: RUN 2081
+; number of bins in time to distance lookup table
+pdriftbins = 275
+; number of 1st bin in table in ns
+pdrift1stbin=0
+; bin size in ns
+pdriftbinsz=1
+pwc1u1fract=0.00070,0.00146,0.00232,0.00332,0.00451,0.00572,0.00727,0.00903,0.01107,0.01339,0.01608,0.01921,0.02284,0.02683,0.03115,0.03572,0.04092,0.04648,0.05267
+0.05923,0.06592,0.07294,0.08026,0.08775,0.09575,0.10371,0.11199,0.12070,0.12932,0.13802,0.14723,0.15641,0.16580,0.17516,0.18457,0.19404,0.20340,0.21264,0.22232
+0.23198,0.24186,0.25148,0.26134,0.27115,0.28089,0.29077,0.30074,0.31061,0.32030,0.33028,0.34010,0.35025,0.36034,0.37036,0.38038,0.39062,0.40068,0.41062,0.42046
+0.43049,0.44040,0.45029,0.46022,0.47009,0.48006,0.48985,0.49997,0.51000,0.51985,0.52988,0.53969,0.54954,0.55938,0.56914,0.57884,0.58844,0.59824,0.60778,0.61709
+0.62659,0.63629,0.64568,0.65506,0.66429,0.67341,0.68272,0.69174,0.70078,0.70975,0.71854,0.72736,0.73604,0.74475,0.75306,0.76121,0.76944,0.77730,0.78492,0.79270
+0.80002,0.80716,0.81445,0.82108,0.82773,0.83389,0.84002,0.84592,0.85139,0.85669,0.86157,0.86633,0.87055,0.87474,0.87867,0.88220,0.88555,0.88873,0.89175,0.89466
+0.89741,0.89995,0.90229,0.90454,0.90667,0.90870,0.91067,0.91247,0.91429,0.91608,0.91783,0.91949,0.92105,0.92247,0.92391,0.92527,0.92657,0.92783,0.92910,0.93027
+0.93135,0.93249,0.93355,0.93459,0.93560,0.93659,0.93752,0.93849,0.93941,0.94016,0.94100,0.94185,0.94266,0.94339,0.94414,0.94485,0.94554,0.94617,0.94677,0.94738
+0.94796,0.94857,0.94914,0.94973,0.95033,0.95090,0.95149,0.95202,0.95252,0.95307,0.95360,0.95410,0.95459,0.95507,0.95556,0.95608,0.95654,0.95705,0.95748,0.95794
+0.95838,0.95884,0.95929,0.95973,0.96018,0.96063,0.96108,0.96150,0.96195,0.96240,0.96284,0.96328,0.96369,0.96410,0.96456,0.96500,0.96542,0.96586,0.96628,0.96670
+0.96710,0.96750,0.96798,0.96841,0.96888,0.96930,0.96973,0.97017,0.97055,0.97102,0.97146,0.97191,0.97236,0.97277,0.97321,0.97369,0.97413,0.97450,0.97494,0.97536
+0.97579,0.97623,0.97666,0.97705,0.97752,0.97798,0.97845,0.97889,0.97931,0.97974,0.98016,0.98063,0.98106,0.98154,0.98199,0.98246,0.98295,0.98340,0.98387,0.98434
+0.98480,0.98525,0.98572,0.98624,0.98667,0.98712,0.98755,0.98800,0.98849,0.98897,0.98941,0.98988,0.99027,0.99074,0.99115,0.99158,0.99200,0.99246,0.99288,0.99332
+0.99378,0.99422,0.99468,0.99511,0.99557,0.99598,0.99643,0.99685,0.99730,0.99774,0.99817,0.99857,0.99894,0.99931,0.99968,1.00000
+pwc1u2fract=0.00071,0.00152,0.00243,0.00345,0.00461,0.00599,0.00751,0.00936,0.01154,0.01407,0.01706,0.02031,0.02396,0.02809,0.03272,0.03792,0.04327,0.04921,0.05559
+0.06227,0.06914,0.07647,0.08420,0.09218,0.10050,0.10918,0.11767,0.12646,0.13535,0.14454,0.15350,0.16290,0.17221,0.18173,0.19125,0.20073,0.21039,0.21987,0.22971
+0.23950,0.24918,0.25890,0.26857,0.27840,0.28808,0.29777,0.30749,0.31743,0.32726,0.33718,0.34715,0.35719,0.36715,0.37711,0.38701,0.39708,0.40702,0.41706,0.42703
+0.43703,0.44713,0.45721,0.46733,0.47744,0.48744,0.49744,0.50723,0.51720,0.52709,0.53689,0.54687,0.55691,0.56684,0.57660,0.58629,0.59593,0.60553,0.61498,0.62462
+0.63407,0.64351,0.65278,0.66206,0.67129,0.68040,0.68934,0.69831,0.70714,0.71587,0.72458,0.73324,0.74171,0.75006,0.75830,0.76645,0.77431,0.78210,0.78988,0.79728
+0.80460,0.81177,0.81855,0.82520,0.83153,0.83766,0.84365,0.84922,0.85470,0.85976,0.86446,0.86883,0.87311,0.87720,0.88106,0.88457,0.88789,0.89092,0.89379,0.89662
+0.89921,0.90163,0.90383,0.90599,0.90805,0.91003,0.91183,0.91368,0.91539,0.91703,0.91867,0.92029,0.92172,0.92314,0.92454,0.92594,0.92719,0.92846,0.92966,0.93080
+0.93194,0.93302,0.93405,0.93502,0.93602,0.93697,0.93787,0.93876,0.93964,0.94048,0.94131,0.94212,0.94285,0.94353,0.94423,0.94492,0.94556,0.94622,0.94692,0.94756
+0.94819,0.94882,0.94940,0.94996,0.95052,0.95105,0.95161,0.95217,0.95271,0.95320,0.95371,0.95418,0.95471,0.95515,0.95564,0.95611,0.95656,0.95705,0.95752,0.95796
+0.95839,0.95880,0.95924,0.95974,0.96019,0.96061,0.96105,0.96150,0.96197,0.96240,0.96283,0.96326,0.96370,0.96413,0.96455,0.96501,0.96547,0.96587,0.96627,0.96670
+0.96712,0.96758,0.96805,0.96848,0.96892,0.96934,0.96975,0.97020,0.97061,0.97109,0.97152,0.97192,0.97235,0.97282,0.97325,0.97366,0.97410,0.97455,0.97501,0.97546
+0.97595,0.97639,0.97680,0.97728,0.97777,0.97818,0.97864,0.97912,0.97953,0.97996,0.98043,0.98088,0.98134,0.98180,0.98229,0.98276,0.98322,0.98364,0.98406,0.98448
+0.98498,0.98545,0.98596,0.98638,0.98684,0.98726,0.98774,0.98816,0.98861,0.98904,0.98950,0.98997,0.99036,0.99079,0.99127,0.99171,0.99215,0.99254,0.99300,0.99346
+0.99389,0.99435,0.99479,0.99518,0.99564,0.99602,0.99646,0.99687,0.99734,0.99779,0.99820,0.99861,0.99897,0.99935,0.99968,1.00000
+pwc1x1fract=0.00080,0.00160,0.00240,0.00347,0.00473,0.00612,0.00778,0.00970,0.01198,0.01467,0.01791,0.02161,0.02558,0.03009,0.03507,0.04043,0.04648,0.05289,0.05962
+0.06678,0.07423,0.08209,0.09039,0.09894,0.10748,0.11624,0.12530,0.13439,0.14374,0.15307,0.16214,0.17140,0.18102,0.19063,0.20006,0.20975,0.21930,0.22896,0.23874
+0.24847,0.25814,0.26767,0.27744,0.28714,0.29679,0.30653,0.31655,0.32644,0.33623,0.34627,0.35612,0.36605,0.37585,0.38563,0.39560,0.40567,0.41578,0.42578,0.43593
+0.44580,0.45581,0.46569,0.47554,0.48528,0.49532,0.50527,0.51524,0.52492,0.53454,0.54438,0.55399,0.56358,0.57318,0.58272,0.59216,0.60157,0.61095,0.62015,0.62942
+0.63884,0.64794,0.65725,0.66625,0.67539,0.68429,0.69325,0.70211,0.71098,0.71953,0.72806,0.73657,0.74491,0.75335,0.76157,0.76948,0.77743,0.78506,0.79253,0.79981
+0.80684,0.81393,0.82052,0.82690,0.83308,0.83892,0.84435,0.84977,0.85478,0.85967,0.86418,0.86843,0.87242,0.87616,0.87974,0.88304,0.88616,0.88925,0.89197,0.89459
+0.89702,0.89944,0.90166,0.90382,0.90587,0.90792,0.90988,0.91163,0.91341,0.91507,0.91672,0.91821,0.91969,0.92114,0.92258,0.92390,0.92529,0.92659,0.92777,0.92899
+0.93026,0.93142,0.93251,0.93360,0.93463,0.93556,0.93653,0.93749,0.93841,0.93925,0.94017,0.94100,0.94183,0.94256,0.94335,0.94407,0.94485,0.94562,0.94635,0.94700
+0.94764,0.94827,0.94884,0.94944,0.95007,0.95063,0.95120,0.95184,0.95239,0.95291,0.95343,0.95393,0.95446,0.95496,0.95547,0.95595,0.95641,0.95686,0.95736,0.95781
+0.95827,0.95871,0.95911,0.95952,0.95995,0.96040,0.96080,0.96121,0.96170,0.96212,0.96255,0.96297,0.96340,0.96385,0.96427,0.96469,0.96508,0.96554,0.96603,0.96648
+0.96690,0.96730,0.96777,0.96819,0.96860,0.96911,0.96955,0.96999,0.97047,0.97088,0.97131,0.97174,0.97220,0.97264,0.97308,0.97352,0.97401,0.97445,0.97489,0.97535
+0.97576,0.97620,0.97663,0.97709,0.97755,0.97798,0.97843,0.97889,0.97942,0.97988,0.98040,0.98087,0.98131,0.98176,0.98222,0.98263,0.98308,0.98355,0.98404,0.98450
+0.98494,0.98540,0.98585,0.98629,0.98676,0.98725,0.98773,0.98824,0.98871,0.98914,0.98957,0.99007,0.99052,0.99100,0.99148,0.99189,0.99238,0.99282,0.99328,0.99374
+0.99419,0.99464,0.99510,0.99554,0.99597,0.99636,0.99673,0.99714,0.99752,0.99790,0.99832,0.99870,0.99908,0.99939,0.99968,1.00000
+pwc1x2fract=0.00073,0.00149,0.00241,0.00344,0.00463,0.00599,0.00749,0.00938,0.01159,0.01425,0.01730,0.02087,0.02497,0.02948,0.03462,0.04003,0.04587,0.05214,0.05911
+0.06653,0.07401,0.08198,0.09029,0.09847,0.10721,0.11594,0.12496,0.13385,0.14284,0.15221,0.16153,0.17084,0.18017,0.18963,0.19900,0.20837,0.21782,0.22739,0.23687
+0.24622,0.25573,0.26544,0.27524,0.28479,0.29480,0.30449,0.31426,0.32395,0.33346,0.34308,0.35301,0.36279,0.37255,0.38223,0.39200,0.40190,0.41178,0.42166,0.43148
+0.44128,0.45088,0.46078,0.47061,0.48053,0.49046,0.50035,0.50980,0.51971,0.52957,0.53934,0.54888,0.55839,0.56759,0.57693,0.58636,0.59570,0.60517,0.61454,0.62369
+0.63298,0.64208,0.65141,0.66039,0.66943,0.67838,0.68722,0.69604,0.70479,0.71359,0.72220,0.73069,0.73892,0.74713,0.75529,0.76336,0.77132,0.77924,0.78672,0.79406
+0.80131,0.80834,0.81526,0.82183,0.82801,0.83406,0.83993,0.84544,0.85086,0.85577,0.86045,0.86479,0.86900,0.87287,0.87672,0.88017,0.88338,0.88640,0.88940,0.89214
+0.89472,0.89714,0.89940,0.90150,0.90362,0.90548,0.90746,0.90928,0.91098,0.91268,0.91442,0.91590,0.91748,0.91902,0.92054,0.92200,0.92335,0.92473,0.92600,0.92727
+0.92846,0.92966,0.93070,0.93178,0.93288,0.93398,0.93506,0.93605,0.93702,0.93797,0.93887,0.93975,0.94064,0.94148,0.94225,0.94305,0.94376,0.94448,0.94519,0.94585
+0.94658,0.94723,0.94788,0.94849,0.94917,0.94979,0.95034,0.95094,0.95150,0.95209,0.95267,0.95316,0.95362,0.95412,0.95461,0.95509,0.95557,0.95602,0.95651,0.95704
+0.95750,0.95798,0.95842,0.95885,0.95928,0.95972,0.96013,0.96056,0.96102,0.96149,0.96190,0.96230,0.96272,0.96319,0.96368,0.96410,0.96457,0.96501,0.96547,0.96593
+0.96637,0.96686,0.96728,0.96776,0.96818,0.96864,0.96902,0.96948,0.96990,0.97035,0.97078,0.97126,0.97169,0.97213,0.97256,0.97305,0.97348,0.97393,0.97440,0.97492
+0.97542,0.97585,0.97635,0.97682,0.97728,0.97777,0.97825,0.97869,0.97913,0.97958,0.98004,0.98050,0.98099,0.98145,0.98193,0.98242,0.98291,0.98332,0.98378,0.98422
+0.98468,0.98515,0.98566,0.98613,0.98658,0.98701,0.98750,0.98795,0.98841,0.98884,0.98930,0.98977,0.99020,0.99065,0.99111,0.99152,0.99199,0.99242,0.99285,0.99326
+0.99376,0.99420,0.99464,0.99509,0.99556,0.99603,0.99649,0.99690,0.99735,0.99775,0.99816,0.99854,0.99894,0.99931,0.99963,1.00000
+pwc1v1fract=0.00070,0.00145,0.00242,0.00349,0.00469,0.00604,0.00763,0.00944,0.01161,0.01408,0.01704,0.02041,0.02419,0.02843,0.03302,0.03808,0.04348,0.04924,0.05545
+0.06215,0.06928,0.07677,0.08440,0.09223,0.10034,0.10882,0.11757,0.12630,0.13522,0.14444,0.15365,0.16296,0.17224,0.18162,0.19137,0.20108,0.21072,0.22046,0.23021
+0.24009,0.24990,0.25963,0.26960,0.27940,0.28923,0.29913,0.30899,0.31886,0.32889,0.33905,0.34884,0.35880,0.36875,0.37869,0.38863,0.39874,0.40904,0.41910,0.42902
+0.43891,0.44890,0.45870,0.46863,0.47863,0.48855,0.49875,0.50852,0.51859,0.52846,0.53817,0.54778,0.55765,0.56746,0.57710,0.58646,0.59598,0.60541,0.61492,0.62415
+0.63320,0.64279,0.65191,0.66106,0.67017,0.67936,0.68820,0.69692,0.70565,0.71455,0.72307,0.73170,0.74021,0.74852,0.75695,0.76494,0.77290,0.78074,0.78862,0.79604
+0.80348,0.81066,0.81742,0.82394,0.83053,0.83681,0.84261,0.84832,0.85378,0.85877,0.86341,0.86785,0.87229,0.87616,0.87990,0.88334,0.88680,0.88988,0.89275,0.89546
+0.89817,0.90059,0.90276,0.90499,0.90703,0.90912,0.91099,0.91272,0.91441,0.91608,0.91768,0.91927,0.92083,0.92231,0.92373,0.92520,0.92647,0.92774,0.92895,0.93013
+0.93131,0.93239,0.93351,0.93454,0.93555,0.93658,0.93749,0.93843,0.93935,0.94020,0.94104,0.94192,0.94266,0.94336,0.94410,0.94483,0.94547,0.94616,0.94692,0.94754
+0.94823,0.94881,0.94942,0.94998,0.95062,0.95122,0.95179,0.95244,0.95297,0.95348,0.95400,0.95453,0.95502,0.95550,0.95599,0.95647,0.95697,0.95747,0.95791,0.95839
+0.95883,0.95928,0.95977,0.96016,0.96061,0.96108,0.96153,0.96196,0.96239,0.96279,0.96318,0.96365,0.96409,0.96451,0.96493,0.96535,0.96576,0.96622,0.96665,0.96706
+0.96744,0.96786,0.96829,0.96875,0.96912,0.96954,0.97006,0.97045,0.97084,0.97125,0.97170,0.97212,0.97258,0.97299,0.97350,0.97394,0.97434,0.97476,0.97521,0.97566
+0.97609,0.97652,0.97694,0.97740,0.97782,0.97829,0.97876,0.97921,0.97967,0.98010,0.98058,0.98105,0.98152,0.98201,0.98250,0.98295,0.98338,0.98390,0.98433,0.98481
+0.98528,0.98573,0.98616,0.98667,0.98708,0.98749,0.98793,0.98838,0.98881,0.98932,0.98978,0.99026,0.99072,0.99117,0.99162,0.99210,0.99259,0.99304,0.99347,0.99393
+0.99433,0.99484,0.99528,0.99569,0.99609,0.99654,0.99703,0.99742,0.99780,0.99821,0.99855,0.99889,0.99922,0.99952,0.99976,1.00000
+pwc1v2fract=0.00075,0.00148,0.00232,0.00323,0.00440,0.00572,0.00713,0.00894,0.01093,0.01324,0.01592,0.01909,0.02259,0.02648,0.03079,0.03554,0.04097,0.04659,0.05272
+0.05922,0.06608,0.07332,0.08092,0.08880,0.09691,0.10522,0.11369,0.12249,0.13128,0.14029,0.14956,0.15862,0.16796,0.17720,0.18664,0.19610,0.20591,0.21534,0.22490
+0.23459,0.24434,0.25424,0.26387,0.27341,0.28310,0.29272,0.30262,0.31242,0.32219,0.33210,0.34201,0.35173,0.36158,0.37167,0.38171,0.39181,0.40200,0.41197,0.42184
+0.43181,0.44173,0.45165,0.46164,0.47159,0.48171,0.49169,0.50162,0.51142,0.52134,0.53131,0.54116,0.55093,0.56059,0.57035,0.58017,0.58957,0.59906,0.60870,0.61812
+0.62764,0.63704,0.64664,0.65587,0.66502,0.67407,0.68307,0.69216,0.70120,0.70988,0.71858,0.72750,0.73604,0.74475,0.75335,0.76177,0.76977,0.77764,0.78544,0.79306
+0.80045,0.80770,0.81468,0.82154,0.82824,0.83445,0.84049,0.84629,0.85200,0.85718,0.86198,0.86653,0.87097,0.87510,0.87896,0.88241,0.88591,0.88910,0.89211,0.89498
+0.89770,0.90012,0.90244,0.90476,0.90689,0.90893,0.91084,0.91272,0.91446,0.91614,0.91771,0.91936,0.92093,0.92240,0.92387,0.92514,0.92651,0.92770,0.92890,0.93007
+0.93120,0.93231,0.93341,0.93444,0.93546,0.93644,0.93743,0.93835,0.93924,0.94010,0.94097,0.94175,0.94248,0.94328,0.94403,0.94481,0.94547,0.94620,0.94682,0.94748
+0.94815,0.94872,0.94933,0.94993,0.95055,0.95109,0.95163,0.95219,0.95272,0.95321,0.95371,0.95420,0.95465,0.95513,0.95566,0.95614,0.95664,0.95706,0.95753,0.95795
+0.95836,0.95882,0.95922,0.95966,0.96011,0.96055,0.96098,0.96137,0.96182,0.96224,0.96264,0.96308,0.96350,0.96396,0.96439,0.96483,0.96523,0.96569,0.96614,0.96654
+0.96692,0.96733,0.96774,0.96816,0.96860,0.96900,0.96938,0.96978,0.97021,0.97067,0.97108,0.97154,0.97201,0.97246,0.97288,0.97337,0.97380,0.97425,0.97470,0.97516
+0.97562,0.97607,0.97649,0.97696,0.97740,0.97784,0.97824,0.97866,0.97907,0.97953,0.98003,0.98049,0.98095,0.98144,0.98190,0.98235,0.98288,0.98335,0.98378,0.98424
+0.98467,0.98511,0.98555,0.98602,0.98646,0.98688,0.98738,0.98786,0.98828,0.98877,0.98925,0.98970,0.99020,0.99064,0.99109,0.99155,0.99200,0.99248,0.99295,0.99336
+0.99382,0.99425,0.99465,0.99509,0.99554,0.99599,0.99642,0.99688,0.99733,0.99773,0.99809,0.99848,0.99887,0.99928,0.99964,1.00000
+pwc2v2fract=0.00067,0.00139,0.00228,0.00336,0.00442,0.00580,0.00738,0.00916,0.01121,0.01374,0.01638,0.01962,0.02346,0.02752,0.03193,0.03688,0.04232,0.04810,0.05437
+0.06089,0.06797,0.07519,0.08301,0.09101,0.09933,0.10769,0.11636,0.12518,0.13407,0.14317,0.15248,0.16170,0.17097,0.18024,0.18966,0.19913,0.20879,0.21826,0.22775
+0.23727,0.24676,0.25655,0.26624,0.27590,0.28572,0.29563,0.30519,0.31468,0.32416,0.33411,0.34416,0.35391,0.36375,0.37371,0.38379,0.39370,0.40373,0.41362,0.42369
+0.43387,0.44404,0.45424,0.46436,0.47455,0.48462,0.49466,0.50475,0.51443,0.52449,0.53453,0.54435,0.55407,0.56367,0.57341,0.58302,0.59275,0.60218,0.61175,0.62110
+0.63047,0.63991,0.64940,0.65863,0.66768,0.67683,0.68592,0.69476,0.70381,0.71257,0.72138,0.72999,0.73866,0.74718,0.75570,0.76414,0.77221,0.78023,0.78814,0.79578
+0.80331,0.81052,0.81762,0.82442,0.83092,0.83712,0.84323,0.84886,0.85415,0.85924,0.86415,0.86884,0.87324,0.87729,0.88101,0.88460,0.88788,0.89116,0.89399,0.89681
+0.89937,0.90178,0.90410,0.90634,0.90841,0.91034,0.91226,0.91406,0.91587,0.91751,0.91914,0.92073,0.92219,0.92352,0.92487,0.92624,0.92757,0.92885,0.93009,0.93127
+0.93236,0.93345,0.93455,0.93563,0.93674,0.93766,0.93858,0.93956,0.94039,0.94124,0.94205,0.94284,0.94361,0.94435,0.94509,0.94586,0.94658,0.94726,0.94796,0.94856
+0.94915,0.94978,0.95043,0.95105,0.95164,0.95221,0.95277,0.95329,0.95388,0.95439,0.95493,0.95547,0.95595,0.95643,0.95695,0.95745,0.95787,0.95833,0.95876,0.95922
+0.95964,0.96006,0.96054,0.96098,0.96139,0.96185,0.96228,0.96272,0.96315,0.96360,0.96406,0.96452,0.96489,0.96526,0.96569,0.96611,0.96651,0.96692,0.96736,0.96782
+0.96827,0.96867,0.96911,0.96953,0.97001,0.97040,0.97084,0.97127,0.97171,0.97217,0.97258,0.97306,0.97352,0.97397,0.97442,0.97491,0.97533,0.97578,0.97620,0.97661
+0.97702,0.97746,0.97788,0.97828,0.97874,0.97916,0.97956,0.98001,0.98043,0.98090,0.98130,0.98172,0.98217,0.98262,0.98302,0.98345,0.98389,0.98435,0.98483,0.98531
+0.98575,0.98618,0.98666,0.98717,0.98767,0.98806,0.98850,0.98900,0.98946,0.98986,0.99030,0.99079,0.99124,0.99171,0.99214,0.99257,0.99304,0.99351,0.99395,0.99440
+0.99484,0.99522,0.99570,0.99609,0.99649,0.99694,0.99734,0.99773,0.99811,0.99844,0.99877,0.99907,0.99938,0.99964,0.99984,1.00000
+pwc2v1fract=0.00071,0.00144,0.00232,0.00327,0.00441,0.00583,0.00741,0.00924,0.01135,0.01379,0.01652,0.01970,0.02341,0.02738,0.03194,0.03713,0.04261,0.04851,0.05486
+0.06150,0.06858,0.07602,0.08376,0.09165,0.09964,0.10805,0.11668,0.12545,0.13429,0.14326,0.15258,0.16199,0.17132,0.18079,0.19048,0.20009,0.20989,0.21935,0.22878
+0.23870,0.24850,0.25833,0.26782,0.27749,0.28746,0.29734,0.30729,0.31736,0.32728,0.33716,0.34721,0.35699,0.36702,0.37709,0.38702,0.39719,0.40724,0.41729,0.42753
+0.43769,0.44777,0.45771,0.46783,0.47780,0.48772,0.49767,0.50766,0.51781,0.52778,0.53778,0.54753,0.55752,0.56741,0.57709,0.58686,0.59643,0.60583,0.61529,0.62480
+0.63430,0.64361,0.65305,0.66219,0.67157,0.68078,0.68975,0.69872,0.70769,0.71648,0.72544,0.73419,0.74274,0.75130,0.75948,0.76778,0.77570,0.78343,0.79114,0.79866
+0.80601,0.81297,0.81985,0.82674,0.83331,0.83948,0.84544,0.85108,0.85647,0.86140,0.86625,0.87063,0.87497,0.87899,0.88282,0.88641,0.88952,0.89264,0.89552,0.89826
+0.90082,0.90331,0.90545,0.90758,0.90970,0.91166,0.91356,0.91535,0.91702,0.91863,0.92019,0.92168,0.92324,0.92462,0.92592,0.92721,0.92846,0.92967,0.93084,0.93202
+0.93316,0.93430,0.93534,0.93639,0.93736,0.93824,0.93916,0.94002,0.94090,0.94174,0.94259,0.94335,0.94413,0.94490,0.94563,0.94633,0.94708,0.94779,0.94838,0.94902
+0.94964,0.95019,0.95085,0.95141,0.95203,0.95265,0.95318,0.95372,0.95432,0.95484,0.95537,0.95586,0.95640,0.95691,0.95738,0.95789,0.95837,0.95883,0.95928,0.95970
+0.96013,0.96054,0.96098,0.96141,0.96184,0.96222,0.96267,0.96313,0.96357,0.96399,0.96439,0.96480,0.96520,0.96557,0.96604,0.96649,0.96690,0.96731,0.96774,0.96817
+0.96857,0.96903,0.96945,0.96987,0.97033,0.97080,0.97125,0.97167,0.97206,0.97251,0.97296,0.97336,0.97383,0.97427,0.97470,0.97518,0.97565,0.97605,0.97652,0.97697
+0.97743,0.97788,0.97834,0.97879,0.97920,0.97964,0.98011,0.98057,0.98099,0.98140,0.98197,0.98245,0.98291,0.98334,0.98378,0.98428,0.98471,0.98522,0.98566,0.98611
+0.98653,0.98697,0.98735,0.98781,0.98825,0.98873,0.98915,0.98958,0.99002,0.99042,0.99084,0.99124,0.99170,0.99209,0.99252,0.99296,0.99335,0.99376,0.99417,0.99455
+0.99504,0.99546,0.99588,0.99624,0.99664,0.99702,0.99739,0.99775,0.99808,0.99847,0.99877,0.99905,0.99935,0.99961,0.99981,1.00000
+pwc2x2fract=0.00076,0.00157,0.00249,0.00351,0.00473,0.00611,0.00780,0.00958,0.01196,0.01470,0.01800,0.02185,0.02591,0.03057,0.03579,0.04150,0.04755,0.05415,0.06113
+0.06861,0.07639,0.08457,0.09287,0.10135,0.11023,0.11934,0.12848,0.13760,0.14669,0.15597,0.16527,0.17480,0.18423,0.19374,0.20345,0.21284,0.22233,0.23186,0.24144
+0.25118,0.26080,0.27051,0.27993,0.28982,0.29947,0.30927,0.31882,0.32858,0.33833,0.34799,0.35769,0.36757,0.37725,0.38721,0.39698,0.40701,0.41675,0.42659,0.43657
+0.44653,0.45665,0.46649,0.47628,0.48616,0.49572,0.50550,0.51532,0.52486,0.53437,0.54407,0.55402,0.56383,0.57346,0.58290,0.59244,0.60201,0.61144,0.62077,0.63035
+0.63984,0.64910,0.65834,0.66769,0.67688,0.68580,0.69464,0.70366,0.71241,0.72118,0.72992,0.73825,0.74670,0.75497,0.76318,0.77114,0.77896,0.78690,0.79450,0.80182
+0.80900,0.81596,0.82264,0.82904,0.83531,0.84137,0.84680,0.85218,0.85735,0.86220,0.86670,0.87108,0.87513,0.87872,0.88228,0.88539,0.88843,0.89125,0.89391,0.89639
+0.89887,0.90124,0.90344,0.90554,0.90763,0.90946,0.91131,0.91306,0.91480,0.91659,0.91818,0.91966,0.92111,0.92245,0.92387,0.92530,0.92661,0.92784,0.92906,0.93030
+0.93155,0.93275,0.93388,0.93491,0.93590,0.93689,0.93790,0.93883,0.93973,0.94065,0.94153,0.94234,0.94322,0.94403,0.94478,0.94553,0.94628,0.94697,0.94760,0.94827
+0.94894,0.94957,0.95025,0.95087,0.95150,0.95211,0.95266,0.95322,0.95376,0.95425,0.95475,0.95530,0.95579,0.95630,0.95677,0.95725,0.95770,0.95818,0.95865,0.95909
+0.95957,0.96003,0.96046,0.96094,0.96140,0.96184,0.96232,0.96273,0.96317,0.96361,0.96402,0.96445,0.96484,0.96524,0.96569,0.96605,0.96647,0.96694,0.96738,0.96782
+0.96822,0.96866,0.96906,0.96950,0.96993,0.97035,0.97072,0.97118,0.97163,0.97210,0.97254,0.97303,0.97342,0.97382,0.97425,0.97472,0.97515,0.97559,0.97599,0.97641
+0.97691,0.97733,0.97778,0.97819,0.97862,0.97907,0.97955,0.97999,0.98049,0.98093,0.98140,0.98188,0.98228,0.98272,0.98317,0.98361,0.98410,0.98460,0.98504,0.98552
+0.98594,0.98641,0.98685,0.98726,0.98770,0.98811,0.98856,0.98900,0.98944,0.98993,0.99037,0.99087,0.99133,0.99181,0.99224,0.99269,0.99313,0.99355,0.99398,0.99443
+0.99484,0.99526,0.99574,0.99615,0.99659,0.99698,0.99734,0.99775,0.99808,0.99842,0.99868,0.99899,0.99931,0.99955,0.99979,1.00000
+pwc2x1fract=0.00074,0.00155,0.00242,0.00339,0.00462,0.00595,0.00766,0.00958,0.01186,0.01459,0.01768,0.02142,0.02552,0.03023,0.03528,0.04093,0.04736,0.05395,0.06093
+0.06857,0.07642,0.08427,0.09244,0.10116,0.10993,0.11886,0.12785,0.13705,0.14623,0.15568,0.16498,0.17421,0.18374,0.19311,0.20263,0.21234,0.22167,0.23125,0.24075
+0.25039,0.26001,0.26983,0.27935,0.28894,0.29856,0.30791,0.31781,0.32746,0.33726,0.34720,0.35709,0.36692,0.37697,0.38685,0.39662,0.40675,0.41684,0.42681,0.43658
+0.44650,0.45637,0.46616,0.47599,0.48593,0.49569,0.50563,0.51536,0.52492,0.53461,0.54421,0.55385,0.56353,0.57315,0.58272,0.59235,0.60189,0.61141,0.62089,0.63050
+0.63965,0.64862,0.65783,0.66699,0.67609,0.68496,0.69376,0.70258,0.71137,0.72013,0.72889,0.73729,0.74588,0.75415,0.76237,0.77060,0.77876,0.78669,0.79464,0.80222
+0.80939,0.81635,0.82309,0.82955,0.83578,0.84188,0.84743,0.85290,0.85795,0.86274,0.86729,0.87158,0.87572,0.87926,0.88277,0.88603,0.88920,0.89206,0.89480,0.89731
+0.89971,0.90204,0.90418,0.90628,0.90831,0.91015,0.91194,0.91374,0.91548,0.91711,0.91862,0.92015,0.92156,0.92299,0.92437,0.92578,0.92711,0.92841,0.92958,0.93081
+0.93194,0.93298,0.93406,0.93506,0.93606,0.93706,0.93800,0.93899,0.93985,0.94076,0.94165,0.94250,0.94330,0.94412,0.94488,0.94563,0.94637,0.94712,0.94786,0.94846
+0.94913,0.94982,0.95036,0.95096,0.95149,0.95210,0.95267,0.95321,0.95374,0.95427,0.95479,0.95531,0.95580,0.95632,0.95675,0.95727,0.95772,0.95820,0.95870,0.95913
+0.95958,0.96002,0.96049,0.96093,0.96135,0.96177,0.96222,0.96265,0.96308,0.96348,0.96390,0.96435,0.96480,0.96520,0.96567,0.96604,0.96645,0.96686,0.96727,0.96765
+0.96812,0.96857,0.96897,0.96944,0.96985,0.97029,0.97070,0.97114,0.97158,0.97204,0.97248,0.97294,0.97343,0.97385,0.97429,0.97470,0.97514,0.97558,0.97599,0.97642
+0.97688,0.97735,0.97779,0.97825,0.97868,0.97914,0.97959,0.98000,0.98045,0.98085,0.98131,0.98179,0.98224,0.98276,0.98320,0.98365,0.98410,0.98456,0.98499,0.98551
+0.98597,0.98638,0.98680,0.98727,0.98772,0.98818,0.98865,0.98906,0.98950,0.99002,0.99047,0.99090,0.99130,0.99174,0.99218,0.99264,0.99303,0.99345,0.99386,0.99427
+0.99471,0.99510,0.99557,0.99602,0.99639,0.99682,0.99720,0.99762,0.99793,0.99827,0.99860,0.99894,0.99925,0.99953,0.99977,1.00000
+pwc2u2fract=0.00069,0.00142,0.00227,0.00326,0.00444,0.00574,0.00729,0.00908,0.01116,0.01370,0.01655,0.01977,0.02351,0.02752,0.03191,0.03683,0.04207,0.04761,0.05385
+0.06031,0.06701,0.07415,0.08168,0.08950,0.09756,0.10588,0.11432,0.12316,0.13196,0.14084,0.15005,0.15932,0.16863,0.17800,0.18735,0.19670,0.20611,0.21573,0.22524
+0.23508,0.24472,0.25462,0.26447,0.27433,0.28444,0.29420,0.30416,0.31385,0.32380,0.33367,0.34366,0.35373,0.36372,0.37381,0.38371,0.39396,0.40382,0.41385,0.42408
+0.43444,0.44421,0.45401,0.46413,0.47409,0.48400,0.49411,0.50394,0.51377,0.52351,0.53337,0.54306,0.55296,0.56287,0.57241,0.58206,0.59199,0.60184,0.61146,0.62112
+0.63062,0.64027,0.64956,0.65894,0.66823,0.67745,0.68671,0.69576,0.70456,0.71345,0.72215,0.73087,0.73951,0.74806,0.75652,0.76430,0.77228,0.78022,0.78801,0.79552
+0.80266,0.80984,0.81698,0.82391,0.83063,0.83680,0.84268,0.84840,0.85391,0.85899,0.86375,0.86829,0.87266,0.87675,0.88048,0.88403,0.88759,0.89091,0.89385,0.89681
+0.89949,0.90196,0.90435,0.90662,0.90866,0.91060,0.91258,0.91444,0.91622,0.91792,0.91954,0.92110,0.92257,0.92397,0.92529,0.92662,0.92786,0.92916,0.93036,0.93153
+0.93271,0.93382,0.93483,0.93594,0.93692,0.93788,0.93885,0.93974,0.94055,0.94142,0.94225,0.94303,0.94382,0.94452,0.94529,0.94602,0.94678,0.94744,0.94816,0.94877
+0.94937,0.94999,0.95060,0.95119,0.95174,0.95227,0.95285,0.95341,0.95398,0.95447,0.95491,0.95542,0.95593,0.95640,0.95686,0.95734,0.95779,0.95822,0.95865,0.95908
+0.95955,0.95997,0.96042,0.96084,0.96123,0.96168,0.96209,0.96250,0.96285,0.96330,0.96372,0.96413,0.96456,0.96493,0.96535,0.96577,0.96618,0.96658,0.96697,0.96738
+0.96780,0.96822,0.96866,0.96903,0.96944,0.96988,0.97027,0.97072,0.97113,0.97153,0.97196,0.97242,0.97285,0.97328,0.97372,0.97417,0.97457,0.97502,0.97549,0.97595
+0.97638,0.97680,0.97727,0.97770,0.97817,0.97855,0.97901,0.97942,0.97986,0.98028,0.98070,0.98116,0.98163,0.98203,0.98249,0.98296,0.98340,0.98389,0.98434,0.98481
+0.98527,0.98579,0.98634,0.98678,0.98728,0.98776,0.98820,0.98863,0.98907,0.98954,0.99000,0.99041,0.99081,0.99122,0.99166,0.99215,0.99259,0.99304,0.99342,0.99387
+0.99430,0.99474,0.99513,0.99555,0.99602,0.99640,0.99682,0.99721,0.99759,0.99801,0.99839,0.99876,0.99912,0.99944,0.99974,1.00000
+pwc2u1fract=0.00069,0.00147,0.00228,0.00327,0.00453,0.00595,0.00764,0.00945,0.01156,0.01394,0.01682,0.02007,0.02366,0.02774,0.03226,0.03730,0.04278,0.04848,0.05466
+0.06122,0.06802,0.07542,0.08298,0.09101,0.09924,0.10757,0.11591,0.12483,0.13364,0.14303,0.15199,0.16127,0.17064,0.18011,0.18973,0.19947,0.20909,0.21867,0.22853
+0.23822,0.24783,0.25751,0.26736,0.27721,0.28702,0.29669,0.30653,0.31620,0.32618,0.33612,0.34626,0.35623,0.36629,0.37626,0.38621,0.39617,0.40640,0.41666,0.42672
+0.43716,0.44697,0.45706,0.46738,0.47749,0.48752,0.49765,0.50743,0.51715,0.52708,0.53702,0.54705,0.55693,0.56675,0.57648,0.58618,0.59589,0.60534,0.61518,0.62475
+0.63412,0.64353,0.65303,0.66222,0.67130,0.68039,0.68920,0.69821,0.70732,0.71605,0.72472,0.73338,0.74194,0.75052,0.75870,0.76683,0.77475,0.78272,0.79066,0.79822
+0.80570,0.81295,0.81989,0.82648,0.83283,0.83917,0.84498,0.85044,0.85572,0.86068,0.86556,0.87004,0.87425,0.87818,0.88195,0.88557,0.88895,0.89221,0.89520,0.89795
+0.90055,0.90296,0.90521,0.90737,0.90938,0.91143,0.91342,0.91520,0.91687,0.91856,0.92024,0.92170,0.92312,0.92454,0.92587,0.92718,0.92847,0.92978,0.93094,0.93208
+0.93308,0.93414,0.93517,0.93613,0.93706,0.93800,0.93892,0.93979,0.94065,0.94155,0.94237,0.94317,0.94401,0.94475,0.94547,0.94622,0.94690,0.94760,0.94823,0.94886
+0.94951,0.95015,0.95076,0.95139,0.95198,0.95252,0.95304,0.95357,0.95409,0.95457,0.95512,0.95561,0.95612,0.95660,0.95708,0.95750,0.95793,0.95835,0.95877,0.95921
+0.95970,0.96017,0.96063,0.96102,0.96143,0.96184,0.96223,0.96268,0.96310,0.96355,0.96405,0.96450,0.96493,0.96534,0.96576,0.96618,0.96661,0.96701,0.96745,0.96784
+0.96828,0.96868,0.96906,0.96947,0.96987,0.97031,0.97075,0.97120,0.97163,0.97208,0.97255,0.97303,0.97349,0.97393,0.97434,0.97476,0.97520,0.97560,0.97604,0.97644
+0.97690,0.97733,0.97784,0.97830,0.97878,0.97922,0.97966,0.98008,0.98053,0.98099,0.98144,0.98192,0.98233,0.98279,0.98326,0.98370,0.98414,0.98455,0.98502,0.98546
+0.98595,0.98638,0.98680,0.98732,0.98776,0.98817,0.98859,0.98907,0.98947,0.98990,0.99036,0.99081,0.99129,0.99167,0.99209,0.99256,0.99298,0.99343,0.99387,0.99430
+0.99473,0.99509,0.99553,0.99603,0.99646,0.99689,0.99732,0.99771,0.99804,0.99846,0.99877,0.99908,0.99936,0.99962,0.99982,1.00000
diff --git a/PARAM/SHMS/DC/CUTS/pdc_cuts.param b/PARAM/SHMS/DC/pdc_cuts.param
similarity index 100%
rename from PARAM/SHMS/DC/CUTS/pdc_cuts.param
rename to PARAM/SHMS/DC/pdc_cuts.param
diff --git a/PARAM/SHMS/DC/GEOM/pdc_geom.param b/PARAM/SHMS/DC/pdc_geom.param
similarity index 100%
rename from PARAM/SHMS/DC/GEOM/pdc_geom.param
rename to PARAM/SHMS/DC/pdc_geom.param
diff --git a/PARAM/SHMS/DC/pdc_tzero_per_wire.param b/PARAM/SHMS/DC/pdc_tzero_per_wire.param
new file mode 100644
index 00000000..9cfaa2f9
--- /dev/null
+++ b/PARAM/SHMS/DC/pdc_tzero_per_wire.param
@@ -0,0 +1,88 @@
+ptzero1u1=
+0,0.000000,0.000000,0.000000,0.000000,0.000000,-118.000000,0.000000,0.000000,-46.593838,-108.744017,-92.911647, -46.818605, -25.442644, -54.266269, -18.667863
+-14.671439, -27.990589, -15.734603, -18.336704, -14.406497, -12.482605, -16.465824, -18.507768, -16.107332, -21.078412, -17.855027, -14.344346, -18.572854, -14.043629, -15.166505, -12.659861
+-15.029306, -11.406170, -15.486468, -15.336286, -14.717276, -15.232215, -16.126570, -15.640130, -15.162033, -15.885782, -15.615151, -16.022035, -15.571448, -15.354263, -19.784326, -16.253775
+-20.325653, -15.907230, -20.077029, -16.341873, -16.152670, -20.136907, -15.716527, -15.960186, -16.449383, -16.621038, -20.253219, -15.705525, -15.481208, -16.248817, -15.947153, -15.170799
+-15.946224, -14.695098, -15.432663, -15.742479, -14.946678, -14.220903, -15.935558, -15.365795, -14.163540, -15.154400, -17.934718, -14.813075, -11.234167, -11.472885, -11.827882, -15.853795
+-14.037599, -14.055187, -14.586083, -13.201322, -13.966699, -11.754267, -13.043267, -11.219814, -14.184280, -18.690147, -16.594225, -24.083803, -9.682649, -81.368464, -14.764280, -4.363486
+-2.433277, -107.517857, -168.896552, -69.597701, -89.144414, -20.471245, 0.000000, -52.642857, 0.000000, 0.000000, 0.000000
+ptzero1u2=
+0.000000,0.000000,0.000000,0.000000,-60.075000,0.000000,-41.500000,-21.127243,-183.424242,0.000000,-64.240114,-78.546468, -76.015785, -25.369522, -17.129011, -9.658927
+-17.017722, -39.446385, -15.501773, -13.660313, -19.097214, -11.394009, -10.352452, -10.577673, -16.118628, -16.967594, -16.744267, -12.934676, -15.438180, -12.816288, -11.483131, -10.893740
+-15.308119, -12.330195, -15.963750, -15.542340, -16.804954, -14.388553, -15.857031, -15.416873, -15.261313, -15.918998, -15.995171, -18.853450, -14.856327, -15.905602, -15.992211, -15.445725
+-15.613712, -15.498334, -15.676623, -15.822178, -15.558882, -16.005326, -15.455549, -16.002384, -15.645636, -15.664551, -15.090649, -15.505618, -15.549754, -15.033029, -14.530727, -11.612221
+-11.029034, -14.948437, -12.528483, -14.924248, -11.748899, -15.725251, -15.833634, -15.167942, -15.235324, -15.221023, -19.528904, -15.173925, -16.762679, -15.950937, -13.510960, -14.708145
+-11.283765, -11.873998, -11.961262, -16.059844, -10.451870, -17.561075, -11.751799, -15.633115, -17.752254, -10.210443, -13.705992, -14.014021, -11.143191, -49.100822, -16.586658, -17.424011
+-6.609701, 0.000000, -120.571429, -17.356751, -29.666667, -45.820359, -88.826087, 0.000000, 0.000000, 0.000000, 0.000000
+ptzero1x1=
+-17.396932,-16.616998,-14.427758,-15.662944,-18.896822,-20.649833,-20.845532,-20.239644,-20.453763,-20.645283,-19.722749,-21.292879, -19.996908, -15.819017, -16.493059, -14.454149
+-15.215168, -19.324712, -18.303979, -19.976700, -20.571344, -19.634532, -19.917606, -20.499082, -20.533329, -24.768141, -24.362623, -25.156345, -25.065073, -25.372889, -21.662359, -12.914780
+-11.979728, -14.143579, -10.727828, -15.018376, -15.019531, -18.980395, -19.813382, -19.720446, -19.491330, -20.653362, -20.109688, -19.013498, -21.311321, -20.617609, -19.767790, -20.613452
+-16.265665, -14.921409, -15.002730, -15.108378, -16.177587, -14.548971, -14.699022, -14.676888, -15.566706, -15.707402, -15.603769, -15.049021, -15.603108, -15.656655, -14.545699, -9.965188
+-9.606012, -5.641924, -6.024662, -6.110988, -5.205215, -1.377927, -3.492905, -1.409438, -2.679342, -4.802348, -6.431753, -7.643096, -10.768468, -11.778911, -10.021300
+ptzero1x2=
+-11.133180,-11.361459,-12.875119,-10.877885,-10.741685,-10.059827,-12.098575,-14.928539,-13.786081,-11.585823,-14.638816,-10.875605, -11.357555, -10.965752, -10.431705, -9.504409
+-10.080042, -11.515404, -14.410463, -14.932231, -10.506702, -14.801313, -15.236224, -15.745603, -15.722284, -19.867270, -19.312415, -19.985808, -19.250538, -16.597176, -16.221166, -21.854182
+-21.338707, -16.075970, -16.117753, -20.290539, -20.544463, -20.648819, -21.107558, -25.376218, -24.549305, -24.388895, -24.220944, -24.738755, -24.779925, -24.348677, -24.818543, -20.466195
+-19.555968, -20.376722, -15.529756, -16.119090, -15.922422, -15.405282, -20.071403, -20.826519, -20.471467, -20.384167, -24.176243, -20.680740, -20.721488, -20.056871, -19.402109, -14.466193
+-14.983991, -15.516466, -15.082542, -11.200562, -10.486867, -9.673503, -9.387304, -10.340439, -10.437801, -15.223371, -17.929544, -16.317810, -15.321074, -17.835667, -16.996288
+ptzero1v1=
+0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-32.537646,-19.941345,-8.940205,-75.707641,-0.484213,-9.878219, -12.268139, -17.963859, -11.997989, -11.008233
+-12.897647, -11.178966, -11.045250, -11.864324, -13.760939, -14.639564, -14.849764, -13.292060, -11.036047, -12.647821, -11.482854, -15.363619, -11.987098, -11.358359, -11.924903, -10.499675
+-10.449299, -9.351114, -11.606230, -10.666652, -10.348103, -14.962950, -14.863966, -15.623615, -15.350615, -14.894038, -11.912008, -15.368759, -15.846638, -15.050496, -15.628292, -10.882714
+-10.482863, -10.459307, -10.438829, -7.475979, -10.954342, -10.528502, -10.387189, -10.560831, -10.923715, -10.570017, -10.587721, -9.992604, -10.082866, -8.575026, -10.928703, -20.644517
+-20.473433, -20.081514, -20.605385, -24.943194, -20.957983, -20.576437, -20.318345, -21.031120, -20.270932, -20.644540, -16.776295, -20.065253, -17.648152, -20.214340, -18.490226, -15.499880
+-16.108298, -16.590104, -16.772870, -17.157326, -15.905081, -17.390738, -18.468479, -11.089967, -16.421729, -16.539538, -12.016415, -21.233799, -11.459183, -10.449851, -13.962564, -13.594324
+-29.829412, -13.780784, 0.000000, -46.268041, -128.479070, -37.310475, 0.000000, -76.000000, 0.000000, 0.000000, 0.000000
+ptzero1v2=
+0.000000,0.000000,0.000000,0.000000,-58.952941,-187.375000,-133.653465,-29.525117,-15.290135,-18.988299,-25.418886,-19.888287, -13.712722, -8.740491, -12.955695, -13.831583
+-6.037878, -11.185355, -10.363306, -10.948649, -16.026710, -11.133190, -9.875440, -10.870794, -13.987848, -10.877031, -10.076667, -9.959178, -10.417289, -10.996529, -9.889054, -7.232447
+-9.276888, -8.846380, -9.967967, -10.595421, -10.762538, -10.033082, -10.768854, -10.882021, -11.675858, -11.277250, -10.990188, -14.666458, -21.226448, -20.736860, -20.770242, -20.794779
+-20.634213, -20.320671, -20.326061, -20.168501, -20.668278, -20.096294, -20.639110, -19.884850, -20.071035, -19.803413, -20.009547, -20.945465, -20.013387, -20.132927, -20.926571, -18.935504
+-20.412900, -20.255256, -18.945872, -21.021155, -19.562812, -20.078687, -20.667660, -20.376120, -20.224003, -17.145285, -20.323343, -19.836211, -15.323977, -14.681761, -12.319151, -15.563993
+-12.582871, -15.876335, -15.744928, -12.450355, -12.210627, -15.676232, -14.279192, -14.780212, -15.080506, -16.200374, -14.622877, -14.168716, -8.104971, -11.483489, -14.338827, -12.627440
+-17.195017, -5.772275, -28.393939, -7.021302, -52.169492, -66.538622, 0.000000, -31.246575, 0.000000, 0.000000, 0.000000
+ptzero2v2=
+0.000000,0.000000,0.000000,0.000000,0.000000,-55.252252,0.000000,-38.473061,-80.944444,0.000000,-46.521739,-57.526453, -178.688623, -49.077756, -15.696438, -13.407307
+-21.482927, -5.732976, -9.119123, -13.097769, -16.341173, -18.173914, -11.613714, -11.181581, -13.380408, -18.292182, -16.436830, -14.752914, -7.371661, -6.599430, -5.636919, -9.868981
+-5.406981, -8.316591, -9.182955, -9.624926, -6.949120, -9.963222, -10.609307, -10.274327, -10.781501, -10.252669, -10.214538, -9.979853, -10.545668, -10.866172, -10.525814, -10.444994
+-10.768877, -10.278397, -10.793542, -10.217413, -10.653313, -10.604944, -10.854485, -10.680637, -10.622702, -10.247855, -10.774596, -10.598965, -16.002103, -15.064736, -15.237305, -16.504244
+-11.962918, -15.550282, -15.104109, -16.308689, -16.973681, -15.500141, -15.667868, -15.170512, -15.781069, -16.404178, -16.000513, -17.364965, -11.722702, -10.430437, -10.402505, -10.243155
+-11.669607, -12.548985, -15.359886, -10.782238, -11.692608, -12.631165, -10.642360, -10.879855, -6.078466, -13.678743, -10.787420, -15.633249, -12.995810, -6.111241, -16.467060, -7.370892
+-54.571084, -31.192484, -1.627830, -18.932102, -83.915948, 0.000000, 0.000000, -12.061224, 0.000000, 0.000000, 0.000000
+ptzero2v1=
+0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-58.786260,-145.708995,-161.814815,-48.719547,0.596538, -9.177237, -10.528571, -11.525210, -18.337334
+-14.632709, -9.993479, -18.201232, -22.783998, -19.961454, -18.759603, -21.902205, -20.937604, -15.975963, -15.873074, -14.182091, -14.573045, -15.927339, -15.930305, -16.282483, -8.518143
+-10.931875, -6.035319, -5.030974, -9.251932, -9.855573, -6.507426, -9.326183, -10.444483, -9.704609, -10.085460, -10.184591, -10.747589, -10.000750, -10.355946, -10.629790, -10.506950
+-3.979462, -10.717406, -10.071812, -10.464347, -10.212814, -10.285161, -10.818309, -10.545654, -10.694494, -10.184154, -9.987554, -10.584011, -10.210232, -10.378708, -10.927595, -15.325550
+-15.206402, -15.129851, -15.944419, -12.785191, -16.137138, -16.040954, -15.383542, -15.696553, -15.297918, 0.000000, -17.092031, -11.760381, -14.590713, -11.262993, -11.310878, -18.096727
+-17.350433, -15.704236, -13.653274, -14.501943, -16.300056, -15.623983, -14.957049, -12.224362, -16.511533, -15.946371, -15.233101, -16.263684, -9.452166, -11.249890, -11.774317, -9.096770
+-5.707852, -5.898084, -9.242129, -9.806908, -25.822098, -36.541667, -36.814910, -118.372093, -91.216102, 0.000000, 0.000000
+ptzero2x2=
+-16.748918,-15.124591,-15.655779,-15.779632,-15.159158,-15.662137,-10.970570,-10.677299,-14.849906,-11.166574,-10.825909,-10.020822, -11.081274, -9.880341, -15.300455, -19.756884
+-15.882175, -19.821219, -19.386450, -19.567998, -16.243312, -24.897918, -25.052492, -23.942925, -24.395798, -24.519525, -21.682892, -20.599320, -15.391712, -10.942988, -11.218927, -10.871735
+-8.927689, -10.376481, -6.334997, -9.681232, -20.037887, -15.371325, -19.329290, -19.544273, -18.976944, -20.099035, -15.112022, -20.330319, -19.406988, -16.158948, -20.116641, -14.635121
+-15.287936, -14.534332, -10.227569, -10.063398, -9.596777, -10.505361, -10.867546, -10.933751, -14.863504, -10.373620, -14.417935, -14.610400, -14.980922, -15.327701, -15.334145, -10.620707
+-11.122348, -6.245197, -6.161308, -10.217335, -5.996817, -10.117649, -6.694481, -10.186875, -5.354901, -5.959353, -1.265031, -1.812126, -4.467019, -5.350857, -0.888789
+ptzero2x1=
+-15.481712,-14.510150,-14.042665,-11.926054,-14.164669,-15.528073,-11.981964,-10.303024,-10.130683,-7.158399,-10.270153,-6.882999, -9.966882, -6.606376, -11.344757, -11.273035
+-14.112000, -13.774678, -14.450479, -14.571872, -14.132390, -14.283253, -20.073322, -20.248466, -20.144667, -19.405076, -19.748088, -19.805213, -18.812718, -9.582158, -9.492764, -9.549193
+-10.402621, -14.224441, -11.226767, -11.254525, -15.922456, -20.135171, -20.103250, -19.692955, -20.231764, -20.017073, -19.873282, -19.825937, -19.998373, -20.486216, -20.675932, -24.265387
+-23.357251, -20.122414, -19.907621, -15.583528, -15.234693, -15.710229, -15.435289, -16.004137, -20.004028, -15.012810, -19.964448, -20.085872, -20.536123, -20.202822, -21.020401, -19.648303
+-15.211763, -9.362521, -5.467186, -5.752424, -6.005642, -9.714907, -6.025916, -6.335073, -5.545451, -1.592966, -1.774572, -5.313499, -4.849429, -5.379324, -6.127945
+ptzero2u2=
+0.000000,0.000000,0.000000,0.000000,-29.526316,0.000000,-41.589726,-12.778425,-9.026926,-7.604250,0.581862,-49.143862, -8.263138, -8.776657, -10.581889, -6.065629
+-20.439806, -6.320866, -10.806088, -5.943127, -11.409622, -10.568985, -11.470070, -9.099517, -10.506290, -9.633354, -10.025937, -10.913434, -10.472651, -10.139288, -6.233226, -5.944664
+-8.932264, -9.775214, -9.973038, -9.854598, -11.627100, -11.577306, -10.635871, -10.885483, -14.249194, -15.309788, -11.316589, -15.108956, -20.945624, -16.463572, -16.578092, -16.227273
+-20.622497, -20.528360, -20.333528, -20.128194, -20.465849, -20.332341, -20.063979, -20.573859, -20.161104, -19.834772, -19.797894, -20.715759, -20.300297, -15.882421, -16.370229, -16.156762
+-16.032809, -16.006485, -15.878151, -20.853673, -15.713400, -19.772589, -14.443723, -14.780473, -16.487568, -14.717833, -15.530203, -15.350679, -14.878254, -15.051120, -15.953340, -14.575417
+-14.467203, -15.150858, -14.681377, -15.960946, -12.810314, -10.359781, -14.312577, -10.990081, -12.386042, -12.574944, -13.233289, -15.103140, -7.892723, -0.419968, -4.573796, -5.160847
+-13.683958, -1.533336, -0.251129, -2.387802, -22.440361, -9.695457, -26.111111, 0.000000, 24.384615, 0.000000, 0.000000
+ptzero2u1=
+0.000000,0.000000,0.000000,0.000000,-23.000000,-75.704918,-32.086527,-41.627570,-11.400491,-3.219785,-8.778620,-9.242030, -11.313200, -8.945939, -12.200784, -17.389359
+-30.172852, -10.794550, -15.663870, -14.232468, -15.354955, -11.321932, -16.847831, -12.585629, -12.802457, -16.265244, -16.722856, -11.989827, -15.581233, -10.914094, -10.291462, -10.276079
+-9.402437, -7.602824, -10.306291, -11.331946, -15.991489, -14.688767, -11.397707, -10.587368, -11.127467, -14.708122, -11.236662, -10.962611, -10.494829, -11.097273, -10.814629, -11.044580
+-10.991213, -10.540889, -10.107781, -10.157308, -9.864607, -10.487771, -10.612283, -10.661735, -10.521863, -10.383559, -10.501237, -10.505003, -10.331916, -9.893952, -10.475500, -20.033732
+-15.858321, -19.752716, -16.531776, -15.778780, -20.211390, -15.444742, -16.127475, -16.091552, -17.050459, -15.080525, -14.327763, -15.434578, -16.794215, -11.037562, -12.174039, -15.414071
+-14.497208, -15.608434, -15.051963, -15.375792, 0.000000, -14.278285, -14.553032, -12.272532, -13.124947, -14.641158, -11.936087, -10.251066, -10.894922, -12.114657, -17.011236, -7.398925
+1.803852, -1.136187, 6.953196, -3.846336, -4.488951, -12.752737, 0.625426, 0.000000, -14.000000, 0.000000, 0.000000
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param
deleted file mode 100644
index 848a1c9d..00000000
--- a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_483.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Garth H. gain calibration for run 483, June 20 2017
-phgcer_adc_to_npe = 1./273./0.0195, 1./460./0.0195, 1./582./0.0195, 1./378./0.0195
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param
deleted file mode 100644
index e32be4dc..00000000
--- a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_484.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Garth H. gain calibration for run 484, June 20 2017
-phgcer_adc_to_npe = 1./454./0.0195, 1./447./0.0195, 1./409./0.0195, 1./547./0.0195
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param
deleted file mode 100644
index 31e7dd26..00000000
--- a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_486.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Garth H. gain calibration for run 486, June 20 2017
-phgcer_adc_to_npe = 1./551./0.0195, 1./426./0.0195, 1./376./0.0195, 1./488./0.0195
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param
deleted file mode 100644
index 28af6b6f..00000000
--- a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_487.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Garth H. gain calibration from run 487, June 20 2017
-phgcer_adc_to_npe = 1/551./0.0195, 1/426./0.0195, 1/376./0.0195, 1/488./0.0195
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param b/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param
deleted file mode 100644
index 0d9f2296..00000000
--- a/PARAM/SHMS/HGCER/CALIB/KPP_Spring_2017/phgcer_calib_488.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Garth H. gain calibration from run 488, June 20 2017
-phgcer_adc_to_npe = 1/546./0.0195, 1/430./0.0195, 1/376./0.0195, 1/477./0.0195
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/phgcer_calib.param b/PARAM/SHMS/HGCER/CALIB/phgcer_calib.param
deleted file mode 120000
index 32ba2c44..00000000
--- a/PARAM/SHMS/HGCER/CALIB/phgcer_calib.param
+++ /dev/null
@@ -1 +0,0 @@
-Fall_Comm_2017/phgcer_calib_1583.param
\ No newline at end of file
diff --git a/PARAM/SHMS/HGCER/CALIB/Fall_Comm_2017/phgcer_calib_1583.param b/PARAM/SHMS/HGCER/phgcer_calib.param
similarity index 100%
rename from PARAM/SHMS/HGCER/CALIB/Fall_Comm_2017/phgcer_calib_1583.param
rename to PARAM/SHMS/HGCER/phgcer_calib.param
diff --git a/PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param b/PARAM/SHMS/HGCER/phgcer_cuts.param
similarity index 100%
rename from PARAM/SHMS/HGCER/CUTS/phgcer_cuts.param
rename to PARAM/SHMS/HGCER/phgcer_cuts.param
diff --git a/PARAM/SHMS/HGCER/GEOM/phgcer_geom.param b/PARAM/SHMS/HGCER/phgcer_geom.param
similarity index 100%
rename from PARAM/SHMS/HGCER/GEOM/phgcer_geom.param
rename to PARAM/SHMS/HGCER/phgcer_geom.param
diff --git a/PARAM/SHMS/HODO/CUTS/KPP_Spring_2017/phodo_cuts.param b/PARAM/SHMS/HODO/CUTS/KPP_Spring_2017/phodo_cuts.param
deleted file mode 100644
index e1ffeb79..00000000
--- a/PARAM/SHMS/HODO/CUTS/KPP_Spring_2017/phodo_cuts.param
+++ /dev/null
@@ -1,46 +0,0 @@
-; Cosmic flag for beta calculation
-
-pcosmicflag=0
-
-; for now manually set hte FADC mode
-; 1 == Use the pulse int - pulse ped
-; 2 == Use the sample integral - known ped
-; 3 == Use the sample integral - sample ped
-; if not set then defaults to use the raw pulse integral
-phodo_adc_mode=1
-
-phodo_adc_tdc_offset = 200., 200., 200., 200.
-; phodo_tdc_offset is array of time offsets for all paddles in a plane
-; to move the tdc to between 0 and 4000 channels.
-phodo_tdc_offset = 1860, 2000, 2060, 2000
-
-; phodo set min and max fADC time window for all paddles in a plane in 'Channel' units
-; the conversion is 0.0625 ns / channel for flash ADC 250
-phodo_AdcTimeWindowMin = -10000.,-10000., -10000., -10000.
-phodo_AdcTimeWindowMax = 10000., 10000., 10000., 10000.
-
-; pstart_time_center center of allowed time window
-pstart_time_center = 32.
-
-; hstart_time_slop 1/2 width of time window
-pstart_time_slop = 100.
-
-; pscin_tdc_min minimum tdc value in hms scin
-pscin_tdc_min = -500
-
-; pscin_tdc_max maximum allowed tdc value
-pscin_tdc_max = 1000
-
-; pscin_tdc_to_time scin tdc time per channel
-pscin_tdc_to_time = 0.1
-
-; tof and you figured out good values
-ptof_tolerance = 100.0
-
-; shms_tof_params
-; pnum_scin_counters, phodo_zpos, phodo_center_coord, phodo_width
-; are all calculated within p_init_scin
-; phodo_pos_coord and phodo_neg_coord are not yet used
-phodo_slop = 2., 2., 4., 4.
-
-ptofusinginvadc=1
diff --git a/PARAM/SHMS/HODO/CALIB/phodo_calib.param b/PARAM/SHMS/HODO/phodo_calib.param
similarity index 100%
rename from PARAM/SHMS/HODO/CALIB/phodo_calib.param
rename to PARAM/SHMS/HODO/phodo_calib.param
diff --git a/PARAM/SHMS/HODO/CUTS/phodo_cuts.param b/PARAM/SHMS/HODO/phodo_cuts.param
similarity index 100%
rename from PARAM/SHMS/HODO/CUTS/phodo_cuts.param
rename to PARAM/SHMS/HODO/phodo_cuts.param
diff --git a/PARAM/SHMS/HODO/GEOM/phodo_geom.param b/PARAM/SHMS/HODO/phodo_geom.param
similarity index 100%
rename from PARAM/SHMS/HODO/GEOM/phodo_geom.param
rename to PARAM/SHMS/HODO/phodo_geom.param
diff --git a/PARAM/SHMS/HODO/CALIB/ptofcalib.param b/PARAM/SHMS/HODO/ptofcalib.param
similarity index 100%
rename from PARAM/SHMS/HODO/CALIB/ptofcalib.param
rename to PARAM/SHMS/HODO/ptofcalib.param
diff --git a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param
deleted file mode 100644
index 58c0c512..00000000
--- a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_483.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Noble gas cherenkov gain factors run 483, July 11 2017
-pngcer_adc_to_npe = 1.0/462.791/0.0195, 1.0/475.186/0.0195, 1.0/524.213/0.0195, 1.0/520.873/0.0195
\ No newline at end of file
diff --git a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param
deleted file mode 100644
index fc0a7a51..00000000
--- a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_487.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Noble gas cherenkov gain factors run 487, July 11 2017
-pngcer_adc_to_npe = 1.0/464.187/0.0195, 1.0/484.511/0.0195, 1.0/499.748/0.0195, 1.0/462.744/0.0195
\ No newline at end of file
diff --git a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param b/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param
deleted file mode 100644
index 9f346f07..00000000
--- a/PARAM/SHMS/NGCER/CALIB/KPP_Spring_2017/pngcer_calib_488.param
+++ /dev/null
@@ -1,2 +0,0 @@
-; Noble gas cherenkov gain factors run 488, July 11 2017
-pngcer_adc_to_npe = 1.0/438.119/0.0195, 1.0/477.902/0.0195, 1.0/475.153/0.0195, 1.0/488.668/0.0195
diff --git a/PARAM/SHMS/NGCER/CALIB/pngcer_calib.param b/PARAM/SHMS/NGCER/pngcer_calib.param
similarity index 100%
rename from PARAM/SHMS/NGCER/CALIB/pngcer_calib.param
rename to PARAM/SHMS/NGCER/pngcer_calib.param
diff --git a/PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param b/PARAM/SHMS/NGCER/pngcer_cuts.param
similarity index 100%
rename from PARAM/SHMS/NGCER/CUTS/pngcer_cuts.param
rename to PARAM/SHMS/NGCER/pngcer_cuts.param
diff --git a/PARAM/SHMS/NGCER/GEOM/pngcer_geom.param b/PARAM/SHMS/NGCER/pngcer_geom.param
similarity index 100%
rename from PARAM/SHMS/NGCER/GEOM/pngcer_geom.param
rename to PARAM/SHMS/NGCER/pngcer_geom.param
diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
index b9df1f2a..6c6c840c 100644
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
+++ b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_hElec_pProt.C
@@ -18,31 +18,28 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Create file name patterns.
const char* RunFileNamePattern = "coin_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
//const char* RunFileNamePattern = "raw/coin_all_%05d.dat";
const char* ROOTFileNamePattern = "ROOTfiles/coin_replay_production_%d_%d.root";
// Load global parameters
- // Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ // Load params for COIN trigger configuration
gHcParms->Load("PARAM/TRIG/tcoin.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/COIN/DETEC/coin.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
//=:=:=:=
// SHMS
@@ -75,19 +72,22 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
THcShower* pcal = new THcShower("cal", "Calorimeter");
SHMS->AddDetector(pcal);
- // Add Rastered Beam Apparatus
- THaApparatus* pbeam = new THcRasteredBeam("P.rb", "SHMS Rastered Beamline");
+ // Add rastered beam apparatus
+ THaApparatus* pbeam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(pbeam);
- THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* prp = new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
gHaPhysics->Add(prp);
- THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
+ // Calculate extended target corrections
+ THcExtTarCor* pext = new THcExtTarCor("P.extcor", "HMS extended target corrections", "P", "P.react");
gHaPhysics->Add(pext);
- // Include golden track information
+ // Calculate golden track quantites
THaGoldenTrack* pgtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
gHaPhysics->Add(pgtr);
- // Add hodoscope efficiency
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
- gHaPhysics->Add(peff);
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* peff = new THcHodoEff("phodeff", "SHMS hodo efficiency", "P.hod");
+ gHaPhysics->Add(peff);
// Add event handler for scaler events
THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event type 1");
@@ -119,29 +119,33 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Add hodoscope to HMS apparatus
THcHodoscope* hhod = new THcHodoscope("hod", "Hodoscope");
HMS->AddDetector(hhod);
- // Add Cherenkov to HMS apparatus
+ // Add Cherenkov to HMS apparatus
THcCherenkov* hcer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
HMS->AddDetector(hcer);
// Add Aerogel Cherenkov to HMS apparatus
- //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- //HMS->AddDetector(aero);
+ // THcAerogel* haero = new THcAerogel("aero", "Aerogel");
+ // HMS->AddDetector(haero);
// Add calorimeter to HMS apparatus
THcShower* hcal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(hcal);
- // Add Rastered Beam Apparatus
- THaApparatus* hbeam = new THcRasteredBeam("H.rb", "HMS Rastered Beamline");
- gHaApps->Add(hbeam);
- THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
+ // Add rastered beam apparatus
+ THaApparatus* hbeam = new THcRasteredBeam("H.rb", "Rastered Beamline");
+ gHaApps->Add(hbeam);
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* hrp = new THaReactionPoint("H.react", "HMS reaction point", "H", "H.rb");
gHaPhysics->Add(hrp);
- THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
+ // Calculate extended target corrections
+ THcExtTarCor* hext = new THcExtTarCor("H.extcor", "HMS extended target corrections", "H", "H.react");
gHaPhysics->Add(hext);
- // Include golden track information
+ // Calculate golden track quantities
THaGoldenTrack* hgtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
gHaPhysics->Add(hgtr);
- // Add hodoscope efficiency
- THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* heff = new THcHodoEff("hhodeff", "HMS hodo efficiency", "H.hod");
gHaPhysics->Add(heff);
+
// Add event handler for scaler events
THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 4");
hscaler->AddEvtType(2);
@@ -158,23 +162,10 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Kinematics Modules
//=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
- // ---------------------------------
- // electrons in SHMS, protons in HMS
- // ---------------------------------
- // Add Physics Module to calculate primary (scattered) beam kinematics
- // THcPrimaryKine* pkin_primary = new THcPrimaryKine("P.kin.primary", "SHMS Single Arm Kinematics", "P", "P.rb");
- // gHaPhysics->Add(pkin_primary);
- // Add Physics Module to calculate secondary (scattered) beam kinematics
- // THcSecondaryKine* hkin_secondary = new THcSecondaryKine("H.kin.secondary", "HMS Single Arm Kinematics", "H", "P.kin.primary");
- // gHaPhysics->Add(hkin_secondary);
-
- // ---------------------------------
- // electrons in HMS, protons in SHMS
- // ---------------------------------
- // Add Physics Module to calculate primary (scattered) beam kinematics
+ // Add Physics Module to calculate primary (scattered electrons) beam kinematics
THcPrimaryKine* hkin_primary = new THcPrimaryKine("H.kin.primary", "HMS Single Arm Kinematics", "H", "H.rb");
gHaPhysics->Add(hkin_primary);
- // Add Physics Module to calculate secondary (scattered) beam kinematics
+ // Add Physics Module to calculate secondary (scattered hadrons) beam kinematics
THcSecondaryKine* pkin_secondary = new THcSecondaryKine("P.kin.secondary", "SHMS Single Arm Kinematics", "P", "H.kin.primary");
gHaPhysics->Add(pkin_secondary);
@@ -182,7 +173,7 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Global Objects & Event Handlers
//=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
- // Add trigger apparatus
+ // Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
// Add trigger detector to trigger apparatus
@@ -217,19 +208,18 @@ void replay_production_coin_hElec_pProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+
analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C
index df611549..ad1a7942 100644
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C
+++ b/SCRIPTS/COIN/PRODUCTION/replay_production_coin_pElec_hProt.C
@@ -18,31 +18,28 @@ void replay_production_coin_pElec_hProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Create file name patterns.
const char* RunFileNamePattern = "coin_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
//const char* RunFileNamePattern = "raw/coin_all_%05d.dat";
const char* ROOTFileNamePattern = "ROOTfiles/coin_replay_production_%d_%d.root";
// Load global parameters
- // Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ // Load params for COIN trigger configuration
gHcParms->Load("PARAM/TRIG/tcoin.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/COIN/DETEC/coin.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
//=:=:=:=
// SHMS
@@ -75,19 +72,22 @@ void replay_production_coin_pElec_hProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
THcShower* pcal = new THcShower("cal", "Calorimeter");
SHMS->AddDetector(pcal);
- // Add Rastered Beam Apparatus
- THaApparatus* pbeam = new THcRasteredBeam("P.rb", "SHMS Rastered Beamline");
+ // Add rastered beam apparatus
+ THaApparatus* pbeam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(pbeam);
- THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* prp = new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
gHaPhysics->Add(prp);
- THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
+ // Calculate extended target corrections
+ THcExtTarCor* pext = new THcExtTarCor("P.extcor", "HMS extended target corrections", "P", "P.react");
gHaPhysics->Add(pext);
- // Include golden track information
+ // Calculate golden track quantites
THaGoldenTrack* pgtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
gHaPhysics->Add(pgtr);
- // Add hodoscope efficiency
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
- gHaPhysics->Add(peff);
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* peff = new THcHodoEff("phodeff", "SHMS hodo efficiency", "P.hod");
+ gHaPhysics->Add(peff);
// Add event handler for scaler events
THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event type 1");
@@ -119,29 +119,33 @@ void replay_production_coin_pElec_hProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Add hodoscope to HMS apparatus
THcHodoscope* hhod = new THcHodoscope("hod", "Hodoscope");
HMS->AddDetector(hhod);
- // Add Cherenkov to HMS apparatus
+ // Add Cherenkov to HMS apparatus
THcCherenkov* hcer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
HMS->AddDetector(hcer);
// Add Aerogel Cherenkov to HMS apparatus
- //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- //HMS->AddDetector(aero);
+ // THcAerogel* haero = new THcAerogel("aero", "Aerogel");
+ // HMS->AddDetector(haero);
// Add calorimeter to HMS apparatus
THcShower* hcal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(hcal);
- // Add Rastered Beam Apparatus
- THaApparatus* hbeam = new THcRasteredBeam("H.rb", "HMS Rastered Beamline");
- gHaApps->Add(hbeam);
- THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
+ // Add rastered beam apparatus
+ THaApparatus* hbeam = new THcRasteredBeam("H.rb", "Rastered Beamline");
+ gHaApps->Add(hbeam);
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* hrp = new THaReactionPoint("H.react", "HMS reaction point", "H", "H.rb");
gHaPhysics->Add(hrp);
- THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
+ // Calculate extended target corrections
+ THcExtTarCor* hext = new THcExtTarCor("H.extcor", "HMS extended target corrections", "H", "H.react");
gHaPhysics->Add(hext);
- // Include golden track information
+ // Calculate golden track quantities
THaGoldenTrack* hgtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
gHaPhysics->Add(hgtr);
- // Add hodoscope efficiency
- THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* heff = new THcHodoEff("hhodeff", "HMS hodo efficiency", "H.hod");
gHaPhysics->Add(heff);
+
// Add event handler for scaler events
THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 4");
hscaler->AddEvtType(2);
@@ -161,28 +165,18 @@ void replay_production_coin_pElec_hProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// ---------------------------------
// electrons in SHMS, protons in HMS
// ---------------------------------
- // Add Physics Module to calculate primary (scattered) beam kinematics
+ // Add physics module to calculate primary (scattered electrons) beam kinematics
THcPrimaryKine* pkin_primary = new THcPrimaryKine("P.kin.primary", "SHMS Single Arm Kinematics", "P", "P.rb");
gHaPhysics->Add(pkin_primary);
- // Add Physics Module to calculate secondary (scattered) beam kinematics
+ // Add physics module to calculate secondary (scattered hadrons) beam kinematics
THcSecondaryKine* hkin_secondary = new THcSecondaryKine("H.kin.secondary", "HMS Single Arm Kinematics", "H", "P.kin.primary");
gHaPhysics->Add(hkin_secondary);
-
- // ---------------------------------
- // electrons in HMS, protons in SHMS
- // ---------------------------------
- // Add Physics Module to calculate primary (scattered) beam kinematics
- // THcPrimaryKine* hkin_primary = new THcPrimaryKine("H.kin.primary", "HMS Single Arm Kinematics", "H", "H.rb");
- // gHaPhysics->Add(hkin_primary);
- // Add Physics Module to calculate secondary (scattered) beam kinematics
- // THcSecondaryKine* pkin_secondary = new THcSecondaryKine("P.kin.secondary", "SHMS Single Arm Kinematics", "P", "H.kin.primary");
- // gHaPhysics->Add(pkin_secondary);
-
+
//=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
// Global Objects & Event Handlers
//=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
- // Add trigger apparatus
+ // Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
// Add trigger detector to trigger apparatus
@@ -217,19 +211,18 @@ void replay_production_coin_pElec_hProt (Int_t RunNumber = 0, Int_t MaxEvent = 0
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+
analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_ep.C b/SCRIPTS/COIN/PRODUCTION/replay_production_ep.C
deleted file mode 100644
index ffe0c4bd..00000000
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_ep.C
+++ /dev/null
@@ -1,253 +0,0 @@
-void replay_production_ep (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
-
- // Get RunNumber and MaxEvent if not provided.
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) return;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
-
- // Create file name patterns.
- const char* RunFileNamePattern = "coin_all_%05d.dat";
- vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
-
- //const char* RunFileNamePattern = "raw/coin_all_%05d.dat";
- const char* ROOTFileNamePattern = "ROOTfiles/ep_%d.root";
-
- // Load global parameters
- // Add variables to global list.
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/ep.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/tcoin.param");
- // Load the Hall C detector map
- gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/COIN/DETEC/coin.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
-
- //=:=:=:=
- // SHMS
- //=:=:=:=
-
- // Set up the equipment to be analyzed.
- THcHallCSpectrometer* SHMS = new THcHallCSpectrometer("P", "SHMS");
- SHMS->SetEvtType(1);
- SHMS->AddEvtType(4);
- SHMS->AddEvtType(5);
- SHMS->AddEvtType(6);
- SHMS->AddEvtType(7);
- gHaApps->Add(SHMS);
- // Add Noble Gas Cherenkov to SHMS apparatus
- THcCherenkov* pngcer = new THcCherenkov("ngcer", "Noble Gas Cherenkov");
- SHMS->AddDetector(pngcer);
- // Add drift chambers to SHMS apparatus
- THcDC* pdc = new THcDC("dc", "Drift Chambers");
- SHMS->AddDetector(pdc);
- // Add hodoscope to SHMS apparatus
- THcHodoscope* phod = new THcHodoscope("hod", "Hodoscope");
- SHMS->AddDetector(phod);
- // Add Heavy Gas Cherenkov to SHMS apparatus
- THcCherenkov* phgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
- SHMS->AddDetector(phgcer);
- // Add Aerogel Cherenkov to SHMS apparatus
- THcAerogel* paero = new THcAerogel("aero", "Aerogel");
- SHMS->AddDetector(paero);
- // Add calorimeter to SHMS apparatus
- THcShower* pcal = new THcShower("cal", "Calorimeter");
- SHMS->AddDetector(pcal);
-
- // Add Rastered Beam Apparatus
- THaApparatus* pbeam = new THcRasteredBeam("P.rb", "SHMS Rastered Beamline");
- gHaApps->Add(pbeam);
- THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
- gHaPhysics->Add(prp);
- THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
- gHaPhysics->Add(pext);
- // Include golden track information
- THaGoldenTrack* pgtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
- gHaPhysics->Add(pgtr);
-
-
- // Hodoscope efficiency
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
- gHaPhysics->Add(peff);
- // Add event handler for scaler events
- // THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event type 1");
- //pscaler->AddEvtType(1);
- //pscaler->AddEvtType(4);
- //pscaler->AddEvtType(5);
- //pscaler->AddEvtType(6);
- //pscaler->AddEvtType(7);
- //pscaler->AddEvtType(129);
- //pscaler->SetDelayedType(129);
- //pscaler->SetUseFirstEvent(kTRUE);
- //gHaEvtHandlers->Add(pscaler);
-
- //=:=:=
- // HMS
- //=:=:=
-
- // Set up the equipment to be analyzed.
- THcHallCSpectrometer* HMS = new THcHallCSpectrometer("H", "HMS");
- HMS->SetEvtType(2);
- HMS->AddEvtType(4);
- HMS->AddEvtType(5);
- HMS->AddEvtType(6);
- HMS->AddEvtType(7);
- gHaApps->Add(HMS);
- // Add drift chambers to HMS apparatus
- THcDC* hdc = new THcDC("dc", "Drift Chambers");
- HMS->AddDetector(hdc);
- // Add hodoscope to HMS apparatus
- THcHodoscope* hhod = new THcHodoscope("hod", "Hodoscope");
- HMS->AddDetector(hhod);
- // Add Cherenkov to HMS apparatus
- THcCherenkov* hcer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
- HMS->AddDetector(hcer);
- // Add Aerogel Cherenkov to HMS apparatus
- //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- //HMS->AddDetector(aero);
- // Add calorimeter to HMS apparatus
- THcShower* hcal = new THcShower("cal", "Calorimeter");
- HMS->AddDetector(hcal);
-
- // Add Rastered Beam Apparatus
- THaApparatus* hbeam = new THcRasteredBeam("H.rb", "HMS Rastered Beamline");
- gHaApps->Add(hbeam);
- THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
- gHaPhysics->Add(hrp);
- THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
- gHaPhysics->Add(hext);
- // Include golden track information
- THaGoldenTrack* hgtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
- gHaPhysics->Add(hgtr);
- // Hodoscope efficiency
- THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
- gHaPhysics->Add(heff);
- // Add event handler for scaler events
- //THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 4");
- //hscaler->AddEvtType(2);
- //hscaler->AddEvtType(4);
- //pscaler->AddEvtType(5);
- //pscaler->AddEvtType(6);
- //pscaler->AddEvtType(7);
- //hscaler->AddEvtType(129);
- //hscaler->SetDelayedType(129);
- //hscaler->SetUseFirstEvent(kTRUE);
- //gHaEvtHandlers->Add(hscaler);
-
- //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
- // Kinematics Modules
- //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
-
- // ---------------------------------
- // electrons in SHMS, protons in HMS
- // ---------------------------------
- // Add Physics Module to calculate primary (scattered) beam kinematics
- // THcPrimaryKine* pkin_primary = new THcPrimaryKine("P.kin.primary", "SHMS Single Arm Kinematics", "P", "P.rb");
- // gHaPhysics->Add(pkin_primary);
- // Add Physics Module to calculate secondary (scattered) beam kinematics
- // THcSecondaryKine* hkin_secondary = new THcSecondaryKine("H.kin.secondary", "HMS Single Arm Kinematics", "H", "P.kin.primary");
- // gHaPhysics->Add(hkin_secondary);
-
- // ---------------------------------
- // electrons in HMS, protons in SHMS
- // ---------------------------------
- // Add Physics Module to calculate primary (scattered) beam kinematics
- THcPrimaryKine* hkin_primary = new THcPrimaryKine("H.kin.primary", "HMS Single Arm Kinematics", "H", "H.rb");
- gHaPhysics->Add(hkin_primary);
- // Add Physics Module to calculate secondary (scattered) beam kinematics
- THcSecondaryKine* pkin_secondary = new THcSecondaryKine("P.kin.secondary", "SHMS Single Arm Kinematics", "P", "H.kin.primary");
- gHaPhysics->Add(pkin_secondary);
-
- //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
- // Global Objects & Event Handlers
- //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
-
- // Add trigger apparatus
- THaApparatus* TRG = new THcTrigApp("T", "TRG");
- gHaApps->Add(TRG);
- // Add trigger detector to trigger apparatus
- THcTrigDet* coin = new THcTrigDet("coin", "Coincidence Trigger Information");
- // Suppress missing reference time warnings for these event types
- coin->SetEvtType(1);
- coin->AddEvtType(2);
- TRG->AddDetector(coin);
- // Add event handler for prestart event 125.
- THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
- gHaEvtHandlers->Add(ev125);
- // Add event handler for EPICS events
- THaEpicsEvtHandler* hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
- gHaEvtHandlers->Add(hcepics);
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
-
- // Set to read in Hall C run database parameters
- run->SetRunParamClass("THcRunParameters");
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
- run->SetNscan(1);
- run->SetDataRequired(0x7);
- run->Print();
-
- // Define the analysis parameters
- TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
- // Set EPICS event type
- analyzer->SetEpicsEvtType(180);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define DEF-file+
- analyzer->SetOdefFile("DEF-files/COIN/PRODUCTION/coin_production_ep.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/COIN/PRODUCTION/coin_production_ep_cuts.def"); // optional
- // File to record accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/COIN/PRODUCTION/summary_production_ep_%d.report", RunNumber)); // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template
- analyzer->PrintReport("TEMPLATES/COIN/PRODUCTION/coin_production_ep.template",
- Form("REPORT_OUTPUT/COIN/PRODUCTION/replay_coin_production_ep_%d.report", RunNumber)); // optional
-
-}
diff --git a/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C b/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C
index 2a171dc4..a3f28c32 100644
--- a/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C
+++ b/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C
@@ -18,32 +18,29 @@ void replay_coin_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Create file name patterns.
const char* RunFileNamePattern = "coin_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/coin_replay_scalers_%d_%d.root";
// Load global parameters
- // Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/standard.database");
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"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
// Load params for SHMS coin configuration
gHcParms->Load("PARAM/TRIG/tcoin.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+ gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
+
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/COIN/DETEC/coin.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
- // Add trigger apparatus
+ // Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
// Add trigger detector to trigger apparatus
@@ -114,6 +111,8 @@ void replay_coin_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
diff --git a/SCRIPTS/HMS/MACROS/hhodo_analysis.C b/SCRIPTS/HMS/MACROS/hhodo_analysis.C
deleted file mode 100644
index f4f0fb1d..00000000
--- a/SCRIPTS/HMS/MACROS/hhodo_analysis.C
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// Custom analysis of the hodoscope individual channels
-// Author: Eric Pooser, pooser@jlab.org, 01/06/2017
-// Script adapted from hcana/examples/hhodrawhists.C
-
-//#include "TF1.h"
-
-#define NPLANES 4
-#define NSIDES 2
-#define NSIGNALS 2
-#define MAXBARS 16
-
-TString SPECTROMETER = "H";
-TString DETECTOR = "hod";
-
-TString plane_names[NPLANES] = {"1x", "1y", "2x", "2y"};
-Int_t nbars[NPLANES] = {16, 10, 16, 10};
-TString sides[NSIDES] = {"neg", "pos"};
-TString signals[NSIGNALS] = {"adc", "tdc"};
-
-static const Double_t ADC_MIN = 0.0;
-static const Double_t ADC_MAX = 25000.0;
-static const Int_t ADC_NBINS = 2500;
-
-static const Double_t TDC_MIN = 0.0;
-static const Double_t TDC_MAX = 8000.0;
-static const Int_t TDC_NBINS = 800;
-
-Int_t nhits[NPLANES][NSIDES][NSIGNALS];
-Double_t paddles[NPLANES][NSIDES][NSIGNALS][MAXBARS];
-Double_t values[NPLANES][NSIDES][NSIGNALS][MAXBARS];
-
-TH1F *h[NPLANES*NSIDES*NSIGNALS*MAXBARS];
-TFile *rif, *rof;
-
-TTree *T;
-
-TString base_name, ndata_name, padlist_name, vallist_name;
-
-Int_t nbins, hmin, hmax, hindex, hindex_base;
-
-TString ibarname, title, name;
-
-Int_t ibar;
-Double_t val;
-
-void hhodo_analysis(Int_t RunNumber=0, Int_t MaxEvent=0) {
-
- // Get RunNumber and MaxEvent if not provided.
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) return;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
-
- // Define root in/out files
- rif = new TFile(Form("ROOTfiles/hhodo_htrig_replay_%d.root", RunNumber), "READ");
- rof = new TFile(Form("ROOTfiles/hhodo_analysis_%d.root", RunNumber), "RECREATE");
- rif->cd();
-
- // Acquire tree from root in file
- T = new TTree();
- T = (TTree*) rif->Get("T");
-
- for(Int_t iplane = 0; iplane < NPLANES; iplane++) {
- for(Int_t iside = 0; iside < NSIDES; iside++) {
- for(Int_t isignal = 0; isignal < NSIGNALS; isignal++) {
-
- base_name = SPECTROMETER + "." + DETECTOR + "." +
- plane_names[iplane] + "." + sides[iside] + signals[isignal];
- ndata_name = "Ndata." + base_name + "pad";
- padlist_name = base_name + "pad";
- vallist_name = base_name + "val";
-
- // Set branch addresses
- T->SetBranchAddress(ndata_name, &nhits[iplane][iside][isignal]);
- T->SetBranchAddress(padlist_name, &paddles[iplane][iside][isignal][0]);
- T->SetBranchAddress(vallist_name, &values[iplane][iside][isignal][0]);
-
- // Create histograms
- // ADC and TDC histogram for each
- if(signals[isignal] == "adc")
- nbins = ADC_NBINS; hmin = ADC_MIN; hmax = ADC_MAX;
- if(signals[isignal] == "tdc")
- nbins = TDC_NBINS; hmin = TDC_MIN; hmax = TDC_MAX;
-
- rof->cd();
- for(Int_t ibar = 0; ibar < nbars[iplane]; ibar++) {
- hindex = iplane*NSIDES*NSIGNALS*MAXBARS
- + iside*NSIGNALS*MAXBARS + isignal*MAXBARS + ibar;
- ibarname = Form("%d", ibar + 1);
- title = "h" + plane_names[iplane] + ibarname + sides[iside]
- + " " + signals[isignal];
- name = "h"; name += Form("%d", hindex);
- // cout << name << " " << title << " " << nbins << " " << hmin << " "
- // << hmax << endl;
- h[hindex] = new TH1F(name, title, nbins, hmin, hmax);
- }
- rif->cd();
-
- } // Signal loop
- } // Side loop
- } // Plane loop
-
- // Loop over the events, filling the histograms
- for(Int_t ievent = 0, N = T->GetEntries(); ievent < N; ievent++) {
- T->GetEntry(ievent);
- for(Int_t iplane = 0; iplane < NPLANES; iplane++){
- for(Int_t iside = 0;iside < NSIDES; iside++) {
- for(Int_t isignal = 0;isignal < NSIGNALS; isignal++) {
-
- hindex_base = iplane*NSIDES*NSIGNALS*MAXBARS
- + iside*NSIGNALS*MAXBARS + isignal*MAXBARS;
-
- for(Int_t ihit = 0; ihit < nhits[iplane][iside][isignal]; ihit++) {
- ibar = TMath::Nint(paddles[iplane][iside][isignal][ihit]) - 1;
- val = values[iplane][iside][isignal][ihit];
- hindex = hindex_base + ibar;
- h[hindex]->Fill(val);
- } // Hit loop
- } // Signal loop
- } // Side loop
- } // Plane loop
-
- // Display or save the histograms
-
- }
-
- // Write the root out file
- rof->cd(); rof->Write();
-
-}
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
index 5b8d6647..9e0343d9 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
@@ -25,23 +25,21 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_production_all_%d_%d.root";
- //Load Global parameters
+ // Load Global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
// Load params for HMS trigger configuration
gHcParms->Load("PARAM/TRIG/thms.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack.map");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
// Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
@@ -63,29 +61,29 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcCherenkov* cer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
HMS->AddDetector(cer);
// Add Aerogel Cherenkov to HMS apparatus
- //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- //HMS->AddDetector(aero);
+ // THcAerogel* aero = new THcAerogel("aero", "Aerogel");
+ // HMS->AddDetector(aero);
// Add calorimeter to HMS apparatus
THcShower* cal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(cal);
- // Add Rastered Beam Apparatus
+ // Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
gHaApps->Add(beam);
- THaReactionPoint* hrp= new THaReactionPoint("H.react", "HMS reaction point", "H", "H.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* hrp = new THaReactionPoint("H.react", "HMS reaction point", "H", "H.rb");
gHaPhysics->Add(hrp);
+ // Calculate extended target corrections
THcExtTarCor* hext = new THcExtTarCor("H.extcor", "HMS extended target corrections", "H", "H.react");
gHaPhysics->Add(hext);
- // Include golden track information
+ // Calculate golden track quantities
THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
gHaPhysics->Add(gtr);
- // Add Ideal Beam Apparatus
- // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
- // gHaApps->Add(beam);
- // Add physics module to calculate primary (scattered) beam kinematics
+ // Calculate primary (scattered beam - usually electrons) kinematics
THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "H.rb");
gHaPhysics->Add(hkin);
- // Add physics module to calculate the hodoscope efficiencies
+ // Calculate the hodoscope efficiencies
THcHodoEff* heff = new THcHodoEff("hhodeff", "HMS hodo efficiency", "H.hod");
gHaPhysics->Add(heff);
@@ -125,19 +123,17 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
@@ -150,11 +146,11 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define cuts file
analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
// File to record cuts accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_all_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
analyzer->Process(run);
// Create report file from template.
analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
- Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
+ Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_all_production_%d_%d.report", RunNumber, MaxEvent));
}
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
index b8d28517..5319b487 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C
@@ -18,31 +18,29 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_production_%d_%d.root";
- //Load Global parameters
+ // Load Global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
// Load params for HMS trigger configuration
gHcParms->Load("PARAM/TRIG/thms.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack.map");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
-
+
// Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
@@ -63,29 +61,30 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcCherenkov* cer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
HMS->AddDetector(cer);
// Add Aerogel Cherenkov to HMS apparatus
- //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- //HMS->AddDetector(aero);
+ // THcAerogel* aero = new THcAerogel("aero", "Aerogel");
+ // HMS->AddDetector(aero);
// Add calorimeter to HMS apparatus
THcShower* cal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(cal);
-// Add Rastered Beam Apparatus
+ // Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
gHaApps->Add(beam);
- THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* hrp = new THaReactionPoint("H.react", "HMS reaction point", "H", "H.rb");
gHaPhysics->Add(hrp);
- THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
+ // Calculate extended target corrections
+ THcExtTarCor* hext = new THcExtTarCor("H.extcor", "HMS extended target corrections", "H", "H.react");
gHaPhysics->Add(hext);
- // Include golden track information
+ // Calculate golden track quantities
THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
gHaPhysics->Add(gtr);
-// Add Ideal Beam Apparatus
- // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
- // gHaApps->Add(beam);
- // Add Physics Module to calculate primary (scattered) beam kinematics
+ // Calculate primary (scattered beam - usually electrons) kinematics
THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "H.rb");
gHaPhysics->Add(hkin);
- THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* heff = new THcHodoEff("hhodeff", "HMS hodo efficiency", "H.hod");
gHaPhysics->Add(heff);
// Add handler for prestart event 125.
@@ -124,36 +123,35 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
- // Set EPICS event type
- analyzer->SetEpicsEvtType(180);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define output DEF-file
- analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
- // File to record cuts accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template.
- analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
- Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+
+ analyzer->SetEvent(event);
+ // Set EPICS event type
+ analyzer->SetEpicsEvtType(180);
+ // Define crate map
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ // Define output ROOT file
+ analyzer->SetOutFile(ROOTFileName.Data());
+ // Define output DEF-file
+ analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production.def");
+ // Define cuts file
+ analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
+ // File to record cuts accounting information for cuts
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ // Start the actual analysis.
+ analyzer->Process(run);
+ // Create report file from template.
+ analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
+ Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
}
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
index a2c3664b..0c569059 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
@@ -18,31 +18,29 @@ void replay_production_hms_coin(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "coin_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/hms_coin_replay_production_%d_%d.root";
- //Load Global parameters
+ // Load Global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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"));
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
// Load params for HMS trigger configuration
gHcParms->Load("PARAM/TRIG/thms.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack.map");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
-
+
// Set up the equipment to be analyzed.
THcHallCSpectrometer* HMS = new THcHallCSpectrometer("H", "HMS");
HMS->SetEvtType(2);
@@ -61,8 +59,8 @@ void replay_production_hms_coin(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcCherenkov* cer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
HMS->AddDetector(cer);
// Add Aerogel Cherenkov to HMS apparatus
- //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- //HMS->AddDetector(aero);
+ // THcAerogel* aero = new THcAerogel("aero", "Aerogel");
+ // HMS->AddDetector(aero);
// Add calorimeter to HMS apparatus
THcShower* cal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(cal);
@@ -75,23 +73,24 @@ void replay_production_hms_coin(Int_t RunNumber=0, Int_t MaxEvent=0) {
hms->SetSpectName("H");
TRG->AddDetector(hms);
-// Add Rastered Beam Apparatus
+ // Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
gHaApps->Add(beam);
- THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* hrp = new THaReactionPoint("H.react", "HMS reaction point", "H", "H.rb");
gHaPhysics->Add(hrp);
- THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
+ // Calculate extended target corrections
+ THcExtTarCor* hext = new THcExtTarCor("H.extcor", "HMS extended target corrections", "H", "H.react");
gHaPhysics->Add(hext);
- // Include golden track information
+ // Calculate golden track quantities
THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
gHaPhysics->Add(gtr);
-// Add Ideal Beam Apparatus
- // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
- // gHaApps->Add(beam);
- // Add Physics Module to calculate primary (scattered) beam kinematics
+ // Calculate primary (scattered beam - usually electrons) kinematics
THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "H.rb");
gHaPhysics->Add(hkin);
- THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* heff = new THcHodoEff("hhodeff", "HMS hodo efficiency", "H.hod");
gHaPhysics->Add(heff);
// Add handler for prestart event 125.
@@ -134,36 +133,35 @@ void replay_production_hms_coin(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
- // Set EPICS event type
- analyzer->SetEpicsEvtType(180);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define output DEF-file
- analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
- // File to record cuts accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template.
- analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
- Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+
+ analyzer->SetEvent(event);
+ // Set EPICS event type
+ analyzer->SetEpicsEvtType(180);
+ // Define crate map
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ // Define output ROOT file
+ analyzer->SetOutFile(ROOTFileName.Data());
+ // Define output DEF-file
+ analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production.def");
+ // Define cuts file
+ analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def"); // optional
+ // File to record cuts accounting information for cuts
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_coin_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ // Start the actual analysis.
+ analyzer->Process(run);
+ // Create report file from template.
+ analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
+ Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_coin_production_%d_%d.report", RunNumber, MaxEvent));
}
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C
deleted file mode 100644
index e32b6a72..00000000
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_kpp.C
+++ /dev/null
@@ -1,151 +0,0 @@
-void replay_production_hms_kpp(Int_t RunNumber=0, Int_t MaxEvent=0) {
-
- // Get RunNumber and MaxEvent if not provided.
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) return;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
-
- // Create file name patterns.
- const char* RunFileNamePattern = "hms_all_%05d.dat";
- vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
-
- const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_production_%d_%d.root";
-
- //Load Global parameters
- // Add variables to global list.
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
- // Load varibles from files to global list.
- gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
- // g_ctp_parm_filename and g_decode_map_filename should now be defined.
- gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
- gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
- gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
- // Load params for HMS trigger configuration
- gHcParms->Load("PARAM/TRIG/thms.param");
-
- // Load the Hall C detector map
- gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack_6gev.map");
-
- // Add trigger apparatus
- THaApparatus* TRG = new THcTrigApp("T", "TRG");
- gHaApps->Add(TRG);
- // Add trigger detector to trigger apparatus
- THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
- TRG->AddDetector(hms);
-
- // Set up the equipment to be analyzed.
- THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
- gHaApps->Add(HMS);
- // Add drift chambers to HMS apparatus
- THcDC* dc = new THcDC("dc", "Drift Chambers");
- HMS->AddDetector(dc);
- // Add hodoscope to HMS apparatus
- THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
- HMS->AddDetector(hod);
- // Add Cherenkov to HMS apparatus
- THcCherenkov* cer = new THcCherenkov("cer", "Heavy Gas Cherenkov");
- HMS->AddDetector(cer);
- // Add Aerogel Cherenkov to HMS apparatus
- //THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- //HMS->AddDetector(aero);
- // Add calorimeter to HMS apparatus
- THcShower* cal = new THcShower("cal", "Calorimeter");
- HMS->AddDetector(cal);
-
- // Include golden track information
- THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
- gHaPhysics->Add(gtr);
- // Add Ideal Beam Apparatus
- // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
-// Add Rastered Beam Apparatus
- THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
- gHaApps->Add(beam);
- THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
- gHaPhysics->Add(hrp);
- THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
- gHaPhysics->Add(hext);
- // Add Physics Module to calculate primary (scattered) beam kinematics
- THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "H.rb");
- gHaPhysics->Add(hkin);
- THcHodoEff* heff = new THcHodoEff("hodeff"," HMS hodo efficiency","H.hod");
- gHaPhysics->Add(heff);
- // Add handler for prestart event 125.
- THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
- gHaEvtHandlers->Add(ev125);
- // Add handler for EPICS events
- THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
- gHaEvtHandlers->Add(hcepics);
- // Add handler for scaler events
- THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 1");
- hscaler->AddEvtType(1);
- hscaler->SetUseFirstEvent(kTRUE);
- gHaEvtHandlers->Add(hscaler);
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
-
- // Set to read in Hall C run database parameters
- run->SetRunParamClass("THcRunParameters");
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
- run->SetNscan(1);
- run->SetDataRequired(0x7);
- run->Print();
-
- // Define the analysis parameters
- TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
- // Set EPICS event type
- analyzer->SetEpicsEvtType(180);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define output DEF-file
- analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production_kpp.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts_kpp.def"); // optional
- // File to record cuts accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template.
- analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production_kpp.template",
- Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
-
-}
diff --git a/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C b/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C
index b61d4e16..19e26bc6 100644
--- a/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C
+++ b/SCRIPTS/HMS/RASTER/replay_hms_raster_simple.C
@@ -18,36 +18,30 @@ void replay_hms_raster_simple(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/HMS/STD/standard.database");
- //Load global parameters
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/HMS/DETEC/RASTER/hraster.map");
-
// Add handler for EPICS events
THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
gHaEvtHandlers->Add(hcepics);
- // Add Rastered Beam Apparatus
+ // Add Rastered Beam Apparatus
THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
gHaApps->Add(beam);
-
+
// Set up the analyzer - we use the standard one,
// but this could be an experiment-specific one as well.
// The Analyzer controls the reading of the data, executes
@@ -63,11 +57,13 @@ void replay_hms_raster_simple(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
@@ -75,19 +71,19 @@ void replay_hms_raster_simple(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+ analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define DEF-file
- analyzer->SetOdefFile("DEF-files/HMS/RASTER/hms_raster_simple.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/RASTER/hms_raster_simple_cuts.def"); // optional
+ // Define crate map
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ // Define output ROOT file
+ analyzer->SetOutFile(ROOTFileName.Data());
+ // Define DEF-file
+ analyzer->SetOdefFile("DEF-files/HMS/RASTER/hms_raster_simple.def");
+ // Define cuts file
+ analyzer->SetCutFile("DEF-files/HMS/RASTER/hms_raster_simple_cuts.def"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
index bcc2eec9..bb509feb 100644
--- a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
+++ b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
@@ -18,24 +18,19 @@ void replay_hms_scalers(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_scalers_%d_%d.root";
// Load global parameters
- // Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/thms.param");
// Load the Hall C style detector map
@@ -77,8 +72,9 @@ void replay_hms_scalers(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- //THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
diff --git a/SCRIPTS/HMS/STACK/replay_hms.C b/SCRIPTS/HMS/STACK/replay_hms.C
deleted file mode 100644
index 551bf315..00000000
--- a/SCRIPTS/HMS/STACK/replay_hms.C
+++ /dev/null
@@ -1,124 +0,0 @@
-void replay_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
-
- // Get RunNumber and MaxEvent if not provided.
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) return;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
-
- // Create file name patterns.
- const char* RunFileNamePattern = "hms_all_%05d.dat";
- vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
-
- const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_%d_%d.root";
- // Add variables to global list.
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
- // Load varibles from files to global list.
- gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
- // g_ctp_parm_filename and g_decode_map_filename should now be defined.
- gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
- gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
- gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
- // Load params for HMS trigger configuration
- gHcParms->Load("PARAM/TRIG/thms.param");
-
- // Load the Hall C style detector map
- gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack.map");
-
- // Add trigger apparatus
- THaApparatus* TRG = new THcTrigApp("T", "TRG");
- gHaApps->Add(TRG);
- // Add trigger detector to trigger apparatus
- THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
- TRG->AddDetector(hms);
- // Set up the equipment to be analyzed.
- THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
- gHaApps->Add(HMS);
- // Add drift chambers to HMS apparatus
- THcDC* dc = new THcDC("dc", "Drift Chambers");
- HMS->AddDetector(dc);
- // Add hodoscope to HMS apparatus
- THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
- HMS->AddDetector(hod);
- // Add 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);
- // Add calorimeter to HMS apparatus
- THcShower* cal = new THcShower("cal", "Calorimeter");
- HMS->AddDetector(cal);
-
- // Include golden track information
- THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
- gHaPhysics->Add(gtr);
- // Add handler for prestart event 125.
- THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
- gHaEvtHandlers->Add(ev125);
- THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
- gHaPhysics->Add(heff);
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
- run->SetNscan(1);
- run->SetDataRequired(0x7);
- run->Print();
-
- // Define the analysis parameters
- TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
-
-// Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define DEF-file
- analyzer->SetOdefFile("DEF-files/HMS/STACK/hstack_include.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/STACK/hstackana_cuts.def"); // optional
- // File to record accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/STACK/summary_stack_%d_%d.report", RunNumber, MaxEvent)); // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template
- analyzer->PrintReport("TEMPLATES/HMS/STACK/hstackana.template",
- Form("REPORT_OUTPUT/HMS/STACK/replay_hms_stack_%d_%d.report", RunNumber, MaxEvent)); // optional
-
-}
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
index e5ebb594..9b21cdd5 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hcal_test_stand.C
@@ -18,28 +18,24 @@ void replay_hcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
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/CAL/hcal_htrig.map");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
// Set up the equipment to be analyzed.
THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
@@ -73,7 +69,9 @@ void replay_hcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -88,14 +86,14 @@ void replay_hcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/CAL/hcalana.def");
- analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/CAL/hcalana.def");
+ analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/CAL/hcalana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C
index 71a4f2b5..4c88c780 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hcer_test_stand.C
@@ -18,23 +18,19 @@ void replay_hcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/thms.param");
gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
@@ -74,7 +70,9 @@ void replay_hcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -89,14 +87,14 @@ void replay_hcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/CER/hcerana.def");
- analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/CER/hcerana.def");
+ analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/CER/hcerana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C
index 9d477ef6..1ad4aeee 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hdc_test_stand.C
@@ -18,28 +18,24 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
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(gHcParms->GetString("g_decode_map_filename"));
gHcDetectorMap->Load("MAPS/HMS/DETEC/DC/hdc_htrig.map");
// Set up the equipment to be analyzed.
@@ -49,7 +45,7 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcDC* dc = new THcDC("dc", "Drift Chambers");
HMS->AddDetector(dc);
- // Add trigger apparatus
+ // Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
// Add trigger detector to trigger apparatus
@@ -76,7 +72,9 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -91,14 +89,14 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/DC/hdcana.def");
- analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def"); // optional
-
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/DC/hdcana.def");
+ analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/DC/hdcana_cuts.def"); // optional
+
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C
index 8cac55e0..d3675143 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_hhodo_test_stand.C
@@ -18,30 +18,26 @@ void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
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/HODO/hhodo_htrig.map");
- gHcParms->Load("PARAM/HMS/GEN/h_fadc_debug.param");
-
+
// Set up the equipment to be analyzed.
THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
gHaApps->Add(HMS);
@@ -74,7 +70,9 @@ void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -89,14 +87,14 @@ void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def");
- analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/HODO/hhodoana.def");
+ analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/HODO/hhodoana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C b/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C
index a2fb37e4..3ad3005f 100644
--- a/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C
+++ b/SCRIPTS/HMS/TEST_STANDS/replay_htrig_test_stand.C
@@ -18,24 +18,21 @@ void replay_htrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "hms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/HMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
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();
@@ -66,7 +63,9 @@ void replay_htrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -81,14 +80,14 @@ void replay_htrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def");
- analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/HMS/TEST_STANDS/TRIG/htrigana.def");
+ analyzer->SetCutFile("DEF-files/HMS/TEST_STANDS/TRIG/htrigana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C b/SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C
deleted file mode 100644
index 9bf36bed..00000000
--- a/SCRIPTS/SHMS/EXAMPLES/replay_workshop_example.C
+++ /dev/null
@@ -1,113 +0,0 @@
-void replay_workshop_example(Int_t RunNumber=0, Int_t MaxEvent=0) {
-
- // Get RunNumber and MaxEvent if not provided.
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) return;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
- // Create file name patterns.
- const char* RunFileNamePattern = "shms_all_%05d.dat";
- vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
-
- const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%d_%d.root";
- // Add variables to global list.
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
- // Load varibles from files to global list.
- gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
- // g_ctp_parm_filename and g_decode_map_filename should now be defined.
- gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
- gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
- gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
- // Load params for SHMS trigger configuration
- gHcParms->Load("PARAM/TRIG/tshms.param");
-
- // Load the Hall C style detector map
- gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
-
- // Add trigger apparatus
- THaApparatus* TRG = new THcTrigApp("T", "TRG");
- gHaApps->Add(TRG);
- // Add trigger detector to trigger apparatus
- THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
- TRG->AddDetector(shms);
- // Set up the equipment to be analyzed.
- THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
- gHaApps->Add(SHMS);
- // Add drift chambers to SHMS apparatus
- THcDC* dc = new THcDC("dc", "Drift Chambers");
- SHMS->AddDetector(dc);
- // Add hodoscope to SHMS apparatus
- THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
- SHMS->AddDetector(hod);
- // Add Heavy Gas Cherenkov to SHMS apparatus
- THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
- SHMS->AddDetector(hgcer);
- // Include golden track information
- THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
- gHaPhysics->Add(gtr);
-
- // Add handler for prestart event 125.
- THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
- gHaEvtHandlers->Add(ev125);
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
- run->SetNscan(1);
- run->SetDataRequired(0x7);
- run->Print();
-
- // Define the analysis parameters
- TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- 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
-
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template.
- //analyzer->PrintReport( // optional
- // "TEMPLATES/dcana.template",
- // Form("REPORT_OUTPUT/replay_shms_%05d.report", RunNumber)
- //);
-}
diff --git a/SCRIPTS/SHMS/GEM/replay_gem_shms.C b/SCRIPTS/SHMS/GEM/replay_gem_shms.C
index 40d8268e..f87971c6 100644
--- a/SCRIPTS/SHMS/GEM/replay_gem_shms.C
+++ b/SCRIPTS/SHMS/GEM/replay_gem_shms.C
@@ -20,24 +20,20 @@ void replay_gem_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_gem_%d_%d.root";
// Load global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
// Load the Hall C detector map
@@ -47,7 +43,6 @@ void replay_gem_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
-
// Add trigger detector to trigger apparatus
THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
diff --git a/SCRIPTS/SHMS/MACROS/shw_pshw.C b/SCRIPTS/SHMS/MACROS/shw_pshw.C
deleted file mode 100644
index 83391c60..00000000
--- a/SCRIPTS/SHMS/MACROS/shw_pshw.C
+++ /dev/null
@@ -1,152 +0,0 @@
-void shw_pshw() {
- cout << "Hello." << endl << endl;
-
- const Int_t nPreShowerBlocks = 14;
- const Int_t nShowerBlocks = 224;
-
- Double_t preShowerNeg_adc2GeV[nPreShowerBlocks] = {
- 1.0/466.2, 1.0/514.7, 1.0/325.5, 1.0/247.8,
- 1.0/322.0, 1.0/176.2, 1.0/161.9, 1.0/197.7,
- 1.0/269.9, 1.0/241.6, 1.0/193.7, 1.0/337.5,
- 1.0/237.3, 1.0/82.0
- };
- Double_t preShowerPos_adc2GeV[nPreShowerBlocks] = {
- 1.0/411.2, 1.0/378.6, 1.0/357.9, 1.0/254.8,
- 1.0/315.6, 1.0/331.0, 1.0/264.6, 1.0/305.4,
- 1.0/149.8, 1.0/380.6, 1.0/183.1, 1.0/206.5,
- 1.0/139.8, 1.0/163.1
- };
- Double_t shower_adc2GeV = 0.0005;
-
-
- TFile F("../ROOTfiles/shms_replay_488_-1.root");
- TTree* T = F.Get("T");
-
-
- Int_t nTracks;
- Double_t track_x[1000];
- Double_t track_y[1000];
- Double_t track_xp[1000];
- Double_t track_yp[1000];
-
- T->SetBranchAddress("Ndata.P.dc.x", &nTracks);
- T->SetBranchAddress("P.dc.x", track_x);
- T->SetBranchAddress("P.dc.y", track_y);
- T->SetBranchAddress("P.dc.xp", track_xp);
- T->SetBranchAddress("P.dc.yp", track_yp);
-
- Int_t nPreShower;
- Double_t preShower_posAdcC[1000];
- Double_t preShower_posAdcPI[1000];
-
- T->SetBranchAddress("Ndata.P.cal.pr.posAdcCounter", &nPreShower);
- T->SetBranchAddress("P.cal.pr.posAdcCounter", preShower_posAdcC);
- T->SetBranchAddress("P.cal.pr.posAdcPulseInt", preShower_posAdcPI);
-
- Int_t nShower;
- Double_t shower_C[1000];
- Double_t shower_PI[1000];
-
- T->SetBranchAddress("Ndata.P.cal.fly.adcCounter", &nShower);
- T->SetBranchAddress("P.cal.fly.adcCounter", shower_C);
- T->SetBranchAddress("P.cal.fly.adcPulseInt", shower_PI);
-
- Int_t nNGC;
- Double_t NGC_C[1000];
- Double_t NGC_PI[1000];
-
- T->SetBranchAddress("Ndata.P.ngcer.adcCounter", &nNGC);
- T->SetBranchAddress("P.ngcer.adcCounter", NGC_C);
- T->SetBranchAddress("P.ngcer.adcPulseInt", NGC_PI);
-
-
- TH2D* s_ps = new TH2D("s_ps", "s_ps", 100, -1, 30, 100, -1, 20);
- s_ps->SetTitle("");
- TH2D* s_ps_e = new TH2D("s_ps_e", "s_ps_e", 100, -1, 30, 100, -1, 20);
- TH2D* s_ps_pi = new TH2D("s_ps_pi", "s_ps_pi", 100, -1, 30, 100, -1, 20);
-
-
- Long64_t nEvents = T->GetEntries();
- //for (Long64_t iEvent; iEvent<100000; ++iEvent) {
- for (Long64_t iEvent; iEvent<nEvents; ++iEvent) {
- if ((iEvent+1)%1000 == 0) cout << "Event: " << iEvent+1 << endl;
- T->GetEntry(iEvent);
-
- if (nTracks!=1 || fabs(track_x[0] + track_xp[0]*330 + 9)>9 || fabs(track_y[0] + track_yp[0]*330 - 9)>9) continue;
-
- bool electron=false;
- for (Int_t iC=0; iC<nNGC; ++iC) {
- if (NGC_PI[iC] > 4500) {
- electron = true;
- continue;
- }
- }
-
- bool pion=true;
- for (Int_t iC=0; iC<nNGC; ++iC) {
- if (NGC_PI[iC] > 3500) {
- pion = false;
- continue;
- }
- }
-
- Double_t preShower_energy = 0.0;
- for (Int_t iPS=0; iPS<nPreShower; ++iPS) {
- Int_t psc = preShower_posAdcC[iPS];
- if (psc==6 || psc==7) {
- preShower_energy += preShower_posAdcPI[iPS] * preShowerPos_adc2GeV[psc-1];
- }
- }
-
- Double_t shower_energy = 0.0;
- for (Int_t iS=0; iS<nShower; ++iS) {
- Int_t sc = shower_C[iS];
- if (sc==87 || sc==88 || sc==103 || sc==104) {
- shower_energy += shower_PI[iS] * shower_adc2GeV;
- }
- }
-
- s_ps->Fill(preShower_energy, shower_energy);
- if (electron) s_ps_e->Fill(preShower_energy, shower_energy);
- if (pion) s_ps_pi->Fill(preShower_energy, shower_energy);
-
- }
-
-
- gStyle->SetOptStat(0);
-
- s_ps->GetXaxis()->SetTitle("pre-shower energy");
- s_ps->GetYaxis()->SetTitle("shower energy");
- s_ps->SetMarkerColor(1);
-
- s_ps_e->GetXaxis()->SetTitle("pre-shower energy");
- s_ps_e->GetYaxis()->SetTitle("shower energy");
- s_ps_e->SetMarkerColor(2);
-
- s_ps_pi->GetXaxis()->SetTitle("pre-shower energy");
- s_ps_pi->GetYaxis()->SetTitle("shower energy");
- s_ps_pi->SetMarkerColor(3);
-
-
- TCanvas* c1 = new TCanvas("c1", "c1", 800, 600);
- c1->cd();
-
-
- s_ps->Draw();
- s_ps_e->Draw("same");
- //s_ps_pi->Draw("same");
- c1->Print("shw_pshw.png");
-
- c1->SetLogz();
-
- s_ps->Draw("colz");
- c1->Print("shw_pshw_all.png");
-
- s_ps_e->Draw("colz");
- c1->Print("shw_pshw_e.png");
-
- s_ps_pi->Draw("colz");
- c1->Print("shw_pshw_pi.png");
-
- cout << endl << "Bye." << endl;
-}
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
index b3c0e7b7..11968c95 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
@@ -26,22 +26,19 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_all_%d_%d.root";
// Load global parameters
- // Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ // Load parameters for SHMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
@@ -50,7 +47,7 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
TRG->AddDetector(shms);
- // Set up the equipment to be analyzed.
+ // Set up the equipment to be analyzed
THcHallCSpectrometer* SHMS = new THcHallCSpectrometer("P", "SHMS");
gHaApps->Add(SHMS);
// Add Noble Gas Cherenkov to SHMS apparatus
@@ -65,7 +62,6 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Add Heavy Gas Cherenkov to SHMS apparatus
THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
SHMS->AddDetector(hgcer);
-
// Add Aerogel Cherenkov to SHMS apparatus
THcAerogel* aero = new THcAerogel("aero", "Aerogel");
SHMS->AddDetector(aero);
@@ -73,20 +69,23 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
THcShower* cal = new THcShower("cal", "Calorimeter");
SHMS->AddDetector(cal);
- // Add Rastered Beam Apparatus
+ // Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(beam);
- THaReactionPoint* prp= new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* prp = new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
gHaPhysics->Add(prp);
+ // Calculate extended target corrections
THcExtTarCor* pext = new THcExtTarCor("P.extcor", "HMS extended target corrections", "P", "P.react");
gHaPhysics->Add(pext);
- // Include golden track information
+ // Calculate golden track quantites
THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
gHaPhysics->Add(gtr);
- // Add Physics Module to calculate primary (scattered beam - usually electrons) kinematics
+ // Calculate primary (scattered beam - usually electrons) kinematics
THcPrimaryKine* kin = new THcPrimaryKine("P.kin", "SHMS Single Arm Kinematics", "P", "P.rb");
gHaPhysics->Add(kin);
- // Add physics module to calculate the hodoscope efficiencies
+ // Calculate the hodoscope efficiencies
THcHodoEff* peff = new THcHodoEff("phodeff", "SHMS hodo efficiency", "P.hod");
gHaPhysics->Add(peff);
@@ -126,19 +125,17 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
@@ -151,11 +148,11 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define cuts file
analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/CUTS/pstackana_production_cuts.def"); // optional
// File to record accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_all_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
analyzer->Process(run);
// Create report file from template
analyzer->PrintReport("TEMPLATES/SHMS/PRODUCTION/pstackana_production.template",
- Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_all_production_%d_%d.report", RunNumber, MaxEvent)); // optional
}
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
index a0b3be0f..ef752a25 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
@@ -18,36 +18,31 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_%d_%d.root";
// Load global parameters
- // Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ // Load parameters for SHMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
-
-
// Add trigger detector to trigger apparatus
THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
TRG->AddDetector(shms);
@@ -67,7 +62,6 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Add Heavy Gas Cherenkov to SHMS apparatus
THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
SHMS->AddDetector(hgcer);
-
// Add Aerogel Cherenkov to SHMS apparatus
THcAerogel* aero = new THcAerogel("aero", "Aerogel");
SHMS->AddDetector(aero);
@@ -75,23 +69,25 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
THcShower* cal = new THcShower("cal", "Calorimeter");
SHMS->AddDetector(cal);
- // Add Rastered Beam Apparatus
+ // Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(beam);
- THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* prp = new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
gHaPhysics->Add(prp);
- THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
+ // Calculate extended target corrections
+ THcExtTarCor* pext = new THcExtTarCor("P.extcor", "HMS extended target corrections", "P", "P.react");
gHaPhysics->Add(pext);
- // Include golden track information
+ // Calculate golden track quantites
THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
gHaPhysics->Add(gtr);
- // Add Physics Module to calculate primary (scattered beam - usually electrons) kinematics
+ // Calculate primary (scattered beam - usually electrons) kinematics
THcPrimaryKine* kin = new THcPrimaryKine("P.kin", "SHMS Single Arm Kinematics", "P", "P.rb");
gHaPhysics->Add(kin);
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
- gHaPhysics->Add(peff);
-
-
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* peff = new THcHodoEff("phodeff", "SHMS hodo efficiency", "P.hod");
+ gHaPhysics->Add(peff);
// Add event handler for prestart event 125.
THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
@@ -129,19 +125,17 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
index 774bebca..dba14bbf 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
@@ -18,31 +18,28 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Create file name patterns.
const char* RunFileNamePattern = "coin_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/shms_coin_replay_production_%d_%d.root";
// Load global parameters
- // Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ // Load parameters for SHMS trigger configuration
gHcParms->Load("PARAM/TRIG/tshms.param");
+ // Load fadc debug parameters
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
-
+
// Set up the equipment to be analyzed.
THcHallCSpectrometer* SHMS = new THcHallCSpectrometer("P", "SHMS");
SHMS->SetEvtType(1);
@@ -63,7 +60,6 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Add Heavy Gas Cherenkov to SHMS apparatus
THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
SHMS->AddDetector(hgcer);
-
// Add Aerogel Cherenkov to SHMS apparatus
THcAerogel* aero = new THcAerogel("aero", "Aerogel");
SHMS->AddDetector(aero);
@@ -74,29 +70,30 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Add trigger apparatus
THaApparatus* TRG = new THcTrigApp("T", "TRG");
gHaApps->Add(TRG);
-
// Add trigger detector to trigger apparatus
THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
shms->SetSpectName("P");
TRG->AddDetector(shms);
- // Add Rastered Beam Apparatus
+ // Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(beam);
- THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
+ // Add physics modules
+ // Calculate reaction point
+ THaReactionPoint* prp = new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
gHaPhysics->Add(prp);
- THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
+ // Calculate extended target corrections
+ THcExtTarCor* pext = new THcExtTarCor("P.extcor", "HMS extended target corrections", "P", "P.react");
gHaPhysics->Add(pext);
- // Include golden track information
+ // Calculate golden track quantites
THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
gHaPhysics->Add(gtr);
- // Add Physics Module to calculate primary (scattered beam - usually electrons) kinematics
+ // Calculate primary (scattered beam - usually electrons) kinematics
THcPrimaryKine* kin = new THcPrimaryKine("P.kin", "SHMS Single Arm Kinematics", "P", "P.rb");
gHaPhysics->Add(kin);
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
- gHaPhysics->Add(peff);
-
-
+ // Calculate the hodoscope efficiencies
+ THcHodoEff* peff = new THcHodoEff("phodeff", "SHMS hodo efficiency", "P.hod");
+ gHaPhysics->Add(peff);
// Add event handler for prestart event 125.
THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
@@ -110,7 +107,7 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
pscaler->AddEvtType(4);
pscaler->AddEvtType(5);
pscaler->AddEvtType(6);
- pscaler->AddEvtType(7);
+ pscaler->AddEvtType(7);
pscaler->AddEvtType(129);
pscaler->SetDelayedType(129);
pscaler->SetUseFirstEvent(kTRUE);
@@ -138,19 +135,18 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Set to read in Hall C run database parameters
run->SetRunParamClass("THcRunParameters");
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
+ // Eventually need to learn to skip over, or properly analyze the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
run->Print();
// Define the analysis parameters
TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+
analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
@@ -163,11 +159,11 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define cuts file
analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/CUTS/pstackana_production_cuts.def"); // optional
// File to record accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_coin_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
analyzer->Process(run);
// Create report file from template
analyzer->PrintReport("TEMPLATES/SHMS/PRODUCTION/pstackana_production.template",
- Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%d_%d.report", RunNumber, MaxEvent)); // optional
+ Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_coin_production_%d_%d.report", RunNumber, MaxEvent)); // optional
}
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C
deleted file mode 100644
index c453b937..00000000
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_kpp.C
+++ /dev/null
@@ -1,160 +0,0 @@
-void replay_production_shms_kpp (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
-
- // Get RunNumber and MaxEvent if not provided.
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) return;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
-
- // Create file name patterns.
- const char* RunFileNamePattern = "shms_all_%05d.dat";
- vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
-
- const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_%d_%d.root";
-
- // Load global parameters
- // Add variables to global list.
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
- // Load varibles from files to global list.
- gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
- // g_ctp_parm_filename and g_decode_map_filename should now be defined.
- gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
- gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
- gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
- // Load params for SHMS trigger configuration
- gHcParms->Load("PARAM/TRIG/tshms_kpp.param");
-
- // Load the Hall C detector map
- gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack_kpp.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
- // gHcParms->Load("PARAM/SHMS/HODO/CALIB/ptofcalib.param");
-
- // Add trigger apparatus
- THaApparatus* TRG = new THcTrigApp("T", "TRG");
- gHaApps->Add(TRG);
-
-
- // Add trigger detector to trigger apparatus
- THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
- TRG->AddDetector(shms);
-
- // Set up the equipment to be analyzed.
- THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
- gHaApps->Add(SHMS);
- // Add Noble Gas Cherenkov to SHMS apparatus
- THcCherenkov* ngcer = new THcCherenkov("ngcer", "Noble Gas Cherenkov");
- SHMS->AddDetector(ngcer);
- // Add drift chambers to SHMS apparatus
- THcDC* dc = new THcDC("dc", "Drift Chambers");
- SHMS->AddDetector(dc);
- // Add hodoscope to SHMS apparatus
- THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
- SHMS->AddDetector(hod);
- // Add Heavy Gas Cherenkov to SHMS apparatus
- THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
- SHMS->AddDetector(hgcer);
-
- // Add Aerogel Cherenkov to SHMS apparatus
- THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- SHMS->AddDetector(aero);
- // Add calorimeter to SHMS apparatus
- THcShower* cal = new THcShower("cal", "Calorimeter");
- SHMS->AddDetector(cal);
-
- // Include golden track information
- THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
- gHaPhysics->Add(gtr);
- // Add Rastered Beam Apparatus
- THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
- gHaApps->Add(beam);
- THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
- gHaPhysics->Add(prp);
- THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
- gHaPhysics->Add(pext);
- // Add Physics Module to calculate primary (scattered beam - usually electrons) kinematics
- THcPrimaryKine* kin = new THcPrimaryKine("P.kin", "SHMS Single Arm Kinematics", "P", "P.rb");
- gHaPhysics->Add(kin);
-
-
-
- // Add event handler for prestart event 125.
- THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
- gHaEvtHandlers->Add(ev125);
- // Add event handler for EPICS events
- THaEpicsEvtHandler* hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
- gHaEvtHandlers->Add(hcepics);
- // Add event handler for scaler events
- THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event");
- pscaler->AddEvtType(1);
- pscaler->AddEvtType(129);
- pscaler->SetDelayedType(129);
- pscaler->SetUseFirstEvent(kTRUE);
- gHaEvtHandlers->Add(pscaler);
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
-
- // Set to read in Hall C run database parameters
- run->SetRunParamClass("THcRunParameters");
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
- run->SetNscan(1);
- run->SetDataRequired(0x7);
- run->Print();
-
- // Define the analysis parameters
- TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
- // Set EPICS event type
- analyzer->SetEpicsEvtType(180);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define DEF-file
- analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/CUTS/pstackana_production_cuts.def"); // optional
- // File to record accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template
- analyzer->PrintReport("TEMPLATES/SHMS/PRODUCTION/pstackana_production.template",
- Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%d_%d.report", RunNumber, MaxEvent)); // optional
-
-}
diff --git a/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C b/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C
index fc8af9e3..8d3e5c81 100644
--- a/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C
+++ b/SCRIPTS/SHMS/RASTER/replay_shms_raster_simple.C
@@ -18,31 +18,28 @@ void replay_shms_raster_simple (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
-
- // Load global parameters
- // Add varibles to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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_kinematics_filename"), RunNumber);
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/RASTER/praster.map");
- // Add handler for EPICS events
+ // Add handler for EPICS events
THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
gHaEvtHandlers->Add(hcepics);
- // Add Rastered Beam Apparatus
+ // Add Rastered Beam Apparatus
THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
gHaApps->Add(beam);
@@ -61,6 +58,8 @@ void replay_shms_raster_simple (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -75,18 +74,18 @@ void replay_shms_raster_simple (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetEvent(event);
+ // Define crate map
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define DEF-file
- analyzer->SetOdefFile("DEF-files/SHMS/RASTER/shms_raster_simple.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/RASTER/shms_raster_simple_cuts.def"); // optional
- // Start the actual analysis.
- analyzer->Process(run);
+ // Define output ROOT file
+ analyzer->SetOutFile(ROOTFileName.Data());
+ // Define DEF-file
+ analyzer->SetOdefFile("DEF-files/SHMS/RASTER/shms_raster_simple.def");
+ // Define cuts file
+ analyzer->SetCutFile("DEF-files/SHMS/RASTER/shms_raster_simple_cuts.def"); // optional
+ // Start the actual analysis.
+ analyzer->Process(run);
}
diff --git a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
index 8a984a75..30ef3053 100644
--- a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
+++ b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
@@ -18,24 +18,20 @@ void replay_shms_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_scalers_%d_%d.root";
// Load global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
// Load the Hall C detector map
@@ -78,6 +74,8 @@ void replay_shms_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
diff --git a/SCRIPTS/SHMS/STACK/replay_shms.C b/SCRIPTS/SHMS/STACK/replay_shms.C
deleted file mode 100644
index faa45e54..00000000
--- a/SCRIPTS/SHMS/STACK/replay_shms.C
+++ /dev/null
@@ -1,130 +0,0 @@
-void replay_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
-
- // Get RunNumber and MaxEvent if not provided.
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) return;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
-
- // Create file name patterns.
- const char* RunFileNamePattern = "shms_all_%05d.dat";
- vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
-
- const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%d_%d.root";
-
- // Load global parameters
- // Add variables to global list.
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
- // Load varibles from files to global list.
- gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
- // g_ctp_parm_filename and g_decode_map_filename should now be defined.
- gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
- gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
- gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
- // Load params for SHMS trigger configuration
- gHcParms->Load("PARAM/TRIG/tshms.param");
-
- // Load the Hall C detector map
- gHcDetectorMap = new THcDetectorMap();
- gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
-
- // Add trigger apparatus
- THaApparatus* TRG = new THcTrigApp("T", "TRG");
- gHaApps->Add(TRG);
- // Add trigger detector to trigger apparatus
- THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
- TRG->AddDetector(shms);
-
- // Set up the equipment to be analyzed.
- THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
- gHaApps->Add(SHMS);
- // Add Noble Gas Cherenkov to SHMS apparatus
- THcCherenkov* ngcer = new THcCherenkov("ngcer", "Noble Gas Cherenkov");
- SHMS->AddDetector(ngcer);
- // Add drift chambers to SHMS apparatus
- THcDC* dc = new THcDC("dc", "Drift Chambers");
- SHMS->AddDetector(dc);
- // Add hodoscope to SHMS apparatus
- THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
- SHMS->AddDetector(hod);
- // Add Heavy Gas Cherenkov to SHMS apparatus
- THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
- SHMS->AddDetector(hgcer);
- // Add Aerogel Cherenkov to SHMS apparatus
- THcAerogel* aero = new THcAerogel("aero", "Aerogel");
- SHMS->AddDetector(aero);
- // Add calorimeter to SHMS apparatus
- THcShower* cal = new THcShower("cal", "Calorimeter");
- SHMS->AddDetector(cal);
-
- // Include golden track information
- THaGoldenTrack* gtr = new THaGoldenTrack("P.gtr", "SHMS Golden Track", "P");
- gHaPhysics->Add(gtr);
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
- gHaPhysics->Add(peff);
-
- // Add handler for prestart event 125.
- THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
- gHaEvtHandlers->Add(ev125);
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
- // include scaler or control events.
- run->SetNscan(1);
- run->SetDataRequired(0x7);
- run->Print();
-
- // Define the analysis parameters
- TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
- analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
- // 1 = counter is # of all decode reads
- // 2 = counter is event number
- analyzer->SetEvent(event);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define DEF-file
- analyzer->SetOdefFile("DEF-files/SHMS/STACK/pstackana.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/STACK/pstackana_cuts.def"); // optional
- // File to record accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/STACK/summary_stack_%d_%d.report", RunNumber, MaxEvent)); // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template
- analyzer->PrintReport("TEMPLATES/SHMS/STACK/pstackana.template",
- Form("REPORT_OUTPUT/SHMS/STACK/replay_shms_stack_%d_%d.report", RunNumber, MaxEvent)); // optional
-
-}
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
index 5b0d9f83..4c94fb27 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
@@ -18,30 +18,24 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
-
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/AERO/paero_ptrig.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Set up the equipment to be analyzed.
THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
@@ -75,7 +69,9 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -90,14 +86,14 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def"); // optional
-
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def"); // optional
+
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
index 752365a3..eda761b3 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
@@ -18,30 +18,25 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
-
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/CAL/pcal_ptrig.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
-
+
// Set up the equipment to be analyzed.
THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
gHaApps->Add(SHMS);
@@ -49,6 +44,13 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcShower* cal = new THcShower("cal", "Calorimeter");
SHMS->AddDetector(cal);
+ // Add trigger apparatus
+ THaApparatus* TRG = new THcTrigApp("T", "TRG");
+ gHaApps->Add(TRG);
+ // Add trigger detector to trigger apparatus
+ THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
+ TRG->AddDetector(shms);
+
// Add handler for prestart event 125.
THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
gHaEvtHandlers->Add(ev125);
@@ -67,7 +69,9 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -82,14 +86,14 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
index aeb16591..d5998878 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
@@ -18,29 +18,23 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
-
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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 the trigger apparatus
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
- //gHcDetectorMap->Load(gHcParms->GetString("g_decode_map_filename"));
gHcDetectorMap->Load("MAPS/SHMS/DETEC/DC/pdc_ptrig.map");
// Set up the equipment to be analyzed.
@@ -60,7 +54,6 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
gHaEvtHandlers->Add(ev125);
-
// Set up the analyzer - we use the standard one,
// but this could be an experiment-specific one as well.
// The Analyzer controls the reading of the data, executes
@@ -75,7 +68,9 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -90,14 +85,14 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/DC/pdcana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def"); // optional
-
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/DC/pdcana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def"); // optional
+
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
index fbbc1864..5975b401 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
@@ -18,26 +18,21 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
-
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map");
@@ -74,7 +69,9 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -89,14 +86,14 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
index 42a20f19..7a76dbb7 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
@@ -18,29 +18,25 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/HODO/phodo_ptrig.map");
- gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
-
+
// Set up the equipment to be analyzed.
THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
gHaApps->Add(SHMS);
@@ -73,7 +69,9 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -88,14 +86,14 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
index ce1cab5f..f0faec8e 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
@@ -18,26 +18,21 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
-
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
+
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map");
@@ -74,7 +69,9 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -89,14 +86,14 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
index bbae4b17..9053e478 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
@@ -18,25 +18,20 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Create file name patterns.
const char* RunFileNamePattern = "shms_all_%05d.dat";
vector<TString> pathList;
- pathList.push_back(".");
- pathList.push_back("./raw");
- pathList.push_back("./raw/../raw.copiedtotape");
- pathList.push_back("./cache");
+ pathList.push_back(".");
+ pathList.push_back("./raw");
+ pathList.push_back("./raw/../raw.copiedtotape");
+ pathList.push_back("./cache");
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/SHMS/STD/standard.database");
-
- // Load varibles from files to global list.
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/standard.database");
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 test stand configuration
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
gHcParms->Load("PARAM/TRIG/tshms.param");
+ gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
@@ -67,7 +62,9 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Define the run(s) that we want to analyze.
// We just set up one, but this could be many.
- THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) );
+ // Set to read in Hall C run database parameters
+ run->SetRunParamClass("THcRunParameters");
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
@@ -82,14 +79,14 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
- analyzer->SetEvent(event);
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def"); // optional
+ analyzer->SetEvent(event);
+ analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def"); // optional
- // File to record cuts accounting information
- //analyzer->SetSummaryFile("summary_example.log"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
// Start the actual analysis.
analyzer->Process(run);
diff --git a/TEMPLATES/DETEC/dcana.template b/TEMPLATES/DETEC/dcana.template
deleted file mode 100644
index c8bf3424..00000000
--- a/TEMPLATES/DETEC/dcana.template
+++ /dev/null
@@ -1,49 +0,0 @@
- Standalone drift chamber analysis report template
-
-hmsDC1Planes6 {hmsDC1Planes6hits.npassed}
-hmsDC2Planes6 {hmsDC2Planes6hits.npassed}
-
-hmsDC1x1Planes5 {hmsDC1_5hits_x1.npassed} {hmsDC1Planes6hits.npassed/hmsDC1_5hits_x1.npassed}
-hmsDC1y1Planes5 {hmsDC1_5hits_y1.npassed} {hmsDC1Planes6hits.npassed/hmsDC1_5hits_y1.npassed}
-hmsDC1u1Planes5 {hmsDC1_5hits_u1.npassed} {hmsDC1Planes6hits.npassed/hmsDC1_5hits_u1.npassed}
-hmsDC1v1Planes5 {hmsDC1_5hits_v1.npassed} {hmsDC1Planes6hits.npassed/hmsDC1_5hits_v1.npassed}
-hmsDC1x2Planes5 {hmsDC1_5hits_y2.npassed} {hmsDC1Planes6hits.npassed/hmsDC1_5hits_y2.npassed}
-hmsDC1y2Planes5 {hmsDC1_5hits_x2.npassed} {hmsDC1Planes6hits.npassed/hmsDC1_5hits_x2.npassed}
-
-hmsDC2x1Planes5 {hmsDC2_5hits_x1.npassed} {hmsDC2Planes6hits.npassed/hmsDC2_5hits_x1.npassed}
-hmsDC2y1Planes5 {hmsDC2_5hits_y1.npassed} {hmsDC2Planes6hits.npassed/hmsDC2_5hits_y1.npassed}
-hmsDC2u1Planes5 {hmsDC2_5hits_u1.npassed} {hmsDC2Planes6hits.npassed/hmsDC2_5hits_u1.npassed}
-hmsDC2v1Planes5 {hmsDC2_5hits_v1.npassed} {hmsDC2Planes6hits.npassed/hmsDC2_5hits_v1.npassed}
-hmsDC2x2Planes5 {hmsDC2_5hits_y2.npassed} {hmsDC2Planes6hits.npassed/hmsDC2_5hits_y2.npassed}
-hmsDC2y2Planes5 {hmsDC2_5hits_x2.npassed} {hmsDC2Planes6hits.npassed/hmsDC2_5hits_x2.npassed}
-
-
-*****************************
-*HMS TRACKING EFFICIENCIES *
-*****************************
-htrig : {hmscoin_event.npassed}
-hhitslt = passed hits/cham : {hmsHitsLt.npassed}
-hhitsplanes = +planes >= 5/6 : {hmsHitsPlanes.npassed}
-hhitsplanessps = + sps : {hSpacePoints.npassed}
-hhitsplanesspsstubs +stub : {hSpacePointsStub.npassed}
-hsfoundtrack : {hFoundTrack.npassed}
-hscleantrack : {hCleanTrack.npassed}
-hstublt = passed stub tests : {hStubLT.npassed}
-h1hitslt : {hms1HitsLt.npassed}
-h2hitslt : {hms2HitsLt.npassed}
-h1planesgt : {hmsDC1PlanesGT.npassed}
-h2planesgt : {hmsDC2PlanesGT.npassed}
-hplanesgt = gt 5 planes/cham : {hmsPlanseGT.npassed}
-f1hspacepoints : {f1HSpacePoints.npassed}
-f2hspacepoints : {f2HSpacePoints.npassed}
-htest1=p hits/planes, f sp : {hTest1.npassed}
-htest2=p sp, f stubs : {hTest2.npassed}
-hdid : {HMSScinDid.npassed}
-hdide : {HMSScinDide.npassed}
-hdidh : {HMSScinDidh.npassed}
-hscinshould : {HMSScinShould.npassed}
-hscinshoulde : {HMSScinShoulde.npassed}
-hscinshouldh : {HMSScinShouldh.npassed}
-SING FID TRACK EFFIC : {HMSScinDid.npassed/(HMSScinShould.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShould.npassed-HMSScinDid.npassed)/(HMSScinShould.npassed+.0001)):%8.4f}
-E SING FID TRACK EFFIC : {HMSScinDide.npassed/(HMSScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShoulde.npassed-HMSScinDide.npassed)/(HMSScinShoulde.npassed+.0001)):%8.4f}
-HADRON SING FID TRACK EFFIC : {HMSScinDidh.npassed/(HMSScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShouldh.npassed-HMSScinDidh.npassed)/(HMSScinShouldh.npassed+.0001)):%8.4f}
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production_kpp.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production_kpp.template
deleted file mode 100644
index e7e40f42..00000000
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production_kpp.template
+++ /dev/null
@@ -1,484 +0,0 @@
-Run #{gen_run_number}
-
-**************************
-* General Run Information
-**************************
-
-1 MhZ Pulses : {H.1Mhz.scaler}
-Run Length : {H.1Mhz.scalerTime:%.3f} sec
-
-***********
-* Beamline
-***********
-
-BCM1 Current: {H.BCM1.scalerCurrent:%.3f} uA
-BCM2 Current: {H.BCM2.scalerCurrent:%.3f} uA
-Unser Current: {H.Unser.scalerCurrent:%.3f} uA
-
-With no cuts on BCM{gBCM_Current_threshold_index+1}.
-BCM1 Counts: {H.BCM1.scaler} Total Charge: {H.BCM1.scalerCharge:%.3f} uC
-BCM2 Counts: {H.BCM2.scaler} Total Charge: {H.BCM2.scalerCharge:%.3f} uC
-Unser Counts: {H.Unser.scaler} Total Charge: {H.Unser.scalerCharge:%.3f} uC
-
-Cut on BCM{gBCM_Current_threshold_index+1} current of {gBCM_Current_threshold} uA. Beam over threshold for {H.1Mhz.scalerTimeCut:%.3f}s, or {((H.1Mhz.scalerTimeCut/H.1Mhz.scalerTime)*100.):%.3f}% of total run time.
-BCM1 Counts: {H.BCM1.scalerCut} Total Charge: {H.BCM1.scalerChargeCut:%.3f} uC
-BCM2 Counts: {H.BCM2.scalerCut} Total Charge: {H.BCM2.scalerChargeCut:%.3f} uC
-Unser Counts: {H.Unser.scalerCut} Total Charge: {H.Unser.scalerChargeCut:%.3f} uC
-
-{hdc_plane_names}
-Horizontal drift chamber z positions:
-Chamber 1: {hdc_zpos[0]:%6.2f} {hdc_zpos[1]:%6.2f} {hdc_zpos[2]:%6.2f}
- {hdc_zpos[3]:%6.2f} {hdc_zpos[4]:%6.2f} {hdc_zpos[5]:%6.2f}
-Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
- {hdc_zpos[9]:%6.2f} {hdc_zpos[10]:%6.2f} {hdc_zpos[11]:%6.2f}
-
-Rate : {H.Trig.scalerRate/1000.:%7.3f} kHz
-Live Time : {(hms_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
-Dead Time : {100.0 - (hms_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
-
-hmsDC1Planes_large Counts:{hmsDC1Planes_large.npassed} /hms_trigs : {hmsDC1Planes_large.npassed/hms_trigs.npassed}
-hmsDC2Planes_large Counts:{hmsDC2Planes_large.npassed} /hms_trigs : {hmsDC2Planes_large.npassed/hms_trigs.npassed}
-
-hmsDC1Planes6 Counts: {hmsDC1Planes6hits.npassed} /hms_trigs : {hmsDC1Planes6hits.npassed/hms_trigs.npassed}
-hmsDC2Planes6 Counts: {hmsDC2Planes6hits.npassed} /hms_trigs : {hmsDC2Planes6hits.npassed/hms_trigs.npassed}
-
-hmsDC1x1Planes5 Counts: {hmsDC1_5hits_x1.npassed} eff : {hmsDC1_6hits_x1.npassed/hmsDC1_5hits_x1.npassed}
-hmsDC1u1Planes5 Counts: {hmsDC1_5hits_u1.npassed} eff : {hmsDC1_6hits_u1.npassed/hmsDC1_5hits_u1.npassed}
-hmsDC1y2Planes5 Counts: {hmsDC1_5hits_y2.npassed} eff : {hmsDC1_6hits_y2.npassed/hmsDC1_5hits_y2.npassed}
-hmsDC1v1Planes5 Counts: {hmsDC1_5hits_v1.npassed} eff : {hmsDC1_6hits_v1.npassed/hmsDC1_5hits_v1.npassed}
-hmsDC1y1Planes5 Counts: {hmsDC1_5hits_y1.npassed} eff : {hmsDC1_6hits_y1.npassed/hmsDC1_5hits_y1.npassed}
-hmsDC1x2Planes5 Counts: {hmsDC1_5hits_x2.npassed} eff : {hmsDC1_6hits_x2.npassed/hmsDC1_5hits_x2.npassed}
-
-hmsDC2x1Planes5 Counts: {hmsDC2_5hits_x1.npassed} eff : {hmsDC2_6hits_x1.npassed/hmsDC2_5hits_x1.npassed}
-hmsDC2u1Planes5 Counts: {hmsDC2_5hits_u1.npassed} eff : {hmsDC2_6hits_u1.npassed/hmsDC2_5hits_u1.npassed}
-hmsDC2y2Planes5 Counts: {hmsDC2_5hits_y2.npassed} eff : {hmsDC2_6hits_y2.npassed/hmsDC2_5hits_y2.npassed}
-hmsDC2v1Planes5 Counts: {hmsDC2_5hits_v1.npassed} eff : {hmsDC2_6hits_v1.npassed/hmsDC2_5hits_v1.npassed}
-hmsDC2y1Planes5 Counts: {hmsDC2_5hits_y1.npassed} eff : {hmsDC2_6hits_y1.npassed/hmsDC2_5hits_y1.npassed}
-hmsDC2x2Planes5 Counts: {hmsDC2_5hits_x2.npassed} eff : {hmsDC2_6hits_x2.npassed/hmsDC2_5hits_x2.npassed}
-
-*****************************
-*HMS TRACKING EFFICIENCIES *
-*****************************
-htrig : {hms_trigs.npassed}
-hhitslt = passed hits/cham : {hmsHitsLt.npassed}
-hhitsplanes = +planes >= 5/6 : {hmsHitsPlanes.npassed}
-hhitsplanessps = + sps : {hSpacePoints.npassed}
-hhitsplanesspsstubs +stub : {hSpacePointsStub.npassed}
-hsfoundtrack : {hFoundTrack.npassed}
-hscleantrack : {hCleanTrack.npassed}
-hstublt = passed stub tests : {hStubLT.npassed}
-h1hitslt : {hms1HitsLt.npassed}
-h2hitslt : {hms2HitsLt.npassed}
-h1planesgt : {hmsDC1PlanesGT.npassed}
-h2planesgt : {hmsDC2PlanesGT.npassed}
-hplanesgt = gt 5 planes/cham : {hmsPlanesGT.npassed}
-f1hspacepoints : {f1HSpacePoints.npassed}
-f2hspacepoints : {f2HSpacePoints.npassed}
-htest1=p hits/planes, f sp : {hTest1.npassed}
-htest2=p sp, f stubs : {hTest2.npassed}
-hdid : {HMSScinDid.npassed}
-hdide : {HMSScinDide.npassed}
-hdidh : {HMSScinDidh.npassed}
-hscinshould : {HMSScinShould.npassed}
-hscinshoulde : {HMSScinShoulde.npassed}
-hscinshouldh : {HMSScinShouldh.npassed}
-SING FID TRACK EFFIC : {HMSScinDid.npassed/(HMSScinShould.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShould.npassed-HMSScinDid.npassed)/(HMSScinShould.npassed+.0001)):%8.4f}
-E SING FID TRACK EFFIC : {HMSScinDide.npassed/(HMSScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShoulde.npassed-HMSScinDide.npassed)/(HMSScinShoulde.npassed+.0001)):%8.4f}
-HADRON SING FID TRACK EFFIC : {HMSScinDidh.npassed/(HMSScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShouldh.npassed-HMSScinDidh.npassed)/(HMSScinShouldh.npassed+.0001)):%8.4f}
-
-
-*******************
-* Hardware Scalers
-*******************
-
-*HODOSCOPES*
-Scint Counts Rate
-H1X1+: {H.hod.1x1.posScaler:%8d} [ {H.hod.1x1.posScalerRate:%7.1f} ]
-H1X2+: {H.hod.1x2.posScaler:%8d} [ {H.hod.1x2.posScalerRate:%7.1f} ]
-H1X3+: {H.hod.1x3.posScaler:%8d} [ {H.hod.1x3.posScalerRate:%7.1f} ]
-H1X4+: {H.hod.1x4.posScaler:%8d} [ {H.hod.1x4.posScalerRate:%7.1f} ]
-H1X5+: {H.hod.1x5.posScaler:%8d} [ {H.hod.1x5.posScalerRate:%7.1f} ]
-H1X6+: {H.hod.1x6.posScaler:%8d} [ {H.hod.1x6.posScalerRate:%7.1f} ]
-H1X7+: {H.hod.1x7.posScaler:%8d} [ {H.hod.1x7.posScalerRate:%7.1f} ]
-H1X8+: {H.hod.1x8.posScaler:%8d} [ {H.hod.1x8.posScalerRate:%7.1f} ]
-H1X9+: {H.hod.1x9.posScaler:%8d} [ {H.hod.1x9.posScalerRate:%7.1f} ]
-H1X10+: {H.hod.1x10.posScaler:%8d} [ {H.hod.1x10.posScalerRate:%7.1f} ]
-H1X11+: {H.hod.1x11.posScaler:%8d} [ {H.hod.1x11.posScalerRate:%7.1f} ]
-H1X12+: {H.hod.1x12.posScaler:%8d} [ {H.hod.1x12.posScalerRate:%7.1f} ]
-H1X13+: {H.hod.1x13.posScaler:%8d} [ {H.hod.1x13.posScalerRate:%7.1f} ]
-H1X14+: {H.hod.1x14.posScaler:%8d} [ {H.hod.1x14.posScalerRate:%7.1f} ]
-H1X15+: {H.hod.1x15.posScaler:%8d} [ {H.hod.1x15.posScalerRate:%7.1f} ]
-H1X16+: {H.hod.1x16.posScaler:%8d} [ {H.hod.1x16.posScalerRate:%7.1f} ]
-
-H1X1-: {H.hod.1x1.negScaler:%8d} [ {H.hod.1x1.negScalerRate:%7.1f} ]
-H1X2-: {H.hod.1x2.negScaler:%8d} [ {H.hod.1x2.negScalerRate:%7.1f} ]
-H1X3-: {H.hod.1x3.negScaler:%8d} [ {H.hod.1x3.negScalerRate:%7.1f} ]
-H1X4-: {H.hod.1x4.negScaler:%8d} [ {H.hod.1x4.negScalerRate:%7.1f} ]
-H1X5-: {H.hod.1x5.negScaler:%8d} [ {H.hod.1x5.negScalerRate:%7.1f} ]
-H1X6-: {H.hod.1x6.negScaler:%8d} [ {H.hod.1x6.negScalerRate:%7.1f} ]
-H1X7-: {H.hod.1x7.negScaler:%8d} [ {H.hod.1x7.negScalerRate:%7.1f} ]
-H1X8-: {H.hod.1x8.negScaler:%8d} [ {H.hod.1x8.negScalerRate:%7.1f} ]
-H1X9-: {H.hod.1x9.negScaler:%8d} [ {H.hod.1x9.negScalerRate:%7.1f} ]
-H1X10-: {H.hod.1x10.negScaler:%8d} [ {H.hod.1x10.negScalerRate:%7.1f} ]
-H1X11-: {H.hod.1x11.negScaler:%8d} [ {H.hod.1x11.negScalerRate:%7.1f} ]
-H1X12-: {H.hod.1x12.negScaler:%8d} [ {H.hod.1x12.negScalerRate:%7.1f} ]
-H1X13-: {H.hod.1x13.negScaler:%8d} [ {H.hod.1x13.negScalerRate:%7.1f} ]
-H1X14-: {H.hod.1x14.negScaler:%8d} [ {H.hod.1x14.negScalerRate:%7.1f} ]
-H1X15-: {H.hod.1x15.negScaler:%8d} [ {H.hod.1x15.negScalerRate:%7.1f} ]
-H1X16-: {H.hod.1x16.negScaler:%8d} [ {H.hod.1x16.negScalerRate:%7.1f} ]
-
-H1Y1+: {H.hod.1y1.posScaler:%8d} [ {H.hod.1y1.posScalerRate:%7.1f} ]
-H1Y2+: {H.hod.1y2.posScaler:%8d} [ {H.hod.1y2.posScalerRate:%7.1f} ]
-H1Y3+: {H.hod.1y3.posScaler:%8d} [ {H.hod.1y3.posScalerRate:%7.1f} ]
-H1Y4+: {H.hod.1y4.posScaler:%8d} [ {H.hod.1y4.posScalerRate:%7.1f} ]
-H1Y5+: {H.hod.1y5.posScaler:%8d} [ {H.hod.1y5.posScalerRate:%7.1f} ]
-H1Y6+: {H.hod.1y6.posScaler:%8d} [ {H.hod.1y6.posScalerRate:%7.1f} ]
-H1Y7+: {H.hod.1y7.posScaler:%8d} [ {H.hod.1y7.posScalerRate:%7.1f} ]
-H1Y8+: {H.hod.1y8.posScaler:%8d} [ {H.hod.1y8.posScalerRate:%7.1f} ]
-H1Y9+: {H.hod.1y9.posScaler:%8d} [ {H.hod.1y9.posScalerRate:%7.1f} ]
-H1Y10+: {H.hod.1y10.posScaler:%8d} [ {H.hod.1y10.posScalerRate:%7.1f} ]
-
-H1Y1-: {H.hod.1y1.negScaler:%8d} [ {H.hod.1y1.negScalerRate:%7.1f} ]
-H1Y2-: {H.hod.1y2.negScaler:%8d} [ {H.hod.1y2.negScalerRate:%7.1f} ]
-H1Y3-: {H.hod.1y3.negScaler:%8d} [ {H.hod.1y3.negScalerRate:%7.1f} ]
-H1Y4-: {H.hod.1y4.negScaler:%8d} [ {H.hod.1y4.negScalerRate:%7.1f} ]
-H1Y5-: {H.hod.1y5.negScaler:%8d} [ {H.hod.1y5.negScalerRate:%7.1f} ]
-H1Y6-: {H.hod.1y6.negScaler:%8d} [ {H.hod.1y6.negScalerRate:%7.1f} ]
-H1Y7-: {H.hod.1y7.negScaler:%8d} [ {H.hod.1y7.negScalerRate:%7.1f} ]
-H1Y8-: {H.hod.1y8.negScaler:%8d} [ {H.hod.1y8.negScalerRate:%7.1f} ]
-H1Y9-: {H.hod.1y9.negScaler:%8d} [ {H.hod.1y9.negScalerRate:%7.1f} ]
-H1Y10-: {H.hod.1y10.negScaler:%8d} [ {H.hod.1y10.negScalerRate:%7.1f} ]
-
-H2X1+: {H.hod.2x1.posScaler:%8d} [ {H.hod.2x1.posScalerRate:%7.1f} ]
-H2X2+: {H.hod.2x2.posScaler:%8d} [ {H.hod.2x2.posScalerRate:%7.1f} ]
-H2X3+: {H.hod.2x3.posScaler:%8d} [ {H.hod.2x3.posScalerRate:%7.1f} ]
-H2X4+: {H.hod.2x4.posScaler:%8d} [ {H.hod.2x4.posScalerRate:%7.1f} ]
-H2X5+: {H.hod.2x5.posScaler:%8d} [ {H.hod.2x5.posScalerRate:%7.1f} ]
-H2X6+: {H.hod.2x6.posScaler:%8d} [ {H.hod.2x6.posScalerRate:%7.1f} ]
-H2X7+: {H.hod.2x7.posScaler:%8d} [ {H.hod.2x7.posScalerRate:%7.1f} ]
-H2X8+: {H.hod.2x8.posScaler:%8d} [ {H.hod.2x8.posScalerRate:%7.1f} ]
-H2X9+: {H.hod.2x9.posScaler:%8d} [ {H.hod.2x9.posScalerRate:%7.1f} ]
-H2X10+: {H.hod.2x10.posScaler:%8d} [ {H.hod.2x10.posScalerRate:%7.1f} ]
-H2X11+: {H.hod.2x11.posScaler:%8d} [ {H.hod.2x11.posScalerRate:%7.1f} ]
-H2X12+: {H.hod.2x12.posScaler:%8d} [ {H.hod.2x12.posScalerRate:%7.1f} ]
-H2X13+: {H.hod.2x13.posScaler:%8d} [ {H.hod.2x13.posScalerRate:%7.1f} ]
-H2X14+: {H.hod.2x14.posScaler:%8d} [ {H.hod.2x14.posScalerRate:%7.1f} ]
-H2X15+: {H.hod.2x15.posScaler:%8d} [ {H.hod.2x15.posScalerRate:%7.1f} ]
-H2X16+: {H.hod.2x16.posScaler:%8d} [ {H.hod.2x16.posScalerRate:%7.1f} ]
-
-H2X1-: {H.hod.2x1.negScaler:%8d} [ {H.hod.2x1.negScalerRate:%7.1f} ]
-H2X2-: {H.hod.2x2.negScaler:%8d} [ {H.hod.2x2.negScalerRate:%7.1f} ]
-H2X3-: {H.hod.2x3.negScaler:%8d} [ {H.hod.2x3.negScalerRate:%7.1f} ]
-H2X4-: {H.hod.2x4.negScaler:%8d} [ {H.hod.2x4.negScalerRate:%7.1f} ]
-H2X5-: {H.hod.2x5.negScaler:%8d} [ {H.hod.2x5.negScalerRate:%7.1f} ]
-H2X6-: {H.hod.2x6.negScaler:%8d} [ {H.hod.2x6.negScalerRate:%7.1f} ]
-H2X7-: {H.hod.2x7.negScaler:%8d} [ {H.hod.2x7.negScalerRate:%7.1f} ]
-H2X8-: {H.hod.2x8.negScaler:%8d} [ {H.hod.2x8.negScalerRate:%7.1f} ]
-H2X9-: {H.hod.2x9.negScaler:%8d} [ {H.hod.2x9.negScalerRate:%7.1f} ]
-H2X10-: {H.hod.2x10.negScaler:%8d} [ {H.hod.2x10.negScalerRate:%7.1f} ]
-H2X11-: {H.hod.2x11.negScaler:%8d} [ {H.hod.2x11.negScalerRate:%7.1f} ]
-H2X12-: {H.hod.2x12.negScaler:%8d} [ {H.hod.2x12.negScalerRate:%7.1f} ]
-H2X13-: {H.hod.2x13.negScaler:%8d} [ {H.hod.2x13.negScalerRate:%7.1f} ]
-H2X14-: {H.hod.2x14.negScaler:%8d} [ {H.hod.2x14.negScalerRate:%7.1f} ]
-H2X15-: {H.hod.2x15.negScaler:%8d} [ {H.hod.2x15.negScalerRate:%7.1f} ]
-H2X16-: {H.hod.2x16.negScaler:%8d} [ {H.hod.2x16.negScalerRate:%7.1f} ]
-
-H2Y1+: {H.hod.2y1.posScaler:%8d} [ {H.hod.2y1.posScalerRate:%7.1f} ]
-H2Y2+: {H.hod.2y2.posScaler:%8d} [ {H.hod.2y2.posScalerRate:%7.1f} ]
-H2Y3+: {H.hod.2y3.posScaler:%8d} [ {H.hod.2y3.posScalerRate:%7.1f} ]
-H2Y4+: {H.hod.2y4.posScaler:%8d} [ {H.hod.2y4.posScalerRate:%7.1f} ]
-H2Y5+: {H.hod.2y5.posScaler:%8d} [ {H.hod.2y5.posScalerRate:%7.1f} ]
-H2Y6+: {H.hod.2y6.posScaler:%8d} [ {H.hod.2y6.posScalerRate:%7.1f} ]
-H2Y7+: {H.hod.2y7.posScaler:%8d} [ {H.hod.2y7.posScalerRate:%7.1f} ]
-H2Y8+: {H.hod.2y8.posScaler:%8d} [ {H.hod.2y8.posScalerRate:%7.1f} ]
-H2Y9+: {H.hod.2y9.posScaler:%8d} [ {H.hod.2y9.posScalerRate:%7.1f} ]
-H2Y10+: {H.hod.2y10.posScaler:%8d} [ {H.hod.2y10.posScalerRate:%7.1f} ]
-
-H2Y1-: {H.hod.2y1.negScaler:%8d} [ {H.hod.2y1.negScalerRate:%7.1f} ]
-H2Y2-: {H.hod.2y2.negScaler:%8d} [ {H.hod.2y2.negScalerRate:%7.1f} ]
-H2Y3-: {H.hod.2y3.negScaler:%8d} [ {H.hod.2y3.negScalerRate:%7.1f} ]
-H2Y4-: {H.hod.2y4.negScaler:%8d} [ {H.hod.2y4.negScalerRate:%7.1f} ]
-H2Y5-: {H.hod.2y5.negScaler:%8d} [ {H.hod.2y5.negScalerRate:%7.1f} ]
-H2Y6-: {H.hod.2y6.negScaler:%8d} [ {H.hod.2y6.negScalerRate:%7.1f} ]
-H2Y7-: {H.hod.2y7.negScaler:%8d} [ {H.hod.2y7.negScalerRate:%7.1f} ]
-H2Y8-: {H.hod.2y8.negScaler:%8d} [ {H.hod.2y8.negScalerRate:%7.1f} ]
-H2Y9-: {H.hod.2y9.negScaler:%8d} [ {H.hod.2y9.negScalerRate:%7.1f} ]
-H2Y10-: {H.hod.2y10.negScaler:%8d} [ {H.hod.2y10.negScalerRate:%7.1f} ]
-
-H1X: {H.S1X.scaler:%8d} [ {H.S1X.scalerRate:%7.1f} ] AND between + and - sides of H1X
-H1Y: {H.S1Y.scaler:%8d} [ {H.S1Y.scalerRate:%7.1f} ] AND between + and - sides of H1Y
-H2X: {H.S2X.scaler:%8d} [ {H.S2X.scalerRate:%7.1f} ] AND between + and - sides of H2X
-H2Y: {H.S2Y.scaler:%8d} [ {H.S2Y.scalerRate:%7.1f} ] AND between + and - sides of H2Y
-H1XH1Y: {H.S1XS1Y.scaler:%8d} [{H.S1XS1Y.scalerRate:%7.1f}] AND between H1X and H1Y planes
-H2XH2Y: {H.S2XS2Y.scaler:%8d} [{H.S2XS2Y.scalerRate:%7.1f}] AND between H2X and H2Y planes
-
-*Cerenkov*
-CERSUM: {H.CERSUM.scaler:%8d} [{H.CERSUM.scalerRate:%8d}]
-
-*Calorimeter*
-PRESHOWERLO: {H.PSHWRLO.scaler:%8d} [{H.PSHWRLO.scalerRate:%8d}]
-PRESHOWERHI: {H.PSHWRHI.scaler:%8d} [{H.PSHWRHI.scalerRate:%8d}]
-SHWR: {H.SHWR.scaler:%8d} [{H.SHWR.scalerRate:%8d}]
-ASUM: {H.ASUM.scaler:%8d} [{H.ASUM.scalerRate:%8d}]
-BSUM: {H.BSUM.scaler:%8d} [{H.BSUM.scalerRate:%8d}]
-CSUM: {H.CSUM.scaler:%8d} [{H.CSUM.scalerRate:%8d}]
-DSUM: {H.DSUM.scaler:%8d} [{H.DSUM.scalerRate:%8d}]
-
-
-**********************************************************************************************************************************
-**DRIFTCHAMBER**
-I'm pretty sure that these are the "raw" number of counts. "Raw" means one or more hits per dc plane.
-hmsDC1_1hit_x1: {hmsDC1_1hit_x1.npassed}
-hmsDC1_1hit_u1: {hmsDC1_1hit_u1.npassed}
-hmsDC1_1hit_y2: {hmsDC1_1hit_y2.npassed}
-hmsDC1_1hit_v1: {hmsDC1_1hit_v1.npassed}
-hmsDC1_1hit_y2: {hmsDC1_1hit_y2.npassed}
-hmsDC1_1hit_x2: {hmsDC1_1hit_x2.npassed}
-
-hmsDC2_1hit_x1: {hmsDC2_1hit_x1.npassed}
-hmsDC2_1hit_u1: {hmsDC2_1hit_u1.npassed}
-hmsDC2_1hit_y2: {hmsDC2_1hit_y2.npassed}
-hmsDC2_1hit_v1: {hmsDC2_1hit_v1.npassed}
-hmsDC2_1hit_y2: {hmsDC2_1hit_y2.npassed}
-hmsDC2_1hit_x2: {hmsDC2_1hit_x2.npassed}
-
-"Good" means one or two hits per dc plane.
-goodHDC1x1: {goodHDC1x1.npassed} eff : {goodHDC1x1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1y2: {goodHDC1y2.npassed} eff : {goodHDC1y2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1y1: {goodHDC1y1.npassed} eff : {goodHDC1y1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2y2: {goodHDC2y2.npassed} eff : {goodHDC2y2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2y1: {goodHDC2y1.npassed} eff : {goodHDC2y1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-bothgood: {bothGood.npassed} eff : {bothGood.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-realhdc1x1: {realhdc1x1.npassed}
-realhdc1y2: {realhdc1y2.npassed}
-realhdc1u1: {realhdc1u1.npassed}
-realhdc1v1: {realhdc1v1.npassed}
-realhdc1y1: {realhdc1y1.npassed}
-realhdc1x2: {realhdc1x2.npassed}
-
-realhdc2x1: {realhdc2x1.npassed}
-realhdc2y2: {realhdc2y2.npassed}
-realhdc2u1: {realhdc2u1.npassed}
-realhdc2v1: {realhdc2v1.npassed}
-realhdc2y1: {realhdc2y1.npassed}
-realhdc2x2: {realhdc2x2.npassed}
-
-**HODOSCOPE**
-"Any" means one or more hits per scint plane.
-anyhs1x: {anyhs1x.npassed} eff: {anyhs1x.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-anyhs1y: {anyhs1y.npassed} eff: {anyhs1y.npassed/(hms_trigs.npassed+.0001):%5.3f}
-anyhs2x: {anyhs2x.npassed} eff: {anyhs2x.npassed/(hms_trigs.npassed+.0001):%5.3f}
-anyhs2y: {anyhs2y.npassed} eff: {anyhs2y.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-"Good" means one or two hits per scint plane.
-goodhs1x : {goodhs1x.npassed} eff: {goodhs1x.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-goodhs1y: {goodhs1y.npassed} eff: {goodhs1y.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs1: {goodhs1.npassed} eff: {goodhs1.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs2x: {goodhs2x.npassed} eff: {goodhs2x.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs2y: {goodhs2y.npassed} eff: {goodhs2y.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs2: {goodhs2.npassed} eff: {goodhs2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-goodhs1s2: {goodhs1s2.npassed} eff: {goodhs1s2.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-hFoundTrack: {hFoundTrack.npassed} eff: {hFoundTrack.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-hFound1Track: {hFound1Track.npassed} eff: {hFound1Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-hFound2Track: {hFound2Track.npassed} eff: {hFound2Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-hFound3Track: {hFound3Track.npassed} eff: {hFound3Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-hFound4Track: {hFound4Track.npassed} eff: {hFound4Track.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-hCleanTrack: {hCleanTrack.npassed} eff: {hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f} BAD = ??
-1hCleanTrack: {1hCleanTrack.npassed} eff: {1hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
-2hCleanTrack: {2hCleanTrack.npassed} eff: {2hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
-3hCleanTrack: {3hCleanTrack.npassed} eff: {3hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
-4hCleanTrack: {4hCleanTrack.npassed} eff: {4hCleanTrack.npassed/(hms_trigs.npassed+.0001):%5.3f}
-
-**CHERENKOVS AND CAL**
-cer_pmt1_elec: {cer_pmt1_elec.npassed}
-cer_pmt2_elect: {cer_pmt2_elec.npassed}
-cer_elec: {cer_elec.npassed}
-cer_pi: {cer_pi.npassed}
-
-
-************
-* HGC Cerenkov *
-************
-
-Good Track Requirements:
- 1. Only one track found in the focal plane
- 2. chisq/dof < {hcer_red_chi2_max:%5.1f}
- 3. {hcer_beta_min:%5.3f} < beta < {hcer_beta_max:%5.3f}
- 4. {hcer_enorm_min:%5.3f} < calorimeter energy < {hcer_enorm_max:%5.3f}
-Threshold set at {hcer_npe_thresh:%4.1f}
-*HGC EFF* 2PMTs
-HMS Region 1 efficiency: {HMS_hcer_track_fired_region_1.npassed/HMS_hcer_track_matched_region_1.npassed} = {HMS_hcer_track_fired_region_1.npassed} of {HMS_hcer_track_matched_region_1.npassed} good tracks.
-HMS Region 2 efficiency: {HMS_hcer_track_fired_region_2.npassed/HMS_hcer_track_matched_region_2.npassed} = {HMS_hcer_track_fired_region_2.npassed} of {HMS_hcer_track_matched_region_2.npassed} good tracks.
-Overall HGC Efficiency: {HMS_hcer_track_fired_tot.npassed/HMS_hcer_track_matched_tot.npassed} = {HMS_hcer_track_fired_tot.npassed} of {HMS_hcer_track_matched_tot.npassed} good tracks.
-
-****************************
-* Calorimeter Efficiencies *
-****************************
-Efficiencies for calorimeter is the fraction of times block was hit when track
-with chisquared/dof < {hstat_cal_maxchisq:%5.1f} came within {hstat_cal_slop:%4.1f} cm of the center.
-and scal_npe_sum > 3.0 (hardwired). (is this still true?)
-
-Events examined = strig = {hms_trigs.npassed}
-Tracks found = scleantrack = {hCleanTrack.npassed}
-//Tracks passing chisquared cut = {hstat_cal_numevents:%7d} (in previous template, do we need this here?)
-
-hmsPreShower Counts: {H.cal.stat_trksum1} eff : {H.cal.stat_hitsum1 / H.cal.stat_trksum1}
-hmsShowerArray Counts: {H.cal.stat_trksum_array} eff : {H.cal.stat_hitsum_array / H.cal.stat_trksum_array}
-
-**************************
-* Hodoscope Efficiencies *
-**************************
-Efficiencies for hodoscopes is the fraction of times scin. was hit when track
-with chisquared/dof < {hstat_maxchisq:%5.1f} came within {hstat_slop:%4.1f} cm of the center.
-
-Events examined = strig = {hms_trigs.npassed}
-Tracks found = scleantrack = {hCleanTrack.npassed}
-//Tracks passing chisquared cut = {hstat_numevents} (in previous template, do we still need this?)
-
-Hodo efficiency:
-Plane 1: {hhodo_plane_AND_eff[0]}
-Plane 2: {hhodo_plane_AND_eff[1]}
-Plane 3: {hhodo_plane_AND_eff[2]}
-Plane 4: {hhodo_plane_AND_eff[3]}
-
-S1XY : {hhodo_s1XY_eff}
-S2XY : {hhodo_s2XY_eff}
-
-STOF: {hhodo_stof_eff}
-
-3_of_4 EFF : {hhodo_3_of_4_eff}
-4_of_4 EFF : {hhodo_4_of_4_eff}
-
-
-*HODO EFF* Need to checkout hodoeff module.
-Scint Pos eff Neg eff OR eff AND eff Hits
------------------------------------------------------------------------------------------------------
-H1X1+
-H1X2+
-H1X3+
-H1X4+
-H1X5+
-H1X6+
-H1X7+
-H1X8+
-H1X9+
-H1X10+
-H1X11+
-H1X12+
-H1X13+
-H1X14+
-H1X15+
-H1X16+
-
-H1X1-
-H1X2-
-H1X3-
-H1X4-
-H1X5-
-H1X6-
-H1X7-
-H1X8-
-H1X9-
-H1X10-
-H1X11-
-H1X12-
-H1X13-
-H1X14-
-H1X15-
-H1X16-
-
-H1Y1+
-H1Y2+
-H1Y3+
-H1Y4+
-H1Y5+
-H1Y6+
-H1Y7+
-H1Y8+
-H1Y9+
-H1Y10+
-
-H1Y1-
-H1Y2-
-H1Y3-
-H1Y4-
-H1Y5-
-H1Y6-
-H1Y7-
-H1Y8-
-H1Y9-
-H1Y10-
-
-H2X1+
-H2X2+
-H2X3+
-H2X4+
-H2X5+
-H2X6+
-H2X7+
-H2X8+
-H2X9+
-H2X10+
-H2X11+
-H2X12+
-H2X13+
-H2X14+
-H2X15+
-H2X16+
-
-H2X1-
-H2X2-
-H2X3-
-H2X4-
-H2X5-
-H2X6-
-H2X7-
-H2X8-
-H2X9-
-H2X10-
-H2X11-
-H2X12-
-H2X13-
-H2X14-
-H2X15-
-H2X16-
-
-H2Y1+
-H2Y2+
-H2Y3+
-H2Y4+
-H2Y5+
-H2Y6+
-H2Y7+
-H2Y8+
-H2Y9+
-H2Y10+
-
-H2Y1-
-H2Y2-
-H2Y3-
-H2Y4-
-H2Y5-
-H2Y6-
-H2Y7-
-H2Y8-
-H2Y9-
-H2Y10-
-
-
-
-
diff --git a/TEMPLATES/HMS/STACK/hstackana.template b/TEMPLATES/HMS/STACK/hstackana.template
deleted file mode 100644
index bfc4c17e..00000000
--- a/TEMPLATES/HMS/STACK/hstackana.template
+++ /dev/null
@@ -1,177 +0,0 @@
-Run #{gen_run_number}
-
-{hdc_plane_names}
-Horizontal drift chamber z positions:
-Chamber 1: {hdc_zpos[0]:%6.2f} {hdc_zpos[1]:%6.2f} {hdc_zpos[2]:%6.2f}
- {hdc_zpos[3]:%6.2f} {hdc_zpos[4]:%6.2f} {hdc_zpos[5]:%6.2f}
-Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
- {hdc_zpos[9]:%6.2f} {hdc_zpos[10]:%6.2f} {hdc_zpos[11]:%6.2f}
-
-HMS triggers: {hms_trigs.npassed}
-
-hmsDC1Planes_large Counts: {hmsDC1Planes_large.npassed} /hms_trigs : {hmsDC1Planes_large.npassed/hms_trigs.npassed}
-hmsDC2Planes_large Counts: {hmsDC2Planes_large.npassed} /hms_trigs : {hmsDC2Planes_large.npassed/hms_trigs.npassed}
-
-hmsDC1Planes6 Counts: {hmsDC1Planes6hits.npassed} /hms_trigs : {hmsDC1Planes6hits.npassed/hms_trigs.npassed}
-hmsDC2Planes6 Counts: {hmsDC2Planes6hits.npassed} /hms_trigs : {hmsDC2Planes6hits.npassed/hms_trigs.npassed}
-
-hmsDC1x1Planes5 Counts: {hmsDC1_5hits_x1.npassed} eff : {hmsDC1_6hits_x1.npassed/hmsDC1_5hits_x1.npassed}
-hmsDC1u1Planes5 Counts: {hmsDC1_5hits_u1.npassed} eff : {hmsDC1_6hits_u1.npassed/hmsDC1_5hits_u1.npassed}
-hmsDC1u2Planes5 Counts: {hmsDC1_5hits_u2.npassed} eff : {hmsDC1_6hits_u2.npassed/hmsDC1_5hits_u2.npassed}
-hmsDC1v1Planes5 Counts: {hmsDC1_5hits_v1.npassed} eff : {hmsDC1_6hits_v1.npassed/hmsDC1_5hits_v1.npassed}
-hmsDC1v2Planes5 Counts: {hmsDC1_5hits_v2.npassed} eff : {hmsDC1_6hits_v2.npassed/hmsDC1_5hits_v2.npassed}
-hmsDC1x2Planes5 Counts: {hmsDC1_5hits_x2.npassed} eff : {hmsDC1_6hits_x2.npassed/hmsDC1_5hits_x2.npassed}
-
-
-hmsDC2x1Planes5 Counts: {hmsDC2_5hits_x1.npassed} eff : {hmsDC2_6hits_x1.npassed/hmsDC2_5hits_x1.npassed}
-hmsDC2u1Planes5 Counts: {hmsDC2_5hits_u1.npassed} eff : {hmsDC2_6hits_u1.npassed/hmsDC2_5hits_u1.npassed}
-hmsDC2u2Planes5 Counts: {hmsDC2_5hits_u2.npassed} eff : {hmsDC2_6hits_u2.npassed/hmsDC2_5hits_u2.npassed}
-hmsDC2v1Planes5 Counts: {hmsDC2_5hits_v1.npassed} eff : {hmsDC2_6hits_v1.npassed/hmsDC2_5hits_v1.npassed}
-hmsDC2v2Planes5 Counts: {hmsDC2_5hits_v2.npassed} eff : {hmsDC2_6hits_v2.npassed/hmsDC2_5hits_v2.npassed}
-hmsDC2x2Planes5 Counts: {hmsDC2_5hits_x2.npassed} eff : {hmsDC2_6hits_x2.npassed/hmsDC2_5hits_x2.npassed}
-
-*****************************
-*HMS TRACKING EFFICIENCIES *
-*****************************
-htrig : {hms_trigs.npassed}
-hhitslt = passed hits/cham : {hmsHitsLt.npassed}
-hhitsplanes = +planes >= 5/6 : {hmsHitsPlanes.npassed}
-hhitsplanessps = + sps : {hSpacePoints.npassed}
-hhitsplanesspsstubs +stub : {hSpacePointsStub.npassed}
-hsfoundtrack : {hFoundTrack.npassed}
-hscleantrack : {hCleanTrack.npassed}
-hstublt = passed stub tests : {hStubLT.npassed}
-h1hitslt : {hms1HitsLt.npassed}
-h2hitslt : {hms2HitsLt.npassed}
-h1planesgt : {hmsDC1PlanesGT.npassed}
-h2planesgt : {hmsDC2PlanesGT.npassed}
-hplanesgt = gt 5 planes/cham : {hmsPlanesGT.npassed}
-f1hspacepoints : {f1HSpacePoints.npassed}
-f2hspacepoints : {f2HSpacePoints.npassed}
-htest1=p hits/planes, f sp : {hTest1.npassed}
-htest2=p sp, f stubs : {hTest2.npassed}
-hdid : {HMSScinDid.npassed}
-hdide : {HMSScinDide.npassed}
-hdidh : {HMSScinDidh.npassed}
-hscinshould : {HMSScinShould.npassed}
-hscinshoulde : {HMSScinShoulde.npassed}
-hscinshouldh : {HMSScinShouldh.npassed}
-SING FID TRACK EFFIC : {HMSScinDid.npassed/(HMSScinShould.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShould.npassed-HMSScinDid.npassed)/(HMSScinShould.npassed+.0001)):%8.4f}
-E SING FID TRACK EFFIC : {HMSScinDide.npassed/(HMSScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShoulde.npassed-HMSScinDide.npassed)/(HMSScinShoulde.npassed+.0001)):%8.4f}
-HADRON SING FID TRACK EFFIC : {HMSScinDidh.npassed/(HMSScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShouldh.npassed-HMSScinDidh.npassed)/(HMSScinShouldh.npassed+.0001)):%8.4f}
-
-************
-* HGC Cerenkov *
-****************
-
-Good Track Requirements:
- 1. Only one track found in the focal plane
- 2. chisq/dof < {hcer_red_chi2_max:%5.1f}
- 3. {hcer_beta_min:%5.3f} < beta < {hcer_beta_max:%5.3f}
- 4. {hcer_enorm_min:%5.3f} < calorimeter energy < {hcer_enorm_max:%5.3f}
-Threshold set at {hcer_npe_thresh:%4.1f}
-*HGC EFF* 2PMTs
-HMS Region 1 efficiency: {HMS_hcer_track_fired_region_1.npassed/HMS_hcer_track_matched_region_1.npassed} = {HMS_hcer_track_fired_region_1.npassed} of {HMS_hcer_track_matched_region_1.npassed} good tracks.
-HMS Region 2 efficiency: {HMS_hcer_track_fired_region_2.npassed/HMS_hcer_track_matched_region_2.npassed} = {HMS_hcer_track_fired_region_2.npassed} of {HMS_hcer_track_matched_region_2.npassed} good tracks.
-Overall HGC Efficiency: {HMS_hcer_track_fired_tot.npassed/HMS_hcer_track_matched_tot.npassed} = {HMS_hcer_track_fired_tot.npassed} of {HMS_hcer_track_matched_tot.npassed} good tracks.
-
-****************************
-* Calorimeter Efficiencies *
-****************************
-Efficiencies for calorimeter is the fraction of times block was hit when track
-with chisquared/dof < {hstat_cal_maxchisq:%5.1f} came within {hstat_cal_slop:%4.1f} cm of the center.
-and scal_npe_sum > 3.0 (hardwired). (is this still true?)
-
-Events examined = strig = {hms_trigs.npassed}
-Tracks found = scleantrack = {hCleanTrack.npassed}
-Tracks passing chisquared cut = (hstat_cal_numevents:%7d) (in previous template, do we need this here?)
-
-hmsPreShower Counts: {H.cal.stat_trksum1} eff : {H.cal.stat_hitsum1 / H.cal.stat_trksum1}
-hmsShowerArray Counts: {H.cal.stat_trksum_array} eff : {H.cal.stat_hitsum_array / H.cal.stat_trksum_array}
-
-hA Counts: {H.cal.stat_trksum1} eff : {H.cal.stat_hitsum1 / H.cal.stat_trksum1}
-hB Counts: {H.cal.stat_trksum2} eff : {H.cal.stat_hitsum2 / H.cal.stat_trksum2}
-hC Counts: {H.cal.stat_trksum3} eff : {H.cal.stat_hitsum3 / H.cal.stat_trksum3}
-hD Counts: {H.cal.stat_trksum4} eff : {H.cal.stat_hitsum4 / H.cal.stat_trksum4}
-
-**************************
-* Hodoscope Efficiencies *
-**************************
-Efficiencies for hodoscopes is the fraction of times scin. was hit when track
-with chisquared/dof < {hstat_maxchisq:%5.1f} came within {hstat_slop:%4.1f} cm of the center.
-
-Events examined = strig = {hms_trigs.npassed}
-Tracks found = scleantrack = {hCleanTrack.npassed}
-//Tracks passing chisquared cut = (stat_numevents) (in previous template, do we still need this?)
-
-Plane 1: {hhodo_plane_AND_eff[0]}
-Plane 2: {hhodo_plane_AND_eff[1]}
-Plane 3: {hhodo_plane_AND_eff[2]}
-Plane 4: {hhodo_plane_AND_eff[3]}
-
-S1XY : {hhodo_s1XY_eff}
-S2XY : {hhodo_s2XY_eff}
-
-STOF: {hhodo_stof_eff}
-
-3_of_4 EFF : {hhodo_3_of_4_eff}
-4_of_4 EFF : {hhodo_4_of_4_eff}
-
-*HODO EFF*
-Scint Pos eff Neg eff OR eff AND eff Hits
------------------------------------------------------------------------------------------------------------
-H1X1 {hhodo_pos_eff[0]} {hhodo_neg_eff[0]} {hhodo_or_eff[0]} {hhodo_and_eff[0]} {hhodo_gold_hits[0]}
-H1X2 {hhodo_pos_eff[4]} {hhodo_neg_eff[4]} {hhodo_or_eff[4]} {hhodo_and_eff[4]} {hhodo_gold_hits[4]}
-H1X3 {hhodo_pos_eff[8]} {hhodo_neg_eff[8]} {hhodo_or_eff[8]} {hhodo_and_eff[8]} {hhodo_gold_hits[8]}
-H1X4 {hhodo_pos_eff[12]} {hhodo_neg_eff[12]} {hhodo_or_eff[12]} {hhodo_and_eff[12]} {hhodo_gold_hits[12]}
-H1X5 {hhodo_pos_eff[16]} {hhodo_neg_eff[16]} {hhodo_or_eff[16]} {hhodo_and_eff[16]} {hhodo_gold_hits[16]}
-H1X6 {hhodo_pos_eff[20]} {hhodo_neg_eff[20]} {hhodo_or_eff[20]} {hhodo_and_eff[20]} {hhodo_gold_hits[20]}
-H1X7 {hhodo_pos_eff[24]} {hhodo_neg_eff[24]} {hhodo_or_eff[24]} {hhodo_and_eff[24]} {hhodo_gold_hits[24]}
-H1X8 {hhodo_pos_eff[28]} {hhodo_neg_eff[28]} {hhodo_or_eff[28]} {hhodo_and_eff[28]} {hhodo_gold_hits[28]}
-H1X9 {hhodo_pos_eff[32]} {hhodo_neg_eff[32]} {hhodo_or_eff[32]} {hhodo_and_eff[32]} {hhodo_gold_hits[32]}
-H1X10 {hhodo_pos_eff[36]} {hhodo_neg_eff[36]} {hhodo_or_eff[36]} {hhodo_and_eff[36]} {hhodo_gold_hits[36]}
-H1X11 {hhodo_pos_eff[40]} {hhodo_neg_eff[40]} {hhodo_or_eff[40]} {hhodo_and_eff[40]} {hhodo_gold_hits[40]}
-H1X12 {hhodo_pos_eff[44]} {hhodo_neg_eff[44]} {hhodo_or_eff[44]} {hhodo_and_eff[44]} {hhodo_gold_hits[44]}
-H1X13 {hhodo_pos_eff[48]} {hhodo_neg_eff[48]} {hhodo_or_eff[48]} {hhodo_and_eff[48]} {hhodo_gold_hits[48]}
-H1X14 {hhodo_pos_eff[52]} {hhodo_neg_eff[52]} {hhodo_or_eff[52]} {hhodo_and_eff[52]} {hhodo_gold_hits[52]}
-H1X15 {hhodo_pos_eff[56]} {hhodo_neg_eff[56]} {hhodo_or_eff[56]} {hhodo_and_eff[56]} {hhodo_gold_hits[56]}
-H1X16 {hhodo_pos_eff[60]} {hhodo_neg_eff[60]} {hhodo_or_eff[60]} {hhodo_and_eff[60]} {hhodo_gold_hits[60]}
-
-H1Y1 {hhodo_pos_eff[1]} {hhodo_neg_eff[1]} {hhodo_or_eff[1]} {hhodo_and_eff[1]} {hhodo_gold_hits[1]}
-H1Y2 {hhodo_pos_eff[5]} {hhodo_neg_eff[5]} {hhodo_or_eff[5]} {hhodo_and_eff[5]} {hhodo_gold_hits[5]}
-H1Y3 {hhodo_pos_eff[9]} {hhodo_neg_eff[9]} {hhodo_or_eff[9]} {hhodo_and_eff[9]} {hhodo_gold_hits[9]}
-H1Y4 {hhodo_pos_eff[13]} {hhodo_neg_eff[13]} {hhodo_or_eff[13]} {hhodo_and_eff[13]} {hhodo_gold_hits[13]}
-H1Y5 {hhodo_pos_eff[17]} {hhodo_neg_eff[17]} {hhodo_or_eff[17]} {hhodo_and_eff[17]} {hhodo_gold_hits[17]}
-H1Y6 {hhodo_pos_eff[21]} {hhodo_neg_eff[21]} {hhodo_or_eff[21]} {hhodo_and_eff[21]} {hhodo_gold_hits[21]}
-H1Y7 {hhodo_pos_eff[25]} {hhodo_neg_eff[25]} {hhodo_or_eff[25]} {hhodo_and_eff[25]} {hhodo_gold_hits[25]}
-H1Y8 {hhodo_pos_eff[29]} {hhodo_neg_eff[29]} {hhodo_or_eff[29]} {hhodo_and_eff[29]} {hhodo_gold_hits[29]}
-H1Y9 {hhodo_pos_eff[33]} {hhodo_neg_eff[33]} {hhodo_or_eff[33]} {hhodo_and_eff[33]} {hhodo_gold_hits[33]}
-H1Y10 {hhodo_pos_eff[37]} {hhodo_neg_eff[37]} {hhodo_or_eff[37]} {hhodo_and_eff[37]} {hhodo_gold_hits[37]}
-
-H2X1 {hhodo_pos_eff[2]} {hhodo_neg_eff[2]} {hhodo_or_eff[2]} {hhodo_and_eff[2]} {hhodo_gold_hits[2]}
-H2X2 {hhodo_pos_eff[6]} {hhodo_neg_eff[6]} {hhodo_or_eff[6]} {hhodo_and_eff[6]} {hhodo_gold_hits[6]}
-H2X3 {hhodo_pos_eff[10]} {hhodo_neg_eff[10]} {hhodo_or_eff[10]} {hhodo_and_eff[10]} {hhodo_gold_hits[10]}
-H2X4 {hhodo_pos_eff[14]} {hhodo_neg_eff[14]} {hhodo_or_eff[14]} {hhodo_and_eff[14]} {hhodo_gold_hits[14]}
-H2X5 {hhodo_pos_eff[18]} {hhodo_neg_eff[18]} {hhodo_or_eff[18]} {hhodo_and_eff[18]} {hhodo_gold_hits[18]}
-H2X6 {hhodo_pos_eff[22]} {hhodo_neg_eff[22]} {hhodo_or_eff[22]} {hhodo_and_eff[22]} {hhodo_gold_hits[22]}
-H2X7 {hhodo_pos_eff[26]} {hhodo_neg_eff[26]} {hhodo_or_eff[26]} {hhodo_and_eff[26]} {hhodo_gold_hits[26]}
-H2X8 {hhodo_pos_eff[30]} {hhodo_neg_eff[30]} {hhodo_or_eff[30]} {hhodo_and_eff[30]} {hhodo_gold_hits[30]}
-H2X9 {hhodo_pos_eff[34]} {hhodo_neg_eff[34]} {hhodo_or_eff[34]} {hhodo_and_eff[34]} {hhodo_gold_hits[34]}
-H2X10 {hhodo_pos_eff[38]} {hhodo_neg_eff[38]} {hhodo_or_eff[38]} {hhodo_and_eff[38]} {hhodo_gold_hits[38]}
-H2X11 {hhodo_pos_eff[42]} {hhodo_neg_eff[42]} {hhodo_or_eff[42]} {hhodo_and_eff[42]} {hhodo_gold_hits[42]}
-H2X12 {hhodo_pos_eff[46]} {hhodo_neg_eff[46]} {hhodo_or_eff[46]} {hhodo_and_eff[46]} {hhodo_gold_hits[46]}
-H2X13 {hhodo_pos_eff[50]} {hhodo_neg_eff[50]} {hhodo_or_eff[50]} {hhodo_and_eff[50]} {hhodo_gold_hits[50]}
-H2X14 {hhodo_pos_eff[54]} {hhodo_neg_eff[54]} {hhodo_or_eff[54]} {hhodo_and_eff[54]} {hhodo_gold_hits[54]}
-H2X15 {hhodo_pos_eff[58]} {hhodo_neg_eff[58]} {hhodo_or_eff[58]} {hhodo_and_eff[58]} {hhodo_gold_hits[58]}
-H2X16 {hhodo_pos_eff[62]} {hhodo_neg_eff[62]} {hhodo_or_eff[62]} {hhodo_and_eff[62]} {hhodo_gold_hits[62]}
-
-H2Y1 {hhodo_pos_eff[3]} {hhodo_neg_eff[3]} {hhodo_or_eff[3]} {hhodo_and_eff[3]} {hhodo_gold_hits[3]}
-H2Y2 {hhodo_pos_eff[7]} {hhodo_neg_eff[7]} {hhodo_or_eff[7]} {hhodo_and_eff[7]} {hhodo_gold_hits[7]}
-H2Y3 {hhodo_pos_eff[11]} {hhodo_neg_eff[11]} {hhodo_or_eff[11]} {hhodo_and_eff[11]} {hhodo_gold_hits[11]}
-H2Y4 {hhodo_pos_eff[15]} {hhodo_neg_eff[15]} {hhodo_or_eff[15]} {hhodo_and_eff[15]} {hhodo_gold_hits[15]}
-H2Y5 {hhodo_pos_eff[19]} {hhodo_neg_eff[19]} {hhodo_or_eff[19]} {hhodo_and_eff[19]} {hhodo_gold_hits[19]}
-H2Y6 {hhodo_pos_eff[23]} {hhodo_neg_eff[23]} {hhodo_or_eff[23]} {hhodo_and_eff[23]} {hhodo_gold_hits[23]}
-H2Y7 {hhodo_pos_eff[27]} {hhodo_neg_eff[27]} {hhodo_or_eff[27]} {hhodo_and_eff[27]} {hhodo_gold_hits[27]}
-H2Y8 {hhodo_pos_eff[31]} {hhodo_neg_eff[31]} {hhodo_or_eff[31]} {hhodo_and_eff[31]} {hhodo_gold_hits[31]}
-H2Y9 {hhodo_pos_eff[35]} {hhodo_neg_eff[35]} {hhodo_or_eff[35]} {hhodo_and_eff[35]} {hhodo_gold_hits[35]}
-H2Y10 {hhodo_pos_eff[39]} {hhodo_neg_eff[39]} {hhodo_or_eff[39]} {hhodo_and_eff[39]} {hhodo_gold_hits[39]}
diff --git a/TEMPLATES/HMS/STACK/hstackana_6gev.template b/TEMPLATES/HMS/STACK/hstackana_6gev.template
deleted file mode 100644
index 0b54523f..00000000
--- a/TEMPLATES/HMS/STACK/hstackana_6gev.template
+++ /dev/null
@@ -1,68 +0,0 @@
-Run #{gen_run_number}
-
-{hdc_plane_names}
-Horizontal drift chamber z positions:
-Chamber 1: {hdc_zpos[0]:%6.2f} {hdc_zpos[1]:%6.2f} {hdc_zpos[2]:%6.2f}
- {hdc_zpos[3]:%6.2f} {hdc_zpos[4]:%6.2f} {hdc_zpos[5]:%6.2f}
-Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
- {hdc_zpos[9]:%6.2f} {hdc_zpos[10]:%6.2f} {hdc_zpos[11]:%6.2f}
-
-HMS triggers: {hms_trigs.npassed}
-
-hmsDC1Planes_large Counts: {hmsDC1Planes_large.npassed} /hms_trigs : {hmsDC1Planes_large.npassed/hms_trigs.npassed}
-hmsDC2Planes_large Counts: {hmsDC2Planes_large.npassed} /hms_trigs : {hmsDC2Planes_large.npassed/hms_trigs.npassed}
-
-hmsDC1Planes6 Counts: {hmsDC1Planes6hits.npassed} /hms_trigs : {hmsDC1Planes6hits.npassed/hms_trigs.npassed}
-hmsDC2Planes6 Counts: {hmsDC2Planes6hits.npassed} /hms_trigs : {hmsDC2Planes6hits.npassed/hms_trigs.npassed}
-
-hmsDC1x1Planes5 Counts: {hmsDC1_5hits_x1.npassed} eff : {hmsDC1_6hits_x1.npassed/hmsDC1_5hits_x1.npassed}
-hmsDC1u1Planes5 Counts: {hmsDC1_5hits_u1.npassed} eff : {hmsDC1_6hits_u1.npassed/hmsDC1_5hits_u1.npassed}
-hmsDC1y2Planes5 Counts: {hmsDC1_5hits_y2.npassed} eff : {hmsDC1_6hits_y2.npassed/hmsDC1_5hits_y2.npassed}
-hmsDC1v1Planes5 Counts: {hmsDC1_5hits_v1.npassed} eff : {hmsDC1_6hits_v1.npassed/hmsDC1_5hits_v1.npassed}
-hmsDC1y1Planes5 Counts: {hmsDC1_5hits_y1.npassed} eff : {hmsDC1_6hits_y1.npassed/hmsDC1_5hits_y1.npassed}
-hmsDC1x2Planes5 Counts: {hmsDC1_5hits_x2.npassed} eff : {hmsDC1_6hits_x2.npassed/hmsDC1_5hits_x2.npassed}
-
-
-hmsDC2x1Planes5 Counts: {hmsDC2_5hits_x1.npassed} eff : {hmsDC2_6hits_x1.npassed/hmsDC2_5hits_x1.npassed}
-hmsDC2u1Planes5 Counts: {hmsDC2_5hits_u1.npassed} eff : {hmsDC2_6hits_u1.npassed/hmsDC2_5hits_u1.npassed}
-hmsDC2y2Planes5 Counts: {hmsDC2_5hits_y2.npassed} eff : {hmsDC2_6hits_y2.npassed/hmsDC2_5hits_y2.npassed}
-hmsDC2v1Planes5 Counts: {hmsDC2_5hits_v1.npassed} eff : {hmsDC2_6hits_v1.npassed/hmsDC2_5hits_v1.npassed}
-hmsDC2y1Planes5 Counts: {hmsDC2_5hits_y1.npassed} eff : {hmsDC2_6hits_y1.npassed/hmsDC2_5hits_y1.npassed}
-hmsDC2x2Planes5 Counts: {hmsDC2_5hits_x2.npassed} eff : {hmsDC2_6hits_x2.npassed/hmsDC2_5hits_x2.npassed}
-
-HMS Calorimeter Efficiencies
-
-hA Counts: {H.cal.stat_trksum1} eff : {H.cal.stat_hitsum1 / H.cal.stat_trksum1}
-hB Counts: {H.cal.stat_trksum2} eff : {H.cal.stat_hitsum2 / H.cal.stat_trksum2}
-hC Counts: {H.cal.stat_trksum3} eff : {H.cal.stat_hitsum3 / H.cal.stat_trksum3}
-hD Counts: {H.cal.stat_trksum4} eff : {H.cal.stat_hitsum4 / H.cal.stat_trksum4}
-
-*****************************
-*HMS TRACKING EFFICIENCIES *
-*****************************
-htrig : {hmscoin_event.npassed}
-hhitslt = passed hits/cham : {hmsHitsLt.npassed}
-hhitsplanes = +planes >= 5/6 : {hmsHitsPlanes.npassed}
-hhitsplanessps = + sps : {hSpacePoints.npassed}
-hhitsplanesspsstubs +stub : {hSpacePointsStub.npassed}
-hsfoundtrack : {hFoundTrack.npassed}
-hscleantrack : {hCleanTrack.npassed}
-hstublt = passed stub tests : {hStubLT.npassed}
-h1hitslt : {hms1HitsLt.npassed}
-h2hitslt : {hms2HitsLt.npassed}
-h1planesgt : {hmsDC1PlanesGT.npassed}
-h2planesgt : {hmsDC2PlanesGT.npassed}
-hplanesgt = gt 5 planes/cham : {hmsPlanesGT.npassed}
-f1hspacepoints : {f1HSpacePoints.npassed}
-f2hspacepoints : {f2HSpacePoints.npassed}
-htest1=p hits/planes, f sp : {hTest1.npassed}
-htest2=p sp, f stubs : {hTest2.npassed}
-hdid : {HMSScinDid.npassed}
-hdide : {HMSScinDide.npassed}
-hdidh : {HMSScinDidh.npassed}
-hscinshould : {HMSScinShould.npassed}
-hscinshoulde : {HMSScinShoulde.npassed}
-hscinshouldh : {HMSScinShouldh.npassed}
-SING FID TRACK EFFIC : {HMSScinDid.npassed/(HMSScinShould.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShould.npassed-HMSScinDid.npassed)/(HMSScinShould.npassed+.0001)):%8.4f}
-E SING FID TRACK EFFIC : {HMSScinDide.npassed/(HMSScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShoulde.npassed-HMSScinDide.npassed)/(HMSScinShoulde.npassed+.0001)):%8.4f}
-HADRON SING FID TRACK EFFIC : {HMSScinDidh.npassed/(HMSScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(HMSScinShouldh.npassed-HMSScinDidh.npassed)/(HMSScinShouldh.npassed+.0001)):%8.4f}
diff --git a/TEMPLATES/SHMS/STACK/pstackana.template b/TEMPLATES/SHMS/STACK/pstackana.template
deleted file mode 100644
index d1be61bc..00000000
--- a/TEMPLATES/SHMS/STACK/pstackana.template
+++ /dev/null
@@ -1,328 +0,0 @@
-Run #{gen_run_number}
-
-SHMS triggers : {shms_trigs.npassed}
-
-good_S1_time Counts: {good_S1_time.npassed} / shms_trigs : {good_S1_time.npassed / shms_trigs.npassed}
-good_S2X_time Counts: {good_S2X_time.npassed} / shms_trigs : {good_S2X_time.npassed / shms_trigs.npassed}
-good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / shms_trigs : {good_S1_S2X_time.npassed / shms_trigs.npassed}
-
-Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} / shms_trigs : {shms_ch1_gt0.npassed / shms_trigs.npassed}
-Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} / shms_trigs : { shms_ch2_gt0.npassed / shms_trigs.npassed}
-Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1.npassed} / shms_trigs : { shms_ch2_gt0_noch1.npassed / shms_trigs.npassed}
-Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2.npassed} / shms_trigs : {shms_ch1_gt0_noch2.npassed / shms_trigs.npassed}
-Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2.npassed} / shms_trigs : {shms_noch1_noch2.npassed / shms_trigs.npassed}
-Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0.npassed} / shms_trigs : { shms_ch_gt0.npassed / shms_trigs.npassed}
-Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track.npassed} / shms_trigs : { shms_ch_gt0_track.npassed / shms_trigs.npassed}
-Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4.npassed} / shms_trigs : { shms_ch_gt4.npassed / shms_trigs.npassed}
-Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track.npassed} / shms_trigs : { shms_ch_gt4_track.npassed / shms_trigs.npassed}
-
-Add cut on good_S1_S2X_time
-
-Chamber 1 hits > 0 Counts: {shms_ch1_gt0_gtime.npassed} / shms_trigs : {shms_ch1_gt0_gtime.npassed / shms_trigs.npassed}
-Chamber 2 hits > 0 Counts: {shms_ch2_gt0_gtime.npassed} / shms_trigs : { shms_ch2_gt0_gtime.npassed / shms_trigs.npassed}
-Chamber 2 hits > 0 & Ch 1 hits = 0 Counts: {shms_ch2_gt0_noch1_gtime.npassed} / shms_trigs : { shms_ch2_gt0_noch1_gtime.npassed / shms_trigs.npassed}
-Chamber 1 hits > 0 & Ch 2 hits = 0 Counts: {shms_ch1_gt0_noch2_gtime.npassed} / shms_trigs : {shms_ch1_gt0_noch2_gtime.npassed / shms_trigs.npassed}
-Chamber 1 hits = 0 & Ch 2 hits = 0 Counts: {shms_noch1_noch2_gtime.npassed} / shms_trigs : {shms_noch1_noch2_gtime.npassed / shms_trigs.npassed}
-Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0_gtime.npassed} / shms_trigs : { shms_ch_gt0_gtime.npassed / shms_trigs.npassed}
-Ch 1 hits > 0 & Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track_gtime.npassed} / shms_trigs : { shms_ch_gt0_track_gtime.npassed / shms_trigs.npassed}
-Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4_gtime.npassed} / shms_trigs : { shms_ch_gt4_gtime.npassed / shms_trigs.npassed}
-Ch 1 hits > 3 & Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track_gtime.npassed} / shms_trigs : { shms_ch_gt4_track_gtime.npassed / shms_trigs.npassed}
-
-shmsDC1Planes_large Counts: {shmsDC1Planes_large.npassed} / shms_trigs : {shmsDC1Planes_large.npassed / shms_trigs.npassed}
-shmsDC2Planes_large Counts: {shmsDC2Planes_large.npassed} / shms_trigs : {shmsDC2Planes_large.npassed / shms_trigs.npassed}
-
-shmsDC1Planes6 Counts: {shmsDC1Planes6hits.npassed} / shms_trigs : {shmsDC1Planes6hits.npassed / shms_trigs.npassed}
-shmsDC2Planes6 Counts: {shmsDC2Planes6hits.npassed} / shms_trigs : {shmsDC2Planes6hits.npassed / shms_trigs.npassed}
-
-shmsDC1x1Planes5 Counts: {shmsDC1_5hits_x1.npassed} eff : {shmsDC1_6hits_x1.npassed / shmsDC1_5hits_x1.npassed}
-shmsDC1u1Planes5 Counts: {shmsDC1_5hits_u1.npassed} eff : {shmsDC1_6hits_u1.npassed / shmsDC1_5hits_u1.npassed}
-shmsDC1u2Planes5 Counts: {shmsDC1_5hits_u2.npassed} eff : {shmsDC1_6hits_u2.npassed / shmsDC1_5hits_u2.npassed}
-shmsDC1v1Planes5 Counts: {shmsDC1_5hits_v1.npassed} eff : {shmsDC1_6hits_v1.npassed / shmsDC1_5hits_v1.npassed}
-shmsDC1v2Planes5 Counts: {shmsDC1_5hits_v2.npassed} eff : {shmsDC1_6hits_v2.npassed / shmsDC1_5hits_v2.npassed}
-shmsDC1x2Planes5 Counts: {shmsDC1_5hits_x2.npassed} eff : {shmsDC1_6hits_x2.npassed / shmsDC1_5hits_x2.npassed}
-
-shmsDC2x1Planes5 Counts: {shmsDC2_5hits_x1.npassed} eff : {shmsDC2_6hits_x1.npassed / shmsDC2_5hits_x1.npassed}
-shmsDC2u1Planes5 Counts: {shmsDC2_5hits_u1.npassed} eff : {shmsDC2_6hits_u1.npassed / shmsDC2_5hits_u1.npassed}
-shmsDC2u2Planes5 Counts: {shmsDC2_5hits_u2.npassed} eff : {shmsDC2_6hits_u2.npassed / shmsDC2_5hits_u2.npassed}
-shmsDC2v1Planes5 Counts: {shmsDC2_5hits_v1.npassed} eff : {shmsDC2_6hits_v1.npassed / shmsDC2_5hits_v1.npassed}
-shmsDC2v2Planes5 Counts: {shmsDC2_5hits_v2.npassed} eff : {shmsDC2_6hits_v2.npassed / shmsDC2_5hits_v2.npassed}
-shmsDC2x2Planes5 Counts: {shmsDC2_5hits_x2.npassed} eff : {shmsDC2_6hits_x2.npassed / shmsDC2_5hits_x2.npassed}
-
-**DRIFTCHAMBER**
-I'm pretty sure that these are the "raw" number of counts. "Raw" means one or more hits per dc plane.
-shmsDC1_1hit_x1: {shmsDC1_1hit_x1.npassed}
-shmsDC1_1hit_u1: {shmsDC1_1hit_u1.npassed}
-shmsDC1_1hit_u2: {shmsDC1_1hit_u2.npassed}
-shmsDC1_1hit_v1: {shmsDC1_1hit_v1.npassed}
-shmsDC1_1hit_v2: {shmsDC1_1hit_v2.npassed}
-shmsDC1_1hit_x2: {shmsDC1_1hit_x2.npassed}
-
-shmsDC2_1hit_x1: {shmsDC2_1hit_x1.npassed}
-shmsDC2_1hit_u1: {shmsDC2_1hit_u1.npassed}
-shmsDC2_1hit_u2: {shmsDC2_1hit_u2.npassed}
-shmsDC2_1hit_v1: {shmsDC2_1hit_v1.npassed}
-shmsDC2_1hit_v2: {shmsDC2_1hit_v2.npassed}
-shmsDC2_1hit_x2: {shmsDC2_1hit_x2.npassed}
-
-"Good" means one or two hits per dc plane.
-goodHDC1x1: {goodHDC1x1.npassed} eff : {goodHDC1x1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC1u2: {goodHDC1u2.npassed} eff : {goodHDC1u2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC1v2: {goodHDC1v2.npassed} eff : {goodHDC1v2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-
-goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC2u2: {goodHDC2u2.npassed} eff : {goodHDC2u2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC2v2: {goodHDC2v2.npassed} eff : {goodHDC2v2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-
-goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-bothgood: {bothGood.npassed} eff : {bothGood.npassed/(P.pTREF3.scaler+.0001):%5.3f}
-
-realhdc1x1: {realhdc1x1.npassed}
-realhdc1u2: {realhdc1u2.npassed}
-realhdc1u1: {realhdc1u1.npassed}
-realhdc1v1: {realhdc1v1.npassed}
-realhdc1v2: {realhdc1v2.npassed}
-realhdc1x2: {realhdc1x2.npassed}
-
-realhdc2x1: {realhdc2x1.npassed}
-realhdc2u2: {realhdc2u2.npassed}
-realhdc2u1: {realhdc2u1.npassed}
-realhdc2v1: {realhdc2v1.npassed}
-realhdc2v2: {realhdc2v2.npassed}
-realhdc2x2: {realhdc2x2.npassed}
-
-**HODOSCOPE**
-"Any" means one or more hits per scint plane.
-anyhs1x: {anyhs1x.npassed} eff: {anyhs1x.npassed/(P.pTREF3.npassed+.0001):%5.3f} BAD = ??
-anyhs1y: {anyhs1y.npassed} eff: {anyhs1y.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-anyhs2x: {anyhs2x.npassed} eff: {anyhs2x.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-anyhs2y: {anyhs2y.npassed} eff: {anyhs2y.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-
-"Good" means one or two hits per scint plane.
-goodps1x: {goodps1x.npassed} eff: {goodps1x.npassed/(P.pTREF3.npassed+.0001):%5.3f} BAD = ??
-goodps1y: {goodps1y.npassed} eff: {goodps1y.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-goodps1: {goodps1.npassed} eff: {goodps1.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-goodps2x: {goodps2x.npassed} eff: {goodps2x.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-goodps2y: {goodps2y.npassed} eff: {goodps2y.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-goodps2: {goodps2.npassed} eff: {goodps2.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-goodps1s2: {goodps1s2.npassed} eff: {goodps1s2.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-
-pFoundTrack: {pFoundTrack.npassed} eff: {pFoundTrack.npassed/(P.pTREF3.npassed+.0001):%5.3f} BAD = ??
-pFound1Track: {pFound1Track.npassed} eff: {pFound1Track.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-pFound2Track: {pFound2Track.npassed} eff: {pFound2Track.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-pFound3Track: {pFound3Track.npassed} eff: {pFound3Track.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-pFound4Track: {pFound4Track.npassed} eff: {pFound4Track.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-
-pCleanTrack: {pCleanTrack.npassed} eff: {pCleanTrack.npassed/(P.pTREF3.npassed+.0001):%5.3f} BAD = ??
-1pCleanTrack: {1pCleanTrack.npassed} eff: {1pCleanTrack.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-2pCleanTrack: {2pCleanTrack.npassed} eff: {2pCleanTrack.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-3pCleanTrack: {3pCleanTrack.npassed} eff: {3pCleanTrack.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-4pCleanTrack: {4pCleanTrack.npassed} eff: {4pCleanTrack.npassed/(P.pTREF3.npassed+.0001):%5.3f}
-
-**CHERENKOVS AND CAL**
-cer_ng_elec: {cer_ng_elec.npassed}
-cer_ng_pi: {cer_ng_pi.npassed}
-cer_hg_elec: {cer_hg_elec.npassed}
-cer_hg_pi: {cer_hg_pi.npassed}
-cer_pi_both: {cer_pi_both.npassed}
-cer_elec_both: {cer_elec_both.npassed}
-cal_elec: {cal_elec.npassed}
-cal_pi: {cal_pi.npassed}
-elec_all: {elec_all.npassed}
-pi_all: {pi_all.npassed}
-
-pCleanTrack_cer_elec: {pCleanTrack_cer_elec.npassed}
-p1hit1_cer_elec: {p1hit1_cer_elec.npassed}
-pCleanTrack_cal_elec: {pCleanTrack_cal_elec.npassed}
-p1hit1_cal_elec: {p1hit1_cal_elec.npassed}
-
-******************************
-* SHMS TRACKING EFFICIENCIES *
-******************************
-ptrig : {SHMS_event.npassed}
-phitslt = passed hits/cham : {shmsHitsLt.npassed}
-phitsplanes = +planes >= 5/6 : {shmsHitsPlanes.npassed}
-phitsplanessps = + sps : {pSpacePoints.npassed}
-phitsplanesspsstubs +stub : {pSpacePointsStub.npassed}
-psfoundtrack : {pFoundTrack.npassed}
-pscleantrack : {pCleanTrack.npassed}
-pstublt = passed stub tests : {pStubLT.npassed}
-p1hitslt : {shms1HitsLt.npassed}
-p2hitslt : {shms2HitsLt.npassed}
-p1planesgt : {shmsDC1PlanesGT.npassed}
-p2planesgt : {shmsDC2PlanesGT.npassed}
-pplanesgt = gt 5 planes/cham : {shmsPlanesGT.npassed}
-f1pspacepoints : {f1PSpacePoints.npassed}
-f2pspacepoints : {f2PSpacePoints.npassed}
-ptest1=p hits/planes, f sp : {pTest1.npassed}
-ptest2=p sp, f stubs : {pTest2.npassed}
-pdid : {shmsScinDid.npassed}
-pdide : {shmsScinDide.npassed}
-pdidh : {shmsScinDidh.npassed}
-pscinshould : {shmsScinShould.npassed}
-pscinshoulde : {shmsScinShoulde.npassed}
-pscinshouldh : {shmsScinShouldh.npassed}
-SING FID TRACK EFFIC : {shmsScinDid.npassed / (shmsScinShould.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShould.npassed-shmsScinDid.npassed) / (shmsScinShould.npassed+.0001)):%8.4f}
-E SING FID TRACK EFFIC : {shmsScinDide.npassed / (shmsScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShoulde.npassed-shmsScinDide.npassed) / (shmsScinShoulde.npassed+.0001)):%8.4f}
-HADRON SING FID TRACK EFFIC : {shmsScinDidh.npassed / (shmsScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShouldh.npassed-shmsScinDidh.npassed) / (shmsScinShouldh.npassed+.0001)):%8.4f}
-
-************
-* HGC Cerenkov *
-************
-Good Track Requirements:
- 1. Only one track found in the focal plane
- 2. chisq/dof < {phgcer_red_chi2_max:%5.1f}
- 3. {phgcer_beta_min:%5.3f} < beta < {phgcer_beta_max:%5.3f}
- 4. {phgcer_enorm_min:%5.3f} < calorimeter energy < {phgcer_enorm_max:%5.3f}
-Threshold set at {phgcer_npe_thresh:%4.1f}
-*HGC EFF* 4PMTs
-SHMS HGC Region 1 efficiency: {SHMS_hgcer_track_fired_region_1.npassed/SHMS_hgcer_track_matched_region_1.npassed} = {SHMS_hgcer_track_fired_region_1.npassed} of {SHMS_hgcer_track_matched_region_1.npassed} good tracks.
-SHMS HGC Region 2 efficiency: {SHMS_hgcer_track_fired_region_2.npassed/SHMS_hgcer_track_matched_region_2.npassed} = {SHMS_hgcer_track_fired_region_2.npassed} of {SHMS_hgcer_track_matched_region_2.npassed} good tracks.
-SHMS HGC Region 3 efficiency: {SHMS_hgcer_track_fired_region_3.npassed/SHMS_hgcer_track_matched_region_3.npassed} = {SHMS_hgcer_track_fired_region_3.npassed} of {SHMS_hgcer_track_matched_region_3.npassed} good tracks.
-SHMS HGC Region 4 efficiency: {SHMS_hgcer_track_fired_region_4.npassed/SHMS_hgcer_track_matched_region_4.npassed} = {SHMS_hgcer_track_fired_region_4.npassed} of {SHMS_hgcer_track_matched_region_4.npassed} good tracks.
-Overall HGC Efficiency: {SHMS_hgcer_track_fired_tot.npassed/SHMS_hgcer_track_matched_tot.npassed} = {SHMS_hgcer_track_fired_tot.npassed} of {SHMS_hgcer_track_matched_tot.npassed} good tracks.
-
-************
-* NGC Cerenkov *
-************
-Good Track Requirements:
- 1. Only one track found in the focal plane
- 2. chisq/dof < {pngcer_red_chi2_max:%5.1f}
- 3. {pngcer_beta_min:%5.3f} < beta < {pngcer_beta_max:%5.3f}
- 4. {pngcer_enorm_min:%5.3f} < calorimeter energy < {pngcer_enorm_max:%5.3f}
-Threshold set at {pngcer_npe_thresh:%4.1f}
-*NGC EFF* 4PMTs
-SHMS NGC Region 1 efficiency: {SHMS_ngcer_track_fired_region_1.npassed/SHMS_ngcer_track_matched_region_1.npassed} = {SHMS_ngcer_track_fired_region_1.npassed} of {SHMS_ngcer_track_matched_region_1.npassed} good tracks.
-SHMS NGC Region 2 efficiency: {SHMS_ngcer_track_fired_region_2.npassed/SHMS_ngcer_track_matched_region_2.npassed} = {SHMS_ngcer_track_fired_region_2.npassed} of {SHMS_ngcer_track_matched_region_2.npassed} good tracks.
-SHMS NGC Region 3 efficiency: {SHMS_ngcer_track_fired_region_3.npassed/SHMS_ngcer_track_matched_region_3.npassed} = {SHMS_ngcer_track_fired_region_3.npassed} of {SHMS_ngcer_track_matched_region_3.npassed} good tracks.
-SHMS NGC Region 4 efficiency: {SHMS_ngcer_track_fired_region_4.npassed/SHMS_ngcer_track_matched_region_4.npassed} = {SHMS_ngcer_track_fired_region_4.npassed} of {SHMS_ngcer_track_matched_region_4.npassed} good tracks.
-Overall NGC Efficiency: {SHMS_ngcer_track_fired_tot.npassed/SHMS_ngcer_track_matched_tot.npassed} = {SHMS_ngcer_track_fired_tot.npassed} of {SHMS_ngcer_track_matched_tot.npassed} good tracks.
-
-************
-* Aerogel Cerenkov * Still need to add requirements for what constitutes a good track.
-************
-Good Track Requirements:
- 1. Only one track found in the focal plane
- 2. chisq/dof < {paero_red_chi2_max:%5.1f}
- 3. {paero_beta_min:%5.3f} < beta < {paero_beta_max:%5.3f}
- 4. {paero_enorm_min:%5.3f} < calorimeter energy < {paero_enorm_max:%5.3f}
- 5. {paero_dp_min:%5.3f} < delta p (dp) < {paero_dp_max:%5.3f} //added because paero_cuts.param has this as a cut
-*AEROGEL EFF* 7 PMT pairs
-SHMS AERO Region 1 efficiency: {SHMS_aero_track_fired_region_1.npassed/SHMS_aero_track_matched_region_1.npassed} = {SHMS_aero_track_fired_region_1.npassed} of {SHMS_aero_track_matched_region_1.npassed} good tracks.
-SHMS AERO Region 2 efficiency: {SHMS_aero_track_fired_region_2.npassed/SHMS_aero_track_matched_region_2.npassed} = {SHMS_aero_track_fired_region_2.npassed} of {SHMS_aero_track_matched_region_2.npassed} good tracks.
-SHMS AERO Region 3 efficiency: {SHMS_aero_track_fired_region_3.npassed/SHMS_aero_track_matched_region_3.npassed} = {SHMS_aero_track_fired_region_3.npassed} of {SHMS_aero_track_matched_region_3.npassed} good tracks.
-SHMS AERO Region 4 efficiency: {SHMS_aero_track_fired_region_4.npassed/SHMS_aero_track_matched_region_4.npassed} = {SHMS_aero_track_fired_region_4.npassed} of {SHMS_aero_track_matched_region_4.npassed} good tracks.
-SHMS AERO Region 5 efficiency: {SHMS_aero_track_fired_region_5.npassed/SHMS_aero_track_matched_region_5.npassed} = {SHMS_aero_track_fired_region_5.npassed} of {SHMS_aero_track_matched_region_5.npassed} good tracks.
-SHMS AERO Region 6 efficiency: {SHMS_aero_track_fired_region_6.npassed/SHMS_aero_track_matched_region_6.npassed} = {SHMS_aero_track_fired_region_6.npassed} of {SHMS_aero_track_matched_region_6.npassed} good tracks.
-SHMS AERO Region 7 efficiency: {SHMS_aero_track_fired_region_7.npassed/SHMS_aero_track_matched_region_7.npassed} = {SHMS_aero_track_fired_region_7.npassed} of {SHMS_aero_track_matched_region_7.npassed} good tracks.
-Overall AERO Efficiency: {SHMS_aero_track_fired_tot.npassed/SHMS_aero_track_matched_tot.npassed} = {SHMS_aero_track_matched_tot.npassed} of {SHMS_aero_track_matched_tot.npassed} good tracks.
-
-****************************
-* Calorimeter Efficiencies *
-****************************
-Efficiencies for calorimeter is the fraction of times block was hit when track
-with chisquared/dof < {pstat_cal_maxchisq:%5.1f} came within {pstat_cal_slop:%4.1f} cm of the center.
-and scal_npe_sum > 3.0 (hardwired). (is this still true?)
-
-Events examined = strig = {shms_trigs.npassed}
-Tracks found = scleantrack = {pCleanTrack.npassed}
-//Tracks passing chisquared cut = {pstat_cal_numevents:%7d} (in previous template, do we need this here?)
-
-shmsPreShower Counts: {P.cal.stat_trksum1} eff : {P.cal.stat_hitsum1 / P.cal.stat_trksum1}
-shmsShowerArray Counts: {P.cal.stat_trksum_array} eff : {P.cal.stat_hitsum_array / P.cal.stat_trksum_array}
-
-**************************
-* Hodoscope Efficiencies *
-**************************
-Efficiencies for hodoscopes is the fraction of times scin. was hit when track
-with chisquared/dof < {pstat_maxchisq:%5.1f} came within {pstat_slop:%4.1f} cm of the center.
-
-Events examined = strig = {shms_trigs.npassed}
-Tracks found = scleantrack = {pCleanTrack.npassed}
-//Tracks passing chisquared cut = {pstat_numevents} (in previous template, do we still need this?)
-
-Plane 1: {phodo_plane_AND_eff[0]}
-Plane 2: {phodo_plane_AND_eff[1]}
-Plane 3: {phodo_plane_AND_eff[2]}
-Plane 4: {phodo_plane_AND_eff[3]}
-
-S1XY : {phodo_s1XY_eff}
-S2XY : {phodo_s2XY_eff}
-
-STOF: {phodo_stof_eff}
-
-3_of_4 EFF : {phodo_3_of_4_eff}
-4_of_4 EFF : {phodo_4_of_4_eff}
-
-Scint Pos eff Neg eff OR eff AND eff Hits
------------------------------------------------------------------------------------------------------------
-P1X1 {phodo_pos_eff[0]} {phodo_neg_eff[0]} {phodo_or_eff[0]} {phodo_and_eff[0]} {phodo_gold_hits[0]}
-P1X2 {phodo_pos_eff[4]} {phodo_neg_eff[4]} {phodo_or_eff[4]} {phodo_and_eff[4]} {phodo_gold_hits[4]}
-P1X3 {phodo_pos_eff[8]} {phodo_neg_eff[8]} {phodo_or_eff[8]} {phodo_and_eff[8]} {phodo_gold_hits[8]}
-P1X4 {phodo_pos_eff[12]} {phodo_neg_eff[12]} {phodo_or_eff[12]} {phodo_and_eff[12]} {phodo_gold_hits[12]}
-P1X5 {phodo_pos_eff[16]} {phodo_neg_eff[16]} {phodo_or_eff[16]} {phodo_and_eff[16]} {phodo_gold_hits[16]}
-P1X6 {phodo_pos_eff[20]} {phodo_neg_eff[20]} {phodo_or_eff[20]} {phodo_and_eff[20]} {phodo_gold_hits[20]}
-P1X7 {phodo_pos_eff[24]} {phodo_neg_eff[24]} {phodo_or_eff[24]} {phodo_and_eff[24]} {phodo_gold_hits[24]}
-P1X8 {phodo_pos_eff[28]} {phodo_neg_eff[28]} {phodo_or_eff[28]} {phodo_and_eff[28]} {phodo_gold_hits[28]}
-P1X9 {phodo_pos_eff[32]} {phodo_neg_eff[32]} {phodo_or_eff[32]} {phodo_and_eff[32]} {phodo_gold_hits[32]}
-P1X10 {phodo_pos_eff[36]} {phodo_neg_eff[36]} {phodo_or_eff[36]} {phodo_and_eff[36]} {phodo_gold_hits[36]}
-P1X11 {phodo_pos_eff[40]} {phodo_neg_eff[40]} {phodo_or_eff[40]} {phodo_and_eff[40]} {phodo_gold_hits[40]}
-P1X12 {phodo_pos_eff[44]} {phodo_neg_eff[44]} {phodo_or_eff[44]} {phodo_and_eff[44]} {phodo_gold_hits[44]}
-P1X13 {phodo_pos_eff[48]} {phodo_neg_eff[48]} {phodo_or_eff[48]} {phodo_and_eff[48]} {phodo_gold_hits[48]}
-
-P1Y1 {phodo_pos_eff[1]} {phodo_neg_eff[1]} {phodo_or_eff[1]} {phodo_and_eff[1]} {phodo_gold_hits[1]}
-P1Y2 {phodo_pos_eff[5]} {phodo_neg_eff[5]} {phodo_or_eff[5]} {phodo_and_eff[5]} {phodo_gold_hits[5]}
-P1Y3 {phodo_pos_eff[9]} {phodo_neg_eff[9]} {phodo_or_eff[9]} {phodo_and_eff[9]} {phodo_gold_hits[9]}
-P1Y4 {phodo_pos_eff[13]} {phodo_neg_eff[13]} {phodo_or_eff[13]} {phodo_and_eff[13]} {phodo_gold_hits[13]}
-P1Y5 {phodo_pos_eff[17]} {phodo_neg_eff[17]} {phodo_or_eff[17]} {phodo_and_eff[17]} {phodo_gold_hits[17]}
-P1Y6 {phodo_pos_eff[21]} {phodo_neg_eff[21]} {phodo_or_eff[21]} {phodo_and_eff[21]} {phodo_gold_hits[21]}
-P1Y7 {phodo_pos_eff[25]} {phodo_neg_eff[25]} {phodo_or_eff[25]} {phodo_and_eff[25]} {phodo_gold_hits[25]}
-P1Y8 {phodo_pos_eff[29]} {phodo_neg_eff[29]} {phodo_or_eff[29]} {phodo_and_eff[29]} {phodo_gold_hits[29]}
-P1Y9 {phodo_pos_eff[33]} {phodo_neg_eff[33]} {phodo_or_eff[33]} {phodo_and_eff[33]} {phodo_gold_hits[33]}
-P1Y10 {phodo_pos_eff[37]} {phodo_neg_eff[37]} {phodo_or_eff[37]} {phodo_and_eff[37]} {phodo_gold_hits[37]}
-P1Y11 {phodo_pos_eff[41]} {phodo_neg_eff[41]} {phodo_or_eff[41]} {phodo_and_eff[41]} {phodo_gold_hits[41]}
-P1Y12 {phodo_pos_eff[45]} {phodo_neg_eff[45]} {phodo_or_eff[45]} {phodo_and_eff[45]} {phodo_gold_hits[45]}
-P1Y13 {phodo_pos_eff[49]} {phodo_neg_eff[49]} {phodo_or_eff[49]} {phodo_and_eff[49]} {phodo_gold_hits[49]}
-
-P2X1 {phodo_pos_eff[2]} {phodo_neg_eff[2]} {phodo_or_eff[2]} {phodo_and_eff[2]} {phodo_gold_hits[2]}
-P2X2 {phodo_pos_eff[6]} {phodo_neg_eff[6]} {phodo_or_eff[6]} {phodo_and_eff[6]} {phodo_gold_hits[6]}
-P2X3 {phodo_pos_eff[10]} {phodo_neg_eff[10]} {phodo_or_eff[10]} {phodo_and_eff[10]} {phodo_gold_hits[10]}
-P2X4 {phodo_pos_eff[14]} {phodo_neg_eff[14]} {phodo_or_eff[14]} {phodo_and_eff[14]} {phodo_gold_hits[14]}
-P2X5 {phodo_pos_eff[18]} {phodo_neg_eff[18]} {phodo_or_eff[18]} {phodo_and_eff[18]} {phodo_gold_hits[18]}
-P2X6 {phodo_pos_eff[22]} {phodo_neg_eff[22]} {phodo_or_eff[22]} {phodo_and_eff[22]} {phodo_gold_hits[22]}
-P2X7 {phodo_pos_eff[26]} {phodo_neg_eff[26]} {phodo_or_eff[26]} {phodo_and_eff[26]} {phodo_gold_hits[26]}
-P2X8 {phodo_pos_eff[30]} {phodo_neg_eff[30]} {phodo_or_eff[30]} {phodo_and_eff[30]} {phodo_gold_hits[30]}
-P2X9 {phodo_pos_eff[34]} {phodo_neg_eff[34]} {phodo_or_eff[34]} {phodo_and_eff[34]} {phodo_gold_hits[34]}
-P2X10 {phodo_pos_eff[38]} {phodo_neg_eff[38]} {phodo_or_eff[38]} {phodo_and_eff[38]} {phodo_gold_hits[38]}
-P2X11 {phodo_pos_eff[42]} {phodo_neg_eff[42]} {phodo_or_eff[42]} {phodo_and_eff[42]} {phodo_gold_hits[42]}
-P2X12 {phodo_pos_eff[46]} {phodo_neg_eff[46]} {phodo_or_eff[46]} {phodo_and_eff[46]} {phodo_gold_hits[46]}
-P2X13 {phodo_pos_eff[50]} {phodo_neg_eff[50]} {phodo_or_eff[50]} {phodo_and_eff[50]} {phodo_gold_hits[50]}
-P2X14 {phodo_pos_eff[54]} {phodo_neg_eff[54]} {phodo_or_eff[54]} {phodo_and_eff[54]} {phodo_gold_hits[54]}
-
-P2Y1 {phodo_pos_eff[3]} {phodo_neg_eff[3]} {phodo_or_eff[3]} {phodo_and_eff[3]} {phodo_gold_hits[3]}
-P2Y2 {phodo_pos_eff[7]} {phodo_neg_eff[7]} {phodo_or_eff[7]} {phodo_and_eff[7]} {phodo_gold_hits[7]}
-P2Y3 {phodo_pos_eff[11]} {phodo_neg_eff[11]} {phodo_or_eff[11]} {phodo_and_eff[11]} {phodo_gold_hits[11]}
-P2Y4 {phodo_pos_eff[15]} {phodo_neg_eff[15]} {phodo_or_eff[15]} {phodo_and_eff[15]} {phodo_gold_hits[15]}
-P2Y5 {phodo_pos_eff[19]} {phodo_neg_eff[19]} {phodo_or_eff[19]} {phodo_and_eff[19]} {phodo_gold_hits[19]}
-P2Y6 {phodo_pos_eff[23]} {phodo_neg_eff[23]} {phodo_or_eff[23]} {phodo_and_eff[23]} {phodo_gold_hits[23]}
-P2Y7 {phodo_pos_eff[27]} {phodo_neg_eff[27]} {phodo_or_eff[27]} {phodo_and_eff[27]} {phodo_gold_hits[27]}
-P2Y8 {phodo_pos_eff[31]} {phodo_neg_eff[31]} {phodo_or_eff[31]} {phodo_and_eff[31]} {phodo_gold_hits[31]}
-P2Y9 {phodo_pos_eff[35]} {phodo_neg_eff[35]} {phodo_or_eff[35]} {phodo_and_eff[35]} {phodo_gold_hits[35]}
-P2Y10 {phodo_pos_eff[39]} {phodo_neg_eff[39]} {phodo_or_eff[39]} {phodo_and_eff[39]} {phodo_gold_hits[39]}
-P2Y11 {phodo_pos_eff[43]} {phodo_neg_eff[43]} {phodo_or_eff[43]} {phodo_and_eff[43]} {phodo_gold_hits[43]}
-P2Y12 {phodo_pos_eff[47]} {phodo_neg_eff[47]} {phodo_or_eff[47]} {phodo_and_eff[47]} {phodo_gold_hits[47]}
-P2Y13 {phodo_pos_eff[51]} {phodo_neg_eff[51]} {phodo_or_eff[51]} {phodo_and_eff[51]} {phodo_gold_hits[51]}
-P2Y14 {phodo_pos_eff[55]} {phodo_neg_eff[55]} {phodo_or_eff[55]} {phodo_and_eff[55]} {phodo_gold_hits[55]}
-P2Y15 {phodo_pos_eff[59]} {phodo_neg_eff[59]} {phodo_or_eff[59]} {phodo_and_eff[59]} {phodo_gold_hits[59]}
-P2Y16 {phodo_pos_eff[63]} {phodo_neg_eff[63]} {phodo_or_eff[63]} {phodo_and_eff[63]} {phodo_gold_hits[63]}
-P2Y17 {phodo_pos_eff[67]} {phodo_neg_eff[67]} {phodo_or_eff[67]} {phodo_and_eff[67]} {phodo_gold_hits[67]}
-P2Y18 {phodo_pos_eff[71]} {phodo_neg_eff[71]} {phodo_or_eff[71]} {phodo_and_eff[71]} {phodo_gold_hits[71]}
-P2Y19 {phodo_pos_eff[75]} {phodo_neg_eff[75]} {phodo_or_eff[75]} {phodo_and_eff[75]} {phodo_gold_hits[75]}
-P2Y20 {phodo_pos_eff[79]} {phodo_neg_eff[79]} {phodo_or_eff[79]} {phodo_and_eff[79]} {phodo_gold_hits[79]}
-P2Y21 {phodo_pos_eff[83]} {phodo_neg_eff[83]} {phodo_or_eff[83]} {phodo_and_eff[83]} {phodo_gold_hits[83]}
\ No newline at end of file
diff --git a/SCRIPTS/COIN/MONITOR/Bean_counter.C b/UTIL-CT/Bean_counter.C
similarity index 99%
rename from SCRIPTS/COIN/MONITOR/Bean_counter.C
rename to UTIL-CT/Bean_counter.C
index 17e9dc4e..82cbe1b9 100644
--- a/SCRIPTS/COIN/MONITOR/Bean_counter.C
+++ b/UTIL-CT/Bean_counter.C
@@ -192,7 +192,7 @@ void Bean_counter(Int_t runNumber, Int_t targ){
}
else if (targ == 2)
{
- if (sqrt(pPm*pPm) < 0.4)
+ if (sqrt(pPm*pPm) < 0.6)
{
h_hdelta->Fill(hdelta);
h_hxptar->Fill(HgtrPh);
diff --git a/SCRIPTS/COIN/MONITOR/Bean_counter_carbon.C b/UTIL-CT/Bean_counter_carbon.C
similarity index 100%
rename from SCRIPTS/COIN/MONITOR/Bean_counter_carbon.C
rename to UTIL-CT/Bean_counter_carbon.C
diff --git a/SCRIPTS/COIN/MONITOR/coin_histo.C b/UTIL-CT/coin_histo.C
similarity index 100%
rename from SCRIPTS/COIN/MONITOR/coin_histo.C
rename to UTIL-CT/coin_histo.C
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor.README b/UTIL-CT/coin_monitor.README
similarity index 100%
rename from SCRIPTS/COIN/MONITOR/coin_monitor.README
rename to UTIL-CT/coin_monitor.README
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_calc.C b/UTIL-CT/coin_monitor_calc.C
similarity index 100%
rename from SCRIPTS/COIN/MONITOR/coin_monitor_calc.C
rename to UTIL-CT/coin_monitor_calc.C
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_calc_batch.sh b/UTIL-CT/coin_monitor_calc_batch.sh
similarity index 100%
rename from SCRIPTS/COIN/MONITOR/coin_monitor_calc_batch.sh
rename to UTIL-CT/coin_monitor_calc_batch.sh
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_graph.C b/UTIL-CT/coin_monitor_graph.C
similarity index 100%
rename from SCRIPTS/COIN/MONITOR/coin_monitor_graph.C
rename to UTIL-CT/coin_monitor_graph.C
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_init.C b/UTIL-CT/coin_monitor_init.C
similarity index 100%
rename from SCRIPTS/COIN/MONITOR/coin_monitor_init.C
rename to UTIL-CT/coin_monitor_init.C
diff --git a/UTIL/PEDESTAL_MON/COIN/PRODUCTION/hms_ped.C b/UTIL-OL/PED_MON/hms_coin_ped.C
similarity index 93%
rename from UTIL/PEDESTAL_MON/COIN/PRODUCTION/hms_ped.C
rename to UTIL-OL/PED_MON/hms_coin_ped.C
index d5476574..ae3fcff2 100644
--- a/UTIL/PEDESTAL_MON/COIN/PRODUCTION/hms_ped.C
+++ b/UTIL-OL/PED_MON/hms_coin_ped.C
@@ -93,7 +93,7 @@ void hms_ped(Int_t runNumber, Int_t eventNumber)
for (int i = 0; i<numHistos ; i++)
{
- if(abs(meanDiff[i])>10.0) // //The following message will appear in terminal if Pedestal mean differnce is greater than 10 Channels
+ if(abs(meanDiff[i])>2.5) // //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
{
cout<<"_____________________________________________________________________"<<endl;
cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!" << endl;
@@ -105,9 +105,9 @@ void hms_ped(Int_t runNumber, Int_t eventNumber)
cout<< "------------- FOR SHWER SUM, PRESHWER SUM AND CERENKOV SUM---------"<<endl;
cout << "NOTE----> MEAN VALUE OF PULSE PEDESTALS OF HMS GOLDEN RUN = MG-----"<<endl;
cout<< "NOTE----> MEAN FOR CURRENT RUN = M AND THEIR DIFFERNCE = MD------"<<endl;
- cout << "-----ABSOLUTE VALUE OF MD should be < 10 Channels(2.5 mV)----------"<< endl;
- cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 10 Channels----------"<<endl;
- cout << "-----------------PLEASE CONSULT WITH EXPERTS-----------------------" <<endl;
+ cout << "---------------ABSOLUTE VALUE OF MD should be < 2.5----------------"<< endl;
+ cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 2.5-----------------"<<endl;
+ cout << "-----------------PLEASE CONSULT WITH SHIFT LEADER-----------------" <<endl;
cout<<"_____________________________________________________________________"<<endl;
cout << "!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
cout << setprecision(4) << fixed <<"chan"<<" "<< channel[i] << " " <<"bar"<<" "<< bar[i]
diff --git a/UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C.Feb18 b/UTIL-OL/PED_MON/hms_ped.C
similarity index 92%
rename from UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C.Feb18
rename to UTIL-OL/PED_MON/hms_ped.C
index d1934357..42a7f9e3 100644
--- a/UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C.Feb18
+++ b/UTIL-OL/PED_MON/hms_ped.C
@@ -89,7 +89,7 @@ void hms_ped(Int_t runNumber, Int_t eventNumber)
for (int i = 0; i<numHistos ; i++)
{
- if(abs(meanDiff[i])>10.0) // //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
+ if(abs(meanDiff[i])>2.5) // //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
{
cout<<"_____________________________________________________________________"<<endl;
cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!" << endl;
@@ -101,9 +101,9 @@ void hms_ped(Int_t runNumber, Int_t eventNumber)
cout<< "------------- FOR SHWER SUM, PRESHWER SUM AND CERENKOV SUM---------"<<endl;
cout << "NOTE----> MEAN VALUE OF PULSE PEDESTALS OF HMS GOLDEN RUN = MG-----"<<endl;
cout<< "NOTE----> MEAN FOR CURRENT RUN = M AND THEIR DIFFERNCE = MD------"<<endl;
- cout << "-----ABSOLUTE VALUE OF MD should be < 10 Channels (2.5 mV)---------"<< endl;
- cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 10-----------------"<<endl;
- cout << "-----------------PLEASE CONSULT WITH EXPERTS----------------" <<endl;
+ cout << "---------------ABSOLUTE VALUE OF MD should be < 2.5----------------"<< endl;
+ cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 2.5-----------------"<<endl;
+ cout << "-----------------PLEASE CONSULT WITH SHIFT LEADER-----------------" <<endl;
cout<<"_____________________________________________________________________"<<endl;
cout << "!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
cout << setprecision(4) << fixed <<"chan"<<" "<< channel[i] << " " <<"bar"<<" "<< bar[i]
diff --git a/UTIL/PEDESTAL_MON/COIN/PRODUCTION/shms_ped.C b/UTIL-OL/PED_MON/shms_coin_ped.C
similarity index 93%
rename from UTIL/PEDESTAL_MON/COIN/PRODUCTION/shms_ped.C
rename to UTIL-OL/PED_MON/shms_coin_ped.C
index a8004775..adb5fc24 100644
--- a/UTIL/PEDESTAL_MON/COIN/PRODUCTION/shms_ped.C
+++ b/UTIL-OL/PED_MON/shms_coin_ped.C
@@ -88,7 +88,7 @@ void shms_ped(Int_t runNumber, Int_t eventNumber)
for (int i = 0; i < numHistos-2 ; i++)
{
- if(abs(meanDiff[i])>10.0) //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
+ if(abs(meanDiff[i])>2.5) //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
{
cout<<"_____________________________________________________________________"<<endl;
@@ -101,9 +101,9 @@ cout<<"_____________________________________________________________________"<<e
cout<< " FOR SHMS HEAVY GAS CERENKOV SUM, NOBEL GAS CERENKOV SUM AND SHWER SUM"<<endl;
cout << "NOTE----> MEAN VALUE OF PULSE PEDESTALS OF HMS GOLDEN RUN = MG-----"<<endl;
cout<< "NOTE----> MEAN FOR CURRENT RUN = M AND THEIR DIFFERNCE = MD------"<<endl;
- cout << "--------ABSOLUTE VALUE OF MD should be < 10 Channels (2.5 mV)-------"<< endl;
- cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 10-----------------"<<endl;
- cout << "-----------------PLEASE CONSULT WITH EXPERTS-------------------" <<endl;
+ cout << "---------------ABSOLUTE VALUE OF MD should be < 2.5----------------"<< endl;
+ cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 2.5-----------------"<<endl;
+ cout << "-----------------PLEASE CONSULT WITH SHIFT LEADER-----------------" <<endl;
cout<<"_____________________________________________________________________"<<endl;
cout << "!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
cout << setprecision(4) << fixed <<"chan"<<" "<< channel[i] << " " <<"bar"<<" "<< bar[i]
diff --git a/UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C.Feb18 b/UTIL-OL/PED_MON/shms_ped.C
similarity index 93%
rename from UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C.Feb18
rename to UTIL-OL/PED_MON/shms_ped.C
index 2242ae5d..3794c93d 100644
--- a/UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C.Feb18
+++ b/UTIL-OL/PED_MON/shms_ped.C
@@ -82,7 +82,7 @@ void shms_ped(Int_t runNumber, Int_t eventNumber)
for (int i = 0; i < numHistos-2 ; i++)
{
- if(abs(meanDiff[i])>10.0) //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
+ if(abs(meanDiff[i])>2.5) //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
{
cout<<"_____________________________________________________________________"<<endl;
@@ -95,9 +95,9 @@ cout<<"_____________________________________________________________________"<<e
cout<< " FOR SHMS HEAVY GAS CERENKOV SUM, NOBEL GAS CERENKOV SUM AND SHWER SUM"<<endl;
cout << "NOTE----> MEAN VALUE OF PULSE PEDESTALS OF HMS GOLDEN RUN = MG-----"<<endl;
cout<< "NOTE----> MEAN FOR CURRENT RUN = M AND THEIR DIFFERNCE = MD------"<<endl;
- cout << "--------ABSOLUTE VALUE OF MD should be < 10 Channels (2.5 mV)------"<< endl;
- cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 10-------------------"<<endl;
- cout << "-----------------PLEASE CONSULT WITH EXPERTS----------------------" <<endl;
+ cout << "---------------ABSOLUTE VALUE OF MD should be < 2.5----------------"<< endl;
+ cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 2.5-----------------"<<endl;
+ cout << "-----------------PLEASE CONSULT WITH SHIFT LEADER-----------------" <<endl;
cout<<"_____________________________________________________________________"<<endl;
cout << "!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
cout << setprecision(4) << fixed <<"chan"<<" "<< channel[i] << " " <<"bar"<<" "<< bar[i]
diff --git a/UTIL/REPORT_MON/HMS/readout_hms.py b/UTIL-OL/REP_MON/readout_hms.py
similarity index 85%
rename from UTIL/REPORT_MON/HMS/readout_hms.py
rename to UTIL-OL/REP_MON/readout_hms.py
index 4da38064..69095f5d 100755
--- a/UTIL/REPORT_MON/HMS/readout_hms.py
+++ b/UTIL-OL/REP_MON/readout_hms.py
@@ -2,14 +2,14 @@
import sys
runNo = sys.argv[1]
evenNo = sys.argv[2]
-filename = '../../../REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%s_%s.report'% (runNo, evenNo)
+filename = './REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%s_%s.report'% (runNo, evenNo)
f = open(filename)
fout = open('output.txt','w')
for line in f:
data = line.split(':')
- if ('Run #' in data[0])or ('3_of_4 EFF' in data[0]) or ('BCM1 Current'in data[0]) or ('BCM2 Current'in data[0]) or('BCM4a Current' in data[0]) or ('SING FID' in data[0]and 'HADRON' not in data[0])or('Plane 1' in data[0]) or('Plane 2' in data[0])or('Plane 3'in data[0])or ('Plane 4'in data[0]) or ('Pre-Scaled Ps1 HMS Computer Live Time' in data[0])or ('Pre-Scaled Ps2 HMS Computer Live Time' in data[0]) or('Pre-Scaled Ps3 HMS Computer Live Time' in data[0]):
+ if ('Run #' in data[0])or ('4_of_4 EFF' in data[0]) or ('BCM1 Current'in data[0]) or ('BCM2 Current'in data[0]) or('BCM4a Current' in data[0]) or ('SING FID' in data[0]and 'HADRON' not in data[0])or('Plane 1' in data[0]) or('Plane 2' in data[0])or('Plane 3'in data[0])or ('Plane 4'in data[0]) or ('Pre-Scaled Ps1 HMS Computer Live Time' in data[0])or ('Pre-Scaled Ps2 HMS Computer Live Time' in data[0]) or('Pre-Scaled Ps3 HMS Computer Live Time' in data[0])or('Pre-Trigger' in data[0]):
# print (data[0]+ ': '+ data[1])
diff --git a/UTIL/REPORT_MON/SHMS/readout_shms.py b/UTIL-OL/REP_MON/readout_shms.py
similarity index 85%
rename from UTIL/REPORT_MON/SHMS/readout_shms.py
rename to UTIL-OL/REP_MON/readout_shms.py
index fbbb2906..6c0e8979 100755
--- a/UTIL/REPORT_MON/SHMS/readout_shms.py
+++ b/UTIL-OL/REP_MON/readout_shms.py
@@ -5,14 +5,14 @@ evenNo = sys.argv[2]
#raw_input("Enter the run number: ")
#eveNo = $2
#raw_input("Enter the event number: ")
-filename = '../../../REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%s_%s.report'% (runNo, evenNo)
+filename = './REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%s_%s.report'% (runNo, evenNo)
f = open(filename)
fout = open('output.txt','w')
for line in f:
data = line.split(':')
- if ('Run #' in data[0])or ('3_of_4 EFF' in data[0]) or ('BCM1 Current'in data[0]) or ('BCM2 Current'in data[0]) or('BCM4a Current' in data[0]) or ('SING FID' in data[0]and 'HADRON' not in data[0])or('Plane 1' in data[0]) or('Plane 2' in data[0])or('Plane 3'in data[0])or ('Plane 4'in data[0]) or ('Pre-Scaled Ps1 SHMS Computer Live Time' in data[0])or ('Pre-Scaled Ps2 SHMS Computer Live Time' in data[0]) or('Pre-Scaled Ps3 SHMS Computer Live Time' in data[0]):
+ if ('Run #' in data[0])or ('4_of_4 EFF' in data[0]) or ('BCM1 Current'in data[0]) or ('BCM2 Current'in data[0]) or('BCM4a Current' in data[0]) or ('SING FID' in data[0]and 'HADRON' not in data[0])or('Plane 1' in data[0]) or('Plane 2' in data[0])or('Plane 3'in data[0])or ('Plane 4'in data[0]) or ('Pre-Scaled Ps1 SHMS Computer Live Time' in data[0])or ('Pre-Scaled Ps2 SHMS Computer Live Time' in data[0]) or('Pre-Scaled Ps3 SHMS Computer Live Time' in data[0])or('Pre-Trigger' in data[0]):
# print (data[0]+ ': '+ data[1])
diff --git a/UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C b/UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C
deleted file mode 100644
index 9fae1a65..00000000
--- a/UTIL/PEDESTAL_MON/HMS/PRODUCTION/hms_ped.C
+++ /dev/null
@@ -1,156 +0,0 @@
-//Read one 1D histogram from rootfile
-void hms_ped(Int_t runNumber, Int_t eventNumber)
-{
- const Int_t run = runNumber;
- const Int_t nevents = eventNumber;
- const Int_t goldRunNum = 1292;
- const Int_t numHistos = 3; //Number of histos
-
- // Define golden run in which to compare current run to
-
- TFile *f = new TFile(Form("ROOTfiles/hms_replay_production_%d_50000.root", goldRunNum));
-
-
- ofstream myfile;
- myfile.open("outHMS.txt"); //To store pedestals differences
- myfile <<"___________________________________________________________________________"<<endl;
- myfile <<"HMS PEDESTAL GOLDEN RUN NUMBER =" " "<<goldRunNum<<endl;
- myfile <<"HMS TRIGGER PPED RUN NUMBER =" " "<<run<<endl;
- myfile <<"___________________________________________________________________________"<<endl;
- myfile <<"hms_pped"<< "\t\t\t"<<"Mean_Golden"<<"\t"<<"Mean"<<"\t\t"<<"Mean_Diff"<<endl;
- myfile <<"___________________________________________________________________________"<<endl;
-
-
-
- TH1D *histG[numHistos];
- TH1D *hist[numHistos];
- Int_t channel [3]={13,12,15};//(see hallc_replay/MAPS/HMS/DETEC/TRIG/htrig.map)
- TString variables[numHistos]={"hSHWR","hPSHWR","hCER"};
- TString histos[numHistos]={"htrig_hshwr_adc_pped", "htrig_hpreShwr_adc_pped", "htrig_hcersum_adc_pped" };
-
- Int_t plane=1;
- Int_t bar [3]={6,5,8}; //variables are corresponding to these bars
-
- //For Golden
-
- double meanG[numHistos],rmsG[numHistos];
- double mean[numHistos],rms[numHistos];
- double meanDiff[numHistos],rmsDiff[numHistos];
- double eff_rms[numHistos];
-
- for (int i = 0; i<numHistos ; i++)
- {
- histG[i] = (TH1D*)gDirectory->Get(histos[i]);
- //histG[i] = (TH1D*)gDirectory->GetList()->FindObject(branches[i]);
- if (histG[i]) {
-
- meanG[i]=histG[i]->GetMean();
- rmsG[i]=histG[i]->GetRMS();
- }
- else
- {
-
- cout << "****************ATTENTION REQUIRED *****************************" << endl;
- cout << "************HMS_TRIGGER_PULSE_PEDESTALS_HAVE PROBLEMS *********" << endl;
- cout << "************PLEASE LOOK AT HMS_TRIGGER_SUM_PPED_HISTOGRAMS*****" << endl;
-
-
- }
- }
-
-
- // no golden
-
- TFile *f1= new TFile(Form("ROOTfiles/hms_replay_production_%d_%d.root",run,nevents));
-
- for (int i = 0; i<numHistos ; i++)
- {
- hist[i] = (TH1D*)gDirectory->Get(histos[i]);
- mean[i]=hist[i]->GetMean();
- rms[i]=hist[i]->GetRMS();
- }
-
- for (int i = 0; i<numHistos ; i++)
- {
- meanDiff[i]=meanG[i]-mean[i];
- eff_rms[i] = sqrt(pow(rmsG[i], 2)+pow(rms[i], 2));
- }
-
-
-
- for (int i = 0; i<numHistos ; i++)
- {
- //open this cout if we want to print values in terminal
- // cout <<channel[i]<<""<<"\t"<< bar[i]<<"\t"<<variables[i]<<"\t"<<"\t"<<meanG[i]<<"\t\t"<<mean[i]<<"\t\t"<<meanDiff[i]<<endl;
- myfile<<histos[i]<<"\t"<<"\t"<<meanG[i]<<"\t\t"<<mean[i]<<"\t\t"<<meanDiff[i]<<endl;//to stores values in .txt file
-
-
- }
-
- for (int i = 0; i<numHistos ; i++)
- {
- if(abs(meanDiff[i])>10.0) // //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
- {
- /*
- //commented out on Feb. 18 for F2 running (Sanghwa)
- cout<<"_____________________________________________________________________"<<endl;
- cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!Attention Needed!!!!!!!!!!!!!!!!!!!!!" << endl;
- cout<<"_____________________________________________________________________"<<endl;
-
- cout << "--------------------See ROC1 --- SLOT 17---------------------------" << endl;//hallc_replay/MAPS/HMS/DETEC/TRIG/htrig.map
- cout << "-----SEE THE PROBLEMATIC CHANNELS FOR HMS TRIGGER SUM PPED---------"<<endl;
- cout<< "THE FOLLOWING FIGURES ARE THE VALUES OF HMS TRIGGER PULSE PEDESTALS"<<endl;
- cout<< "------------- FOR SHWER SUM, PRESHWER SUM AND CERENKOV SUM---------"<<endl;
- cout << "NOTE----> MEAN VALUE OF PULSE PEDESTALS OF HMS GOLDEN RUN = MG-----"<<endl;
- cout<< "NOTE----> MEAN FOR CURRENT RUN = M AND THEIR DIFFERNCE = MD------"<<endl;
- cout << "-----ABSOLUTE VALUE OF MD should be < 10 Channels (2.5 mV)---------"<< endl;
- cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 10-----------------"<<endl;
- cout << "-----------------PLEASE CONSULT WITH EXPERTS----------------" <<endl;
- cout<<"_____________________________________________________________________"<<endl;
- */
-
- cout << " " << endl;
- cout << " " << endl;
- cout << "!!!!!!!!!!!!!!!!!Attention Needed IT AFFECTS TRIGGER EFFICIENCY!!!!!!!!!!!!!!!!!" << endl;
- cout << setprecision(4) << fixed <<"chan"<<" "<< channel[i] << " " <<"bar"<<" "<< bar[i]
- << "\t" << variables[i] << "\t" <<"Mean gold run:"<<" "<<meanG[i] <<" "
- <<"Mean current run:"<<" "<< mean[i] <<" " <<"Mean diff:"<<" "<< meanDiff[i] << endl;//MG=mean golden,M = mean current, MD = mean diff
- }
-
- }
- myfile <<"____________________________________________________________________________"<<endl;
-
- myfile.close();
-
- // TCanvas *c2 = new TCanvas();
-
- // double x[numHistos] ={1,2,3};
-
-
- // TGraphErrors *gr = new TGraphErrors(numHistos, x, meanDiff, 0, eff_rms);
-
- // c2->cd(1);
- // gr->GetXaxis()->SetTitle(" HMS SHWR PRESHWR CERENKOV");
- // gr->GetYaxis()->SetTitle("HMS PED_MEAN_DIFF");
- // gr->SetTitle("HMS PED SHWR PRESHWR CER Golden_vs_current_Run");
- // gr->SetMarkerColor(2);
- // gr->SetMarkerSize(1);
- // gr->SetMarkerStyle(3);
- // gr->Draw("AP*");
-
- // TLegend *leg = new TLegend(0.2,0.9,0.5,0.7);
- // leg->AddEntry(gr ,"1 = Pshwr","p");
- // leg->AddEntry(gr ,"2 = Pprshwr","p");
- // leg->AddEntry(gr ,"3 = Pcer","p");
-
-
-
- // leg->Draw();
-
-
-
- // c2->Update();
-
-
-
-}
diff --git a/UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C b/UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C
deleted file mode 100644
index f3329929..00000000
--- a/UTIL/PEDESTAL_MON/SHMS/PRODUCTION/shms_ped.C
+++ /dev/null
@@ -1,158 +0,0 @@
-//Read one 1D histogram from rootfile
-void shms_ped(Int_t runNumber, Int_t eventNumber)
-{
-
- const Int_t run = runNumber;
- const Int_t nevents = eventNumber;
- const Int_t goldRunNum = 1757;
- const Int_t numHistos = 5; //Number of histos
-
- // Define golden run in which to compare current run to
- TFile *f = new TFile(Form("ROOTfiles/shms_replay_production_%d_50000.root", goldRunNum));
- ofstream myfile;
-
-
-
- myfile.open("outSHMS.txt"); //To store pedestals differences
- myfile <<"___________________________________________________________________________"<<endl;
- myfile <<"SHMS PEDESTAL GOLDEN RUN NUMBER =" " "<<goldRunNum<<endl;
- myfile <<"SHMS TRIGGER SUM PPED RUN NUMBER =" " "<<run<<endl;
- myfile <<"___________________________________________________________________________"<<endl;
- myfile <<"shms_sum_pped"<< "\t\t\t"<<"Mean_Golden"<<"\t"<<"Mean"<<"\t\t"<<"Mean_Diff"<<endl;
- myfile <<"___________________________________________________________________________"<<endl;
-
-
- TH1D *histG[numHistos];
- TH1D *hist[numHistos];
- Int_t channel[5] = {1,2,3,4,5}; //(see hallc_replay/MAPS/SHMS/DETEC/TRIG/ptrig.map)
- TString variables[numHistos] = {"pHGCER", "pNGCER", "pPSHWR", "pHG_MOD", "pNG_MOD"};
- TString histos[numHistos] = {"ptrig_phgc_sum_pped", "ptrig_pngc_sum_pped", "ptrig_prshwr_sum_pped", "ptrig_phgc_sum_MOD_pped", "ptrig_pngc_sum_MOD_pped"};
-
- Int_t plane=1;
- Int_t bar [5]={2,3,4,6,7}; //variables are corresponding to these bars
-
- // For Goldern
-
- double meanG[numHistos], rmsG[numHistos];
- double mean[numHistos], rms[numHistos];
- double meanDiff[numHistos], rmsDiff[numHistos];
- double eff_rms[numHistos];
-
- for (int i = 0; i < numHistos-2 ; i++)
- {
- histG[i] = (TH1D*)gDirectory->Get(histos[i]);
- // cout << "histG[i] = " << histG[i] << endl;
- if (histG[i]) {
- // histG[i]->Draw();
- meanG[i]=histG[i]->GetMean();
- rmsG[i]=histG[i]->GetRMS();
- }
- else
- {
- cout << "****************ATTENTION REQUIRED *****************************" << endl;
- cout << "************SHMS_TRIGGER_PULSE_PEDESTALS_HAVE PROBLEMS *********" << endl;
- cout << "************PLEASE LOOK AT SHMS_TRIGGER_SUM_PPED_HISTOGRAMS*****" << endl;
- }
- }
- // no golden
- // TFile *f1= new TFile(Form("../../../../ROOTfiles/shms_replay_production_%d_%d.root",run,nevents));
- TFile *f1= new TFile(Form("ROOTfiles/shms_replay_production_%d_%d.root",run,nevents));
-
- for (int i = 0; i < numHistos-2 ; i++)
- {
- hist[i] = (TH1D*)gDirectory->Get(histos[i]);
- // cout << "mean = " << hist[i]->GetMean() << endl;
- mean[i]=hist[i]->GetMean();
- rms[i]=hist[i]->GetRMS();
- }
-
- for (int i = 0; i < numHistos-2 ; i++)
- {
- meanDiff[i]=meanG[i]-mean[i];
- eff_rms[i] = sqrt(pow(rmsG[i], 2)+pow(rms[i], 2));
- }
-
-
- for (int i = 0; i < numHistos-2 ; i++)
- {
- // cout <<channel[i]<<""<<"\t"<< bar[i]<<"\t"<<variables[i]<<"\t"<<"\t"<<meanG[i]<<"\t\t"<<mean[i]<<"\t\t"<<meanDiff[i]<<endl;
- myfile<<histos[i]<<"\t"<<"\t"<<meanG[i]<<"\t\t"<<mean[i]<<"\t\t"<<meanDiff[i]<<endl;//to store values in .txt file
-
- }
-
- for (int i = 0; i < numHistos-2 ; i++)
- {
- if(abs(meanDiff[i])>10.0) //The following message will appear in terminal if Pedestal mean differnce is greater than 2.5
- {
-
- /*
- //commented out on Feb. 18 for F2 running (Sanghwa)
- cout<<"_____________________________________________________________________"<<endl;
- cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!" << endl;
- cout<<"_____________________________________________________________________"<<endl;
-
- cout << "--------------------See ROC2 --- SLOT 14---------------------------" << endl;//hallc_replay/MAPS/HMS/DETEC/TRIG/htrig.map
- cout << "-----SEE THE PROBLEMATIC CHANNELS FOR SHMS TRIGGER SUM PPED---------"<<endl;
- cout<< "THE FOLLOWING FIGURES ARE THE VALUES OF SHMS TRIGGER PULSE PEDESTALS"<<endl;
- cout<< " FOR SHMS HEAVY GAS CERENKOV SUM, NOBEL GAS CERENKOV SUM AND SHWER SUM"<<endl;
- cout << "NOTE----> MEAN VALUE OF PULSE PEDESTALS OF HMS GOLDEN RUN = MG-----"<<endl;
- cout<< "NOTE----> MEAN FOR CURRENT RUN = M AND THEIR DIFFERNCE = MD------"<<endl;
- cout << "--------ABSOLUTE VALUE OF MD should be < 10 Channels (2.5 mV)------"<< endl;
- cout<< "------------BUT HERE YOU SEE THE MG VALUE(S) > 10-------------------"<<endl;
- cout << "-----------------PLEASE CONSULT WITH EXPERTS----------------------" <<endl;
- cout<<"_____________________________________________________________________"<<endl;
- cout << "!!!!!!!!!!!!!!!!!Attention Needed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
- cout << setprecision(4) << fixed <<"chan"<<" "<< channel[i] << " " <<"bar"<<" "<< bar[i]
- << "\t" << variables[i] << "\t" <<"MG"<<" "<<meanG[i] <<" "
- <<"M"<<" "<< mean[i] <<" " <<"MD"<<" "<< meanDiff[i] << endl;//MG=mean golden,M = mean current, MD = mean diff
- cout<<"_____________________________________________________________________"<<endl;
- */
-
- cout << " " << endl;
- cout << " " << endl;
- cout << "!!!!!!!!!!!!!!!!!Attention Needed IT AFFECTS TRIGGER EFFICIENCY!!!!!!!!!!!!!!!!!" << endl;
- cout << setprecision(4) << fixed <<"chan"<<" "<< channel[i] << " " <<"bar"<<" "<< bar[i]
- << "\t" << variables[i] << "\t" <<"Mean golden run:"<<" "<<meanG[i] <<" "
- <<"Mean current run:"<<" "<< mean[i] <<" " <<"Mean diff:"<<" "<< meanDiff[i] << endl;//MG=mean golden,M = mean current, MD = mean diff
-
- }
- }
-myfile <<"___________________________________________________________________________"<<endl;
-
- myfile.close();
-
- // TCanvas *c2 = new TCanvas();
-
- // double x[numHistos] ={1,2,3,4,5};
-
-
- // TGraphErrors *gr = new TGraphErrors(numHistos-2, x, meanDiff, 0, eff_rms);
-
- // c2->cd(1);
- // gr->GetXaxis()->SetTitle(" SHMS HGC NGC PRSHWR");// PHGC_SUM PNGC_SUM");
- // gr->GetYaxis()->SetTitle("PED_MEAN_DIFF");
- // gr->SetTitle("SHMS PED HGC NGC PRSHWR Golden (1757)_vs_current_Run");
- // gr->SetMarkerColor(2);
- // gr->SetMarkerSize(1);
- // gr->SetMarkerStyle(3);
- // gr->Draw("AP*");
-
-
- // TLegend *leg = new TLegend(0.20,0.9,0.45,0.7);
- // leg->AddEntry(gr ,"1 = PHGC","p");
- // leg->AddEntry(gr ,"2 = PNGC","p");
- // leg->AddEntry(gr,"3 = PRSHWR","p");
- // //leg->AddEntry(gr ,"2 = PHGC_SUM","p");
- // // leg->AddEntry(gr,"3 = PNGC_SUM","p");
-
-
-
- // leg->Draw();
-
-
-
- // c2->Update();
-
-
-
-}
diff --git a/UTIL/SHELL/full_coin_shms.sh b/UTIL/SHELL/full_coin_shms.sh
deleted file mode 100755
index c2d2d2bd..00000000
--- a/UTIL/SHELL/full_coin_shms.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/bash
-
-# Which spectrometer are we analyzing.
-spec=${0##*_}
-spec=${spec%%.sh}
-SPEC=$(echo "$spec" | tr '[:lower:]' '[:upper:]')
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-#lastRun=$( \
-# ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {prin#t "$1\n"}' | sort -n | tail -1 \
-#)
-lastRun=$( \
- ls raw/coin_all_*.dat raw/../raw.copiedtotape/coin_all_*.dat cache/coin_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=-1
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_${spec}_coin.C"
-config="CONFIG/${SPEC}/PRODUCTION/${spec}_coin_production.cfg"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-runOnlineGUI="./online -f ${config} -r ${runNum}"
-saveOnlineGUI="./online -f ${config} -r ${runNum} -P"
-
-# Name of the replay ROOT file
-rootFileDir="./ROOTfiles"
-replayFile="${spec}_coin_replay_production_${runNum}"
-rootFile="${replayFile}_${numEvents}.root"
-latestRootFile="${rootFileDir}/${replayFile}_latest.root"
-
-# Names of the monitoring file
-monRootDir="./HISTOGRAMS/${SPEC}/ROOT"
-monPdfDir="./HISTOGRAMS/${SPEC}/PDF"
-monRootFile="${spec}_coin_production_${runNum}.root"
-monPdfFile="${spec}_coin_production_${runNum}.pdf"
-latestMonRootFile="${monRootDir}/${spec}_coin_production_latest.root"
-latestMonPdfFile="${monPdfDir}/${spec}_coin_production_latest.pdf"
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_${spec}_coin_production_${runNum}_${numEvents}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_production_${runNum}_${numEvents}.txt"
-
-# What is base name of onlineGUI output.
-outFile="${spec}_coin_production_${runNum}"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} COIN analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runHcana}
-
- # Link the ROOT file to latest for online monitoring
- ln -fs ${rootFile} ${latestRootFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Running onlineGUI for analyzed ${SPEC} COIN run ${runNum}:"
- echo " -> CONFIG: ${config}"
- echo " -> RUN: ${runNum}"
- echo " -> COMMAND: ${runOnlineGUI}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- cd onlineGUI
- eval ${runOnlineGUI}
- eval ${saveOnlineGUI}
- mv "${outFile}.pdf" "../HISTOGRAMS/${SPEC}/PDF/${outFile}.pdf"
- mv "${outFile}.root" "../HISTOGRAMS/${SPEC}/ROOT/${outFile}.root"
- cd ..
- ln -fs ${monRootFile} ${latestMonRootFile}
- ln -fs ${monPdfFile} ${latestMonPdfFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-} 2>&1 | tee "${reportFile}"
-2>&1 | tee "${summaryFile}"
diff --git a/UTIL/SHELL/full_shms.sh b/UTIL/SHELL/full_shms.sh
deleted file mode 100755
index 22a5787d..00000000
--- a/UTIL/SHELL/full_shms.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /bin/bash
-
-# Which spectrometer are we analyzing.
-spec=${0##*_}
-spec=${spec%%.sh}
-SPEC=$(echo "$spec" | tr '[:lower:]' '[:upper:]')
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-lastRun=$( \
- ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=-1
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_${spec}.C"
-config="CONFIG/${SPEC}/PRODUCTION/${spec}_production.cfg"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-runOnlineGUI="./online -f ${config} -r ${runNum} -P"
-
-# Name of the replay ROOT file
-rootFileDir="./ROOTfiles"
-replayFile="${spec}_replay_production_${runNum}"
-rootFile="${replayFile}_${numEvents}.root"
-latestRootFile="${rootFileDir}/${replayFile}_latest.root"
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_${spec}_production_${runNum}_${numEvents}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_production_${runNum}_${numEvents}.txt"
-
-# Names of the monitoring file
-monRootDir="./HISTOGRAMS/${SPEC}/ROOT"
-monPdfDir="./HISTOGRAMS/${SPEC}/PDF"
-monRootFile="${spec}_production_${runNum}.root"
-monPdfFile="${spec}_production_${runNum}.pdf"
-latestMonRootFile="${monRootDir}/${spec}_production_latest.root"
-latestMonPdfFile="${monPdfDir}/${spec}_production_latest.pdf"
-
-# What is base name of onlineGUI output.
-outFile="${spec}_production_${runNum}"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runHcana}
-
- # Link the ROOT file to latest for online monitoring
- ln -fs ${rootFile} ${latestRootFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Running onlineGUI for analyzed ${SPEC} run ${runNum}:"
- echo " -> CONFIG: ${config}"
- echo " -> RUN: ${runNum}"
- echo " -> COMMAND: ${runOnlineGUI}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- cd onlineGUI
- eval ${runOnlineGUI}
- mv "${outFile}.pdf" "../HISTOGRAMS/${SPEC}/PDF/${outFile}.pdf"
- mv "${outFile}.root" "../HISTOGRAMS/${SPEC}/ROOT/${outFile}.root"
- cd ..
- ln -fs ${monRootFile} ${latestMonRootFile}
- ln -fs ${monPdfFile} ${latestMonPdfFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-} 2>&1 | tee "${reportFile}"
-2>&1 | tee "${summaryFile}"
diff --git a/UTIL/SHELL/run_all_shms.sh b/UTIL/SHELL/run_all_shms.sh
deleted file mode 100755
index d18d930a..00000000
--- a/UTIL/SHELL/run_all_shms.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/bash
-
-# Which spectrometer are we analyzing.
-spec=${0##*_}
-spec=${spec%%.sh}
-SPEC=$(echo "$spec" | tr '[:lower:]' '[:upper:]')
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-lastRun=$( \
- ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=50000
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_all_${spec}.C"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_${spec}_production_${runNum}_${numEvents}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_production_${runNum}_${numEvents}.txt"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo
-
- sleep 2
- eval ${runHcana}
- sleep 2
-
- echo
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-} 2>&1 | tee "${reportFile}"
-2>&1 | tee "${summaryFile}"
diff --git a/UTIL/SHELL/run_beancounter.sh b/UTIL/SHELL/run_beancounter.sh
deleted file mode 100755
index eb19aab3..00000000
--- a/UTIL/SHELL/run_beancounter.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/bash
-
-# Which run to use
-runNum=$1
-if [ -z "$runNum" ]; then
- echo " give Run Number to use"
- exit
-fi
-
-# which target
-target=$2
-if [ -z "$target" ]; then
- echo " give target type h or c "
- exit
-fi
-
-if [ "$target" = "h" ]; then
- targ=1
-fi
-if [ "$target" = "c" ]; then
- targ=2
-fi
-
-echo " counting for ${target} target"
-
-# Which scripts to run.
-script="SCRIPTS/COIN/MONITOR/Bean_counter.C"
-
-# Which commands to run.
-runbc="root -l \"${script}(${runNum}, ${targ})\""
-eval ${runbc}
-
-echo "If the plots look good quit root otherwise call an expert"
diff --git a/UTIL/SHELL/run_coin.sh b/UTIL/SHELL/run_coin.sh
deleted file mode 100755
index 5550c77a..00000000
--- a/UTIL/SHELL/run_coin.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/bash
-
-SPEC="COIN"
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-#lastRun=$( \
-# ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {prin#t "$1\n"}' | sort -n | tail -1 \
-#)
-lastRun=$( \
- ls raw/coin_all_*.dat raw/../raw.copiedtotape/coin_all_*.dat cache/coin_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=1000000
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_coin.C"
-#config="CONFIG/${SPEC}/PRODUCTION/${spec}_coin_production.cfg"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-#runOnlineGUI="./online -f ${config} -r ${runNum}"
-#saveOnlineGUI="./online -f ${config} -r ${runNum} -P"
-
-# Name of the replay ROOT file
-rootFileDir="./ROOTfiles"
-replayFile="coin_ev7_replay_production_${runNum}"
-rootFile="${replayFile}_${numEvents}.root"
-latestRootFile="${rootFileDir}/${replayFile}_latest.root"
-
-# Names of the monitoring file
-#monRootDir="./HISTOGRAMS/${SPEC}/ROOT"
-#monPdfDir="./HISTOGRAMS/${SPEC}/PDF"
-#monRootFile="${spec}_coin_production_${runNum}.root"
-#monPdfFile="${spec}_coin_production_${runNum}.pdf"
-#latestMonRootFile="${monRootDir}/${spec}_coin_production_latest.root"
-#latestMonPdfFile="${monPdfDir}/${spec}_coin_production_latest.pdf"
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_coin_ev7_production_${runNum}_${numEvents}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_production_ev7_${runNum}_${numEvents}.txt"
-
-# What is base name of onlineGUI output.
-#outFile="${spec}_coin_production_${runNum}"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} COIN analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runHcana}
-
- # Link the ROOT file to latest for online monitoring
- # ln -fs ${rootFile} ${latestRootFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Running onlineGUI for analyzed ${SPEC} COIN run ${runNum}:"
- echo " -> CONFIG: ${config}"
- echo " -> RUN: ${runNum}"
- echo " -> COMMAND: ${runOnlineGUI}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-# sleep 2
-# cd onlineGUI
-# eval ${runOnlineGUI}
-# eval ${saveOnlineGUI}
-# mv "${outFile}.pdf" "../HISTOGRAMS/${SPEC}/PDF/${outFile}.pdf"
-# mv "${outFile}.root" "../HISTOGRAMS/${SPEC}/ROOT/${outFile}.root"
-# cd ..
-# ln -fs ${monRootFile} ${latestMonRootFile}
-# ln -fs ${monPdfFile} ${latestMonPdfFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-}
-#2>&1 | tee "${reportFile}"
-#2>&1 | tee "${summaryFile}"
diff --git a/UTIL/SHELL/run_coin_ep.sh b/UTIL/SHELL/run_coin_ep.sh
deleted file mode 100755
index 47a82c1b..00000000
--- a/UTIL/SHELL/run_coin_ep.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/bash
-
-SPEC="COIN"
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-#lastRun=$( \
-# ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {prin#t "$1\n"}' | sort -n | tail -1 \
-#)
-lastRun=$( \
- ls raw/coin_all_*.dat raw/../raw.copiedtotape/coin_all_*.dat cache/coin_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=-1
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_ep.C"
-#config="CONFIG/${SPEC}/PRODUCTION/${spec}_coin_production.cfg"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-#runOnlineGUI="./online -f ${config} -r ${runNum}"
-#saveOnlineGUI="./online -f ${config} -r ${runNum} -P"
-
-# Name of the replay ROOT file
-rootFileDir="./ROOTfiles"
-replayFile="ep_${runNum}"
-rootFile="${replayFile}.root"
-latestRootFile="${rootFileDir}/${replayFile}_latest.root"
-
-# Names of the monitoring file
-#monRootDir="./HISTOGRAMS/${SPEC}/ROOT"
-#monPdfDir="./HISTOGRAMS/${SPEC}/PDF"
-#monRootFile="${spec}_coin_production_${runNum}.root"
-#monPdfFile="${spec}_coin_production_${runNum}.pdf"
-#latestMonRootFile="${monRootDir}/${spec}_coin_production_latest.root"
-#latestMonPdfFile="${monPdfDir}/${spec}_coin_production_latest.pdf"
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_ep_production_${runNum}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_ep_${runNum}.txt"
-
-# What is base name of onlineGUI output.
-#outFile="${spec}_coin_production_${runNum}"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} COIN analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runHcana}
-
- # Link the ROOT file to latest for online monitoring
- # ln -fs ${rootFile} ${latestRootFile}
-
-# echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-# echo ""
-# echo "Running onlineGUI for analyzed ${SPEC} ep run ${runNum}:"
-# echo " -> CONFIG: ${config}"
-# echo " -> RUN: ${runNum}"
-# echo " -> COMMAND: ${runOnlineGUI}"
-# echo ""
-# echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-# sleep 2
-# cd onlineGUI
-# eval ${runOnlineGUI}
-# eval ${saveOnlineGUI}
-# mv "${outFile}.pdf" "../HISTOGRAMS/${SPEC}/PDF/${outFile}.pdf"
-# mv "${outFile}.root" "../HISTOGRAMS/${SPEC}/ROOT/${outFile}.root"
-# cd ..
-# ln -fs ${monRootFile} ${latestMonRootFile}
-# ln -fs ${monPdfFile} ${latestMonPdfFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-}
-#2>&1 | tee "${reportFile}"
-#2>&1 | tee "${summaryFile}"
diff --git a/UTIL/SHELL/run_coin_hElec_pProt.C b/UTIL/SHELL/run_coin_hElec_pProt.C
deleted file mode 100755
index 563cfd23..00000000
--- a/UTIL/SHELL/run_coin_hElec_pProt.C
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/bash
-
-SPEC="COIN"
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-#lastRun=$( \
-# ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {prin#t "$1\n"}' | sort -n | tail -1 \
-#)
-lastRun=$( \
- ls raw/coin_all_*.dat raw/../raw.copiedtotape/coin_all_*.dat cache/coin_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=-1
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_coin_hElec_pProt.C"
-#config="CONFIG/${SPEC}/PRODUCTION/${spec}_coin_production.cfg"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-#runOnlineGUI="./online -f ${config} -r ${runNum}"
-#saveOnlineGUI="./online -f ${config} -r ${runNum} -P"
-
-# Name of the replay ROOT file
-rootFileDir="./ROOTfiles"
-replayFile="coin_replay_production_hElec_pProt_${runNum}"
-rootFile="${replayFile}_${numEvents}.root"
-latestRootFile="${rootFileDir}/${replayFile}_latest.root"
-
-# Names of the monitoring file
-#monRootDir="./HISTOGRAMS/${SPEC}/ROOT"
-#monPdfDir="./HISTOGRAMS/${SPEC}/PDF"
-#monRootFile="${spec}_coin_production_${runNum}.root"
-#monPdfFile="${spec}_coin_production_${runNum}.pdf"
-#latestMonRootFile="${monRootDir}/${spec}_coin_production_latest.root"
-#latestMonPdfFile="${monPdfDir}/${spec}_coin_production_latest.pdf"
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_coin_ev7_production_${runNum}_${numEvents}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_production_ev7_${runNum}_${numEvents}.txt"
-
-# What is base name of onlineGUI output.
-#outFile="${spec}_coin_production_${runNum}"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} COIN analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runHcana}
-
- # Link the ROOT file to latest for online monitoring
- # ln -fs ${rootFile} ${latestRootFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Running onlineGUI for analyzed ${SPEC} COIN run ${runNum}:"
- echo " -> CONFIG: ${config}"
- echo " -> RUN: ${runNum}"
- echo " -> COMMAND: ${runOnlineGUI}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-# sleep 2
-# cd onlineGUI
-# eval ${runOnlineGUI}
-# eval ${saveOnlineGUI}
-# mv "${outFile}.pdf" "../HISTOGRAMS/${SPEC}/PDF/${outFile}.pdf"
-# mv "${outFile}.root" "../HISTOGRAMS/${SPEC}/ROOT/${outFile}.root"
-# cd ..
-# ln -fs ${monRootFile} ${latestMonRootFile}
-# ln -fs ${monPdfFile} ${latestMonPdfFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-}
-#2>&1 | tee "${reportFile}"
-#2>&1 | tee "${summaryFile}"
diff --git a/UTIL/SHELL/run_coin_monitor.sh b/UTIL/SHELL/run_coin_monitor.sh
deleted file mode 100755
index 4a320db6..00000000
--- a/UTIL/SHELL/run_coin_monitor.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/bash
-
-# Which run to use
-runNum=$1
-if [ -z "$runNum" ]; then
- echo " give Run Number to use"
- exit
-fi
-
-# which target
-target=$2
-if [ -z "$target" ]; then
- echo " give target type h or c "
- exit
-fi
-
-if [ "$target" = "h" ]; then
- targ=1
-fi
-if [ "$target" = "c" ]; then
- targ=2
-fi
-if [ "$target" = "d" ]; then
- targ=3
-fi
-
-echo " Grabbing monitored data for run ${runNum}, ${target} target"
-
-# Grab monitored data and put it in the database
-script="SCRIPTS/COIN/MONITOR/coin_monitor_calc.C"
-
-runbc="root -q -l \"${script}(${runNum}, ${targ})\""
-eval ${runbc}
-
-# Plot this run, with 5 on either side
-script="SCRIPTS/COIN/MONITOR/coin_monitor_graph.C"
-runMin=$((runNum-10))
-runMax=$((runNum+5))
-runbc="root -l \"${script}(${runMin}, ${runMax})\""
-eval ${runbc}
-
-
-echo "If the plots look good quit root otherwise call an expert"
diff --git a/UTIL/SHELL/run_coin_shms.sh b/UTIL/SHELL/run_coin_shms.sh
deleted file mode 100755
index a84b1b17..00000000
--- a/UTIL/SHELL/run_coin_shms.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#! /bin/bash
-
-# Which spectrometer are we analyzing.
-spec=${0##*_}
-spec=${spec%%.sh}
-SPEC=$(echo "$spec" | tr '[:lower:]' '[:upper:]')
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-#lastRun=$( \
-# ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {prin#t "$1\n"}' | sort -n | tail -1 \
-#)
-lastRun=$( \
- ls raw/coin_all_*.dat raw/../raw.copiedtotape/coin_all_*.dat cache/coin_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=50000
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_${spec}_coin.C"
-config="CONFIG/${SPEC}/PRODUCTION/${spec}_coin_production.cfg"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-runOnlineGUI="./online -f ${config} -r ${runNum}"
-saveOnlineGUI="./online -f ${config} -r ${runNum} -P"
-runPedMon="root -l -q \"UTIL/PEDESTAL_MON/COIN/PRODUCTION/${spec}_ped.C(${runNum}, ${numEvents})\""
-
-#Define where to put the PEDESTAL_MON
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_${spec}_production_${runNum}_${numEvents}.txt"
-pedMonFile="PEDESTAL_MONITOR/COIN/reportPedestal_${spec}_coin_production_${runNum}_${numEvents}.txt"
-
-# Name of the replay ROOT file
-rootFileDir="./ROOTfiles"
-replayFile="${spec}_coin_replay_production_${runNum}"
-rootFile="${replayFile}_${numEvents}.root"
-latestRootFile="${rootFileDir}/${replayFile}_latest.root"
-
-# Names of the monitoring file
-monRootDir="./HISTOGRAMS/${SPEC}/ROOT"
-monPdfDir="./HISTOGRAMS/${SPEC}/PDF"
-monRootFile="${spec}_coin_production_${runNum}.root"
-monPdfFile="${spec}_coin_production_${runNum}.pdf"
-latestMonRootFile="${monRootDir}/${spec}_coin_production_latest.root"
-latestMonPdfFile="${monPdfDir}/${spec}_coin_production_latest.pdf"
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_${spec}_coin_production_${runNum}_${numEvents}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_production_${runNum}_${numEvents}.txt"
-
-# What is base name of onlineGUI output.
-outFile="${spec}_coin_production_${runNum}"
-outFilePed="out${SPEC}"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} COIN analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runHcana}
-
- # Link the ROOT file to latest for online monitoring
- ln -fs ${rootFile} ${latestRootFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Running onlineGUI for analyzed ${SPEC} COIN run ${runNum}:"
- echo " -> CONFIG: ${config}"
- echo " -> RUN: ${runNum}"
- echo " -> COMMAND: ${runOnlineGUI}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- cd onlineGUI
- eval ${runOnlineGUI}
- eval ${saveOnlineGUI}
- mv "${outFile}.pdf" "../HISTOGRAMS/${SPEC}/PDF/${outFile}.pdf"
- mv "${outFile}.root" "../HISTOGRAMS/${SPEC}/ROOT/${outFile}.root"
- cd ..
- ln -fs ${monRootFile} ${latestMonRootFile}
- ln -fs ${monPdfFile} ${latestMonPdfFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Performing pedestal monitoring for COIN ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runPedMon}
- mv "${outFilePed}.txt" ${pedMonFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-
-} 2>&1 | tee "${reportFile}"
-2>&1 | tee "${summaryFile}"
diff --git a/UTIL/SHELL/run_shms.sh b/UTIL/SHELL/run_shms.sh
deleted file mode 100755
index 5fef81f4..00000000
--- a/UTIL/SHELL/run_shms.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#! /bin/bash
-
-# Which spectrometer are we analyzing.
-spec=${0##*_}
-spec=${spec%%.sh}
-SPEC=$(echo "$spec" | tr '[:lower:]' '[:upper:]')
-
-# What is the last run number for the spectrometer.
-# The pre-fix zero must be stripped because ROOT is ... well ROOT
-lastRun=$( \
- ls raw/"${spec}"_all_*.dat raw/../raw.copiedtotape/"${spec}"_all_*.dat -R 2>/dev/null | perl -ne 'if(/0*(\d+)/) {print "$1\n"}' | sort -n | tail -1 \
-)
-
-# Which run to analyze.
-runNum=$1
-if [ -z "$runNum" ]; then
- runNum=$lastRun
-fi
-
-# How many events to analyze.
-numEvents=50000
-
-# Which scripts to run.
-script="SCRIPTS/${SPEC}/PRODUCTION/replay_production_${spec}.C"
-config="CONFIG/${SPEC}/PRODUCTION/${spec}_production.cfg"
-
-# Which commands to run.
-runHcana="./hcana -q \"${script}(${runNum}, ${numEvents})\""
-runOnlineGUI="./online -f ${config} -r ${runNum}"
-saveOnlineGUI="./online -f ${config} -r ${runNum} -P"
-runReportMon="./readout_${spec}.py ${runNum} ${numEvents}"
-runPedMon="root -l -q \"UTIL/PEDESTAL_MON/${SPEC}/PRODUCTION/${spec}_ped.C(${runNum}, ${numEvents})\""
-
-# Define report monitoring directroy
-reportMonDir="UTIL/REPORT_MON/${SPEC}/"
-
-#Define where to put the REPORT_MON
-ReportMon="emacs ../../../REPORT_MONITOR/${SPEC}/reportMonitor_${spec}_production_${runNum}_${numEvents}.txt"
-
-pathReportMon="../../../REPORT_MONITOR/${SPEC}/reportMonitor_${spec}_production_${runNum}_${numEvents}.txt"
-
-#Define where to put the PEDESTAL_MON
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_${spec}_production_${runNum}_${numEvents}.txt"
-pedMonFile="PEDESTAL_MONITOR/${SPEC}/reportPedestal_${spec}_production_${runNum}_${numEvents}.txt"
-
-# Name of the replay ROOT file
-rootFileDir="./ROOTfiles"
-replayFile="${spec}_replay_production_${runNum}"
-rootFile="${replayFile}_${numEvents}.root"
-latestRootFile="${rootFileDir}/${replayFile}_latest.root"
-
-# Names of the monitoring file
-monRootDir="./HISTOGRAMS/${SPEC}/ROOT"
-monPdfDir="./HISTOGRAMS/${SPEC}/PDF"
-monRootFile="${spec}_production_${runNum}.root"
-monPdfFile="${spec}_production_${runNum}.pdf"
-latestMonRootFile="${monRootDir}/${spec}_production_latest.root"
-latestMonPdfFile="${monPdfDir}/${spec}_production_latest.pdf"
-
-# Where to put log.
-reportFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/replay_${spec}_production_${runNum}_${numEvents}.txt"
-summaryFile="REPORT_OUTPUT/${SPEC}/PRODUCTION/summary_production_${runNum}_${numEvents}.txt"
-
-# What is base name of onlineGUI output.
-outFile="${spec}_production_${runNum}"
-outFileMonitor="output"
-outFilePed="out${SPEC}"
-
-# Start analysis and monitoring plots.
-{
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- date
- echo ""
- echo "Running ${SPEC} analysis on the run ${runNum}:"
- echo " -> SCRIPT: ${script}"
- echo " -> RUN: ${runNum}"
- echo " -> NEVENTS: ${numEvents}"
- echo " -> COMMAND: ${runHcana}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runHcana}
-
- # Link the ROOT file to latest for online monitoring
- ln -fs ${rootFile} ${latestRootFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Running onlineGUI for analyzed ${SPEC} run ${runNum}:"
- echo " -> CONFIG: ${config}"
- echo " -> RUN: ${runNum}"
- echo " -> COMMAND: ${runOnlineGUI}"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- cd onlineGUI
- eval ${runOnlineGUI}
- eval ${saveOnlineGUI}
- mv "${outFile}.pdf" "../HISTOGRAMS/${SPEC}/PDF/${outFile}.pdf"
- mv "${outFile}.root" "../HISTOGRAMS/${SPEC}/ROOT/${outFile}.root"
- cd ..
- ln -fs ${monRootFile} ${latestMonRootFile}
- ln -fs ${monPdfFile} ${latestMonPdfFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done analyzing ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Performing pedestal monitoring for ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- sleep 2
- eval ${runPedMon}
- mv "${outFilePed}.txt" ${pedMonFile}
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Generating report file monitoring data file ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
- cd ${reportMonDir}
- eval ${runReportMon}
- mv "${outFileMonitor}.txt" ${pathReportMon}
- eval ${ReportMon}
- sleep 2
-
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "Done producing report file monitoring data file ${SPEC} run ${runNum}."
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
- echo ""
- echo "So long and thanks for all the fish!"
- echo ""
- echo ":=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:="
-
-} 2>&1 | tee "${reportFile}"
-2>&1 | tee "${summaryFile}"
diff --git a/full_coin_hms.sh b/full_coin_hms.sh
deleted file mode 120000
index 05528058..00000000
--- a/full_coin_hms.sh
+++ /dev/null
@@ -1 +0,0 @@
-full_coin_shms.sh
\ No newline at end of file
diff --git a/full_coin_shms.sh b/full_coin_shms.sh
deleted file mode 120000
index 2fbd67c2..00000000
--- a/full_coin_shms.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/full_coin_shms.sh
\ No newline at end of file
diff --git a/full_hms.sh b/full_hms.sh
deleted file mode 120000
index 36534e0c..00000000
--- a/full_hms.sh
+++ /dev/null
@@ -1 +0,0 @@
-full_shms.sh
\ No newline at end of file
diff --git a/full_shms.sh b/full_shms.sh
deleted file mode 120000
index 77513444..00000000
--- a/full_shms.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/full_shms.sh
\ No newline at end of file
diff --git a/run_all_shms.sh b/run_all_shms.sh
deleted file mode 120000
index 953985b3..00000000
--- a/run_all_shms.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/run_all_shms.sh
\ No newline at end of file
diff --git a/run_beancounter.sh b/run_beancounter.sh
deleted file mode 120000
index 7287ee7f..00000000
--- a/run_beancounter.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/run_beancounter.sh
\ No newline at end of file
diff --git a/run_coin.sh b/run_coin.sh
deleted file mode 120000
index e3c3aaf1..00000000
--- a/run_coin.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/run_coin.sh
\ No newline at end of file
diff --git a/run_coin_ep.sh b/run_coin_ep.sh
deleted file mode 120000
index 9471e54b..00000000
--- a/run_coin_ep.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/run_coin_ep.sh
\ No newline at end of file
diff --git a/run_coin_hms.sh b/run_coin_hms.sh
deleted file mode 120000
index e3a3941c..00000000
--- a/run_coin_hms.sh
+++ /dev/null
@@ -1 +0,0 @@
-run_coin_shms.sh
\ No newline at end of file
diff --git a/run_coin_monitor.sh b/run_coin_monitor.sh
deleted file mode 120000
index d16e8ce1..00000000
--- a/run_coin_monitor.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/run_coin_monitor.sh
\ No newline at end of file
diff --git a/run_coin_shms.sh b/run_coin_shms.sh
deleted file mode 120000
index 75d0b06c..00000000
--- a/run_coin_shms.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/run_coin_shms.sh
\ No newline at end of file
diff --git a/run_hms.sh b/run_hms.sh
deleted file mode 120000
index b3c278fe..00000000
--- a/run_hms.sh
+++ /dev/null
@@ -1 +0,0 @@
-run_shms.sh
\ No newline at end of file
diff --git a/run_shms.sh b/run_shms.sh
deleted file mode 120000
index 9a279130..00000000
--- a/run_shms.sh
+++ /dev/null
@@ -1 +0,0 @@
-UTIL/SHELL/run_shms.sh
\ No newline at end of file
--
GitLab