Comparative study of the preparation of negative electron affinity GaAs photocathodes with O2 and with NF3