Overhaul of photon noise model