The master--HepMC2 branch seems to convert the momentum/mass units to MeV without updating the momentum unit member of the GenEvent accordingly. This patch is to catch these cases and convert the values back to the correct unit.
cc @ewelina @jkretz @mgignac