fix proton mask constant error, extend getlorentzVector

Please also use a switch/case statement here. You avoid only one line of code duplication by checking pType this way and this does not warrant the added complexity.