Fixed minor issue with output filenames
Simplify file names using methods in commonFunctions. Also save mass plot hists to output file
Improve production by allowign option of doign HLT only, No HLT only, or both.