Merge branch 'master' of https://github.com/JeffersonLab/hallc_replay into scalerwork

DBASE/SHMS/GEN/default_det_calib_files.param

DBASE/SHMS/GEN/general.param

DBASE/SHMS/STD/standard.database

DEF-files/HMS/EPICS/epics_short.def

DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def

DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def

DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def

DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def

DEF-files/SHMS/PRODUCTION/merge_list.txt

DEF-files/SHMS/PRODUCTION/pstackana_production.def

MAPS/COIN/DETEC/TRIG/cointrig.map

MAPS/HMS/DETEC/AERO/haero_htrig.map

MAPS/HMS/DETEC/CAL/hcal_htrig.map

MAPS/HMS/DETEC/CER/hcer_htrig.map

MAPS/HMS/DETEC/RASTER/hraster.map

MAPS/HMS/DETEC/RASTER/hraster_simple.map

MAPS/HMS/DETEC/STACK/hms_stack.map

MAPS/HMS/DETEC/TRIG/htrig.map

MAPS/SCALERS/db_HScalevt.dat

MAPS/SCALERS/db_PScalevt.dat