ChargedProtoANNPID - Remove all Run 1+2 MVAs, improve thread safety.

Also refactor a bit how the MVAs are added, where the code is kept etc.

Thread safety is improved by removing cached mutable state, or (in a couple cases) protect non-const access to it with a mutex lock.

Goes together with Phys!658 (merged)