Refs #8585 Implement correct error calculations.
Merge branch 'feature/8585_EISF_output_from_fitting' into develop