Included scaling and normalisation step.

Scaling option now effects both Calibration and Resolution.

Refs #5007