bugfixes to DEEenergyCalculator