ENH: Beam energy units

Make sure the beam
energy has the right units
Automatic style corrections courtesy of autopep8
Merge pull request #311 from pburdet/ENH_beam_energy_units

Enh beam energy units