Initial solution for fixed quarkonia masses.
Port the merge of branch 'LHCBGAUSS-1167.OniaMass.Sim09' into 'Sim09-upgrade'
This correspond to merge request !323 (merged) in 'Sim09'
(cherry picked from commit 884c821f)
26e2eea3 Initial solution for fixed quarkonia masses.
b127bfb7 Somehow committed old logic on onia selection. Fixed and added Jon's suggestions.