OSIRIS Diffraction: Implement diffspec mode

[Martyn Gigg]

From Spencer:

For OSIRIS, in the current diffonly setup a range of runs can be input each with a different time range corresponding to different d-spacings and all the runs are merged. The time ranges are specific to diffraction. When you try to run with diffspec the time range is different and the routine fails. SO, for diffspec all we want is to read in the diffraction spectra, normalise to monitor & focus to d-spacing to give the one spectrum.

[Nick Draper]

Moved to r2.6 at the end of r2.5

[Martyn Gigg]

Implement DiffSpec mode for OSIRIS diffraction algorithm. Refs #6791

This is not exposed to the GUI yet.

Changeset: 023f6e249e24c98bed64fab88d10866c6b590d2f

[Martyn Gigg]

Use MSGReducer for OSIRIS diffspec mode. Refs #6791

Reorganised OSIRIS parameter files to follow IRIS/TOSCA. The interface now uses the same MSGReducer for diffspec mode and only uses the workflow algorithm for diffonly mode.

Changeset: 875777e07235998a692d049d274226d77925622e

[Martyn Gigg]

Remove DiffSpec mode from OSIRISDiffractionReduction.

Leave it doing diffraction only in favour of MSGReducer covering spectroscopy mode. Refs #6791

Changeset: ece1177e83c708de04618458d0efed975ddae80a

[Martyn Gigg]

Make rebin parameters optional on IndirectDiffractionReduction GUI

Refs #6791

Changeset: ad92abc850f2ed354d37b2f9f37e5b98c0bc7ee0

[Martyn Gigg]

Make the rebin string optional in indirect diffraction reduction.

If not given, RebinToWorkspace is used to rebin the workspace to the first spectrum so that grouping can proceed. Refs #6791

Changeset: 433c16409aade72af17301f324daa79c29e982c4

[Martyn Gigg]

Rebin larger workspace of sample/vanadium to smaller.

Allows for a point where raw files started being written with an extra bin and so could not be used with an earlier vanadium. Refs #6791

Changeset: bcb06749ba76880dd2cae160d2e7352be9a1c696

[Martyn Gigg]

Add system test for OSIRIS spectroscopy mode. Refs #6791

Changeset: 1f8cb9a0a80cc99185f0e324f8ada62bdf4e27e4

[Martyn Gigg]

Branch: feature/6791_osiris_diffspec_mode in both main code & system test repositories

Tester: This concerns the Indirect Diffraction GUI. Start the interface & select OSIRIS as an instrument. It should now have a second combobox labelled "Reflection" filled with diffonly and diffspec options.

Selecting diffonly should produce an interface which has input for a cal file and vanadium runs, whereas the diffspec interface should just have a rebin box.

Check diffonly mode:

• Use Run=OSI89813.raw,CalFile=osiris_041_RES10.cal,Vanadium=osi89757.raw (all in systemtests)
• Click run and the reduction should proceed and produce two workspaces.

Check diffspec mode:

• Use Run=osiris00101300.raw (system tests, you will have to merge in that repository to pick up the file)
• First time around just click run and the reduction should go ahead
• Second time enter some rebin parameters, e.g. 2,0.001,3.0 and click run.

[Jay Rainey]

Testing

• Testing on Ubuntu 12.4.
• Diffonly mode works as expected.
• Diffspec mode works as expected.

Code review

• Clean and consistent code.
• No visible bugs/problems.

Note: I found a bug when testing this ticket, when diffonly mode is run twice (using same input values) then a few errors appear in the Results log. See #7543.

[Jay Rainey]

Merge remote-tracking branch 'origin/feature/6791_osiris_diffspec_mode'

[Jay Rainey]

Merge remote-tracking branch 'origin/feature/6791_osiris_diffspec_mode'

[Stuart Campbell]

This ticket has been transferred to github issue ​7637