Tried to make sure calibrated energies are implemented correctly. Also moved consts file into a local directory. Note: it now lives in data/ directory.