Torben changed code to load new mcstas format. re #9114