changed all GeV/c* to GeV and normalised eV and unit spacing
The rest of Guillelmo's changes