Merge remote-tracking branch 'upstream/master'

CALIBRATION/bcm_current_calib/ScalerCalib.C

DBASE/COIN/STD/standard.kinematics

DBASE/HMS/STD/standard.kinematics

DBASE/SHMS/STD/standard.kinematics

DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def

DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def

DEF-files/COIN/PRODUCTION/CUTS/coin_production_ep_cuts.def

DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def

DEF-files/COIN/PRODUCTION/CUTS/coin_reconstruct_cuts.def

...files/COIN/PRODUCTION/KIN/coin_hElec_pProt_kin_histos.def

...files/COIN/PRODUCTION/KIN/coin_pElec_hProt_kin_histos.def

DEF-files/COIN/PRODUCTION/TRIG/coin_trig_histos.def

...iles/COIN/PRODUCTION/coin_production_pElec_hProt_cuts.def

...les/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def

DEF-files/HMS/PRODUCTION/CUTS/hstackana_decode_cuts.def

DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def

...les/HMS/PRODUCTION/CUTS/hstackana_production_cuts_kpp.def

DEF-files/HMS/PRODUCTION/CUTS/hstackana_rawdecode_cuts.def

DEF-files/HMS/PRODUCTION/CUTS/hstackana_reconstruct_cuts.def

DEF-files/HMS/PRODUCTION/DC/hdc_eff_histos.def