Added filters for running on both data & MC.  Condensed to single path.