Formatting changes to put the methods back in the right order

Refs #9166
Copy errors across to corrected workspace for all cases.

Refs #9166
Merge remote-tracking branch 'origin/feature/9166_errors_on_calculategammabackground'