22.0-cleanup-TopPartons

Main aim was suppression of cppcheck errors (false positives), but saw a chance for a small refactor due to repeated pattern of decoration with M, Pt, Phi; so I created a utility function to do this. In one case it was discovered that a wrong variable name had previously been used, and this was corrected.