Merge remote-tracking branch 'origin/feature/10462_sxdmdnorm_integration' (78ea6b4f) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

78ea6b4f

Commit 78ea6b4f authored 10 years ago by Savici, Andrei T.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/10462_sxdmdnorm_integration'

parents 12b36ad3 b000bd8c

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h 38 additions, 0 deletions

.../Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h
Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt 8 additions, 5 deletions

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateFlux.h 65 additions, 0 deletions

...ework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateFlux.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSXD.h 16 additions, 9 deletions

...Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSXD.h
Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp 164 additions, 0 deletions

Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp
Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp 196 additions, 43 deletions

Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp
Code/Mantid/Framework/MDAlgorithms/test/IntegrateFluxTest.h 204 additions, 0 deletions

Code/Mantid/Framework/MDAlgorithms/test/IntegrateFluxTest.h
Code/Mantid/Framework/MDAlgorithms/test/MDNormSXDTest.h 119 additions, 0 deletions

Code/Mantid/Framework/MDAlgorithms/test/MDNormSXDTest.h
Code/Mantid/Framework/MDAlgorithms/test/SXDMDNormTest.h 0 additions, 57 deletions

Code/Mantid/Framework/MDAlgorithms/test/SXDMDNormTest.h
Code/Mantid/docs/source/algorithms/IntegrateFlux-v1.rst 47 additions, 0 deletions

Code/Mantid/docs/source/algorithms/IntegrateFlux-v1.rst
Code/Mantid/docs/source/algorithms/MDNormSXD-v1.rst 4 additions, 3 deletions

Code/Mantid/docs/source/algorithms/MDNormSXD-v1.rst

with 861 additions and 117 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment