Changes to photon selection and make sure histograms have proper errors.

Changes to photon selection and make sure histograms have proper errors.