Also adds some extra outputs to the AOD output file, and gives resimulation outputs a "_ReSim" suffix rather than "DAOD" suffix