reverting to 214ab73 Validation/RecoEgamma/plugins/PhotonValidator.cc and  DataFormats/EgammaCandidates/interface/Photon.h