Fixed so full calculation only done if event passes cuts.