More updates to analysis
Always use at least the Psf footprint in CModel