update energy regression macros
Merge pull request #2 from bendavid/master

update energy regression macros