Run2 hscp v1

Merge HSCP Updates for Run2
with dEdx Updates for Run2