Cleanups in energy classes

Merged Martin Reinecke requested to merge cleanupsInEnergyClasses into NIFTy_4

Merge request reports