modularize diagnostic plotting, with support for sub-parameter-set plots
more diagnostic plot modularization