Cleaning up. Single formula in the IDF. Better test. Refs #6850
Merge branch 'feature/6850_extend_NormaliseByDetector_userfitting' into develop