Added more variables to energy_compare, and fixed definitions of dphi and mT