added some 'const' qualifiers
Merge branch 'master' of https://github.com/UHHAnalysis/NtupleWriter
re-define pi