Re #6191. Fix merge problem.

It had retained a reference to a class that's now gone in other branches.
Merge branch 'feature/6191_remove_spectradetectormap' into develop