Refs #9621 Swap to using spectrum numbers.

This follows a more natural mapping with the interface and instrument
scientists perception of what range they are using.
Merge branch 'feature/9621_fixed_grouping_file' into develop