Refactoring for using optional photon parameters on different stages of the simulation