Add support for grouped detectors to SXDMDNorm

[Martyn Gigg]

The SXDMDNorm algorithm currently only supports a 1:1 detector mapping. To be of any use at ISIS it needs to understand detector grouping.

[Martyn Gigg]

Formatting changes only.

Refs #10470

Changeset: fa841045e2a48bc987a1573c31771f0bfeee3710

[Martyn Gigg]

Fix coverity warning about variable initiliaization.

Refs #10470

Changeset: 16939fe2c709d2f88d3a34d13ca301be8877ab02

[Martyn Gigg]

Use int64 for omp loop variable.

Refs #10470

Changeset: 6b342300794f6c877595cf7a523b9f28b2e69492

[Martyn Gigg]

First set of refactorings.

Refs #10470

Changeset: 39f2d5e214b6cccc115b47b4064701f557fd23e3

[Martyn Gigg]

Continuing with refactoring:

• Start to functionalise the algorithm
• Follow coding standard for member variables names

Refs #10470

Changeset: c6ecf32eae8a4ae9667d8bfae003490b4782cfdf

[Martyn Gigg]

Refactor a few more parts in to methods.

Refs #10470

Changeset: a32dcb48ea5eccd6ffb62b79073b175c178734ba

[Martyn Gigg]

Move main calculation into a method.

Refs #10470

Changeset: 83ccfe1d5a1c091e00912f093da05a1e0718d6c0

[Martyn Gigg]

Use references when returning event lists.

This gives a speed gain ~80% Refs #10470

Changeset: cb4841a8589e5957827e943cd9158ee9ad80b6cf

[Martyn Gigg]

Use VectorHelper::SimpleAverage functor in computing average position.

This avoids 2 loops over the same data. Also, the non-HKL dimension values don't change with each intersection so only copy them over once. Refs #10470

Changeset: 77364809b8fb50ac8561be814cf631e4050398aa

[Martyn Gigg]

Alter function signature to just accept theta and phi

Refs #10470

Changeset: cddbdc99df8ac3b57d935b4748b21896b7d570dd

[Martyn Gigg]

Use detector grouping from ExperimentInfo

For workspaces with grouped detectors it now only considers the first one from the group in the main loop but calculates the intersections using the whole group. Refs #10470

Changeset: c16f78c90b2a705394d4fa05f62d91ade465e2f0

[Martyn Gigg]

Merge branch 'master' into feature/10470_grouped_dets_sxdnorm

Conflicts:

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSXD.h Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp

Refs #10470

Changeset: c72472564212df4678fc2c1a0111fbf8a7ef7045

[Martyn Gigg]

This is being verified as ​pull request #73.

[Martyn Gigg]

Merge branch 'master' into feature/10470_grouped_dets_sxdnorm

Conflicts:

Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp

Refs #10470

Changeset: 972c75db99f466d2fbd3925fa98edee4d037826c

[Andrei Savici]

Unfortunately it gives errors. I am updating the script and files in the dropbox so you can test it. The detectors are not grouped at all in the MDdata or solidAngle. I get

Error in execution of algorithm MDNormSXD: ExperimentInfo::getGroupMembers - Unable to find ID 1114112 in lookup

[Martyn Gigg]

Fix bug for 1:1 detector mapping.

ExperimentInfo throws if no mappings are defined. Refs #10470

Changeset: 1bebfc7254b0acf7d2a9d7a94e977a2adcf7a54e

[Martyn Gigg]

It should be fixed now.

[Martyn Gigg]

retest this please

[Martyn Gigg]

retest this please

[Andrei Savici]

The code is not doing what is supposed to. If I group the detectors in big enough chunks (say 256x256 spectra in TOPAZ per spectrum) only a few trajectories appear in the MD data (as expected), but the normalization contains all detectors, and not only where the group is

[Martyn Gigg]

Could you send me the script that you're testing with?

[Andrei Savici]

​https://www.dropbox.com/sh/3tb9d5kgzkz7dbe/AAD5LuGS9i8TTfkpnwP4gX-ja?dl=0

[Martyn Gigg]

Fix bug with removing grouped detector ids

Refs #10470

Changeset: 1b994cc4f788c5b1f8327a6595827a681f0c7621

[Martyn Gigg]

Remove a debug statement.

The method is most often called in a loop so floods the log messages. Refs #10470

Changeset: bbe3809fdd4378519781309b0d7c76ef9d60b874

[Martyn Gigg]

retest this please

[Martyn Gigg]

Merge branch 'master' into feature/10470_grouped_dets_sxdnorm

Conflicts:

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSXD.h Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp

Refs #10470

Full changeset: ​c72472564212df4678fc2c1a0111fbf8a7ef7045

[Martyn Gigg]

Merge branch 'master' into feature/10470_grouped_dets_sxdnorm

Conflicts:

Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp

Refs #10470

Full changeset: ​972c75db99f466d2fbd3925fa98edee4d037826c

[Andrei Savici]

Merge pull request #73 from mantidproject/feature/10470_grouped_dets_sxdnorm

Support for multiple detectors in MDNormSXD

Full changeset: ​053f14146851e94328b38d107c5b03ebbb42e917

[Stuart Campbell]

This ticket has been transferred to github issue ​11312