CP algs: Better photon support

4 jobs for cp/photons