Fix and tidy ApplyCalibration.cpp re #6344

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>