Changed massW and Wpt calculations to Freiburg version, need to check equivalence