Bugfix
A tentative version that at least runs without crashing
Merge branch '70x-temporary' of https://github.com/CMSSUSYPhotons/SUSYPhotonAnalysis into 70x-temporary