removed barrel requirement, added endcap requirement on photons