Added make plots, bugfixes for MC_GENSTUDY_CHARMONIUM