master
Make run3 scenario to work in dd4hep scenario
Attempt to make 2017 scenario compatible with dd4hep