changes to ntupler and plotting macros