updated plotting macros with the new subfolder names
updated Pt binning for 2D histograms
added Pt-binned 2D discriminator plots