Add J/psi resolution; re-write RC with Dummy instead of rc tracks

Merged Ziyue Zhang requested to merge ziyue_work_branch into master

Merge request reports