Improve and clean the physical detector model