Add tr, tf and max energy and remove fwhm options
Add max shift and filter options
Minor updates for TES-Workbench