Added switch to activate photon-analysis specific quantities