Switch for different photon IDs, adding Francois' handmade CiC
also correcting the definition of the control sample
Merge remote-tracking branch 'origin/master'