Support for multiple detectors in MDNormSXD #73
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Start to functionalise the algorithm * Follow coding standard for member variables names Refs #10470
This gives a speed gain ~80% Refs #10470
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
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
Conflicts: Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSXD.h Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp Refs #10470
Conflicts: Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp Refs #10470
|
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 |
ExperimentInfo throws if no mappings are defined. Refs #10470
|
It should be fixed now. |
|
retest this please |
1 similar comment
|
retest this please |
|
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 |
|
Could you send me the script that you're testing with? |
The method is most often called in a loop so floods the log messages. Refs #10470
|
retest this please |
AndreiSavici
added a commit
that referenced
this pull request
Nov 27, 2014
…sxdnorm Support for multiple detectors in MDNormSXD
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes issue #10470
Tester: The usage tests here but with grouping added to the data step should now work