You already have PDGInfo::pi_mass() etc
Why yet another layer?
Please remove