Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bb6357fa

Commit bb6357fa authored 11 years ago by Arturs Bekasovs

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/7144_new_v_conv_spectrum_axis'

Refs #7144
Conflicts:
	Code/Mantid/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h

parents 3076d9ee 0b88e6fe

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/Algorithms/CMakeLists.txt 3 additions, 0 deletions

Code/Mantid/Framework/Algorithms/CMakeLists.txt
Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h 77 additions, 0 deletions

...rk/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h
Code/Mantid/Framework/Algorithms/src/ConvertSpectrumAxis2.cpp 273 additions, 0 deletions

.../Mantid/Framework/Algorithms/src/ConvertSpectrumAxis2.cpp
Code/Mantid/Framework/Algorithms/src/ElasticWindow.cpp 33 additions, 11 deletions

Code/Mantid/Framework/Algorithms/src/ElasticWindow.cpp
Code/Mantid/Framework/Algorithms/test/ConvertSpectrumAxis2Test.h 350 additions, 0 deletions

...ntid/Framework/Algorithms/test/ConvertSpectrumAxis2Test.h
Code/Mantid/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp 3 additions, 1 deletion

...erface/test/testhelpers/WorkspaceCreationHelperModule.cpp
Code/Mantid/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h 1 addition, 1 deletion

...stHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
Code/Mantid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp 4 additions, 2 deletions

...tid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp

with 744 additions and 15 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