Torben changed code to load new mcstas format. re #9114
Merge remote-tracking branch 'origin/feature/9114_mcstas_new_format'