adapt own code to new Ntuple_Controller
Merge branch 'master' into BastiansConfig