fix met.phi * MeV2GeV bug

Details: this is a messy commit, squashing a mistake, its revert, and a fix.
See
http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git
Reported in #39
Revert "fix met.phi * MeV2GeV bug"

This reverts commit b12110b26db8f9f989eec44129bcb91d30fbe27a.

I made this change from the browser, and it marks all the lines to be
changed, although I changed only one. Perhaps this is due to a
dox/linux thing? Trying to revert and do it clean from the cmd line.

fix met.phi * MeV2GeV bug (second try, see revert 4dd154f)

Reported in #39