wouldn't it be better to repeat the `if fwhm == 0` for each of the volume types and move this if to the surface one?