Finished fixes to PlotMaker and EventCompare metrics for generalized
plotting