Merge branch 'master' into 20443_CreateWorkspace_slow
Showing
- Framework/API/inc/MantidAPI/AnalysisDataService.h 22 additions, 22 deletionsFramework/API/inc/MantidAPI/AnalysisDataService.h
- Framework/API/inc/MantidAPI/Workspace.h 1 addition, 0 deletionsFramework/API/inc/MantidAPI/Workspace.h
- Framework/API/inc/MantidAPI/WorkspaceGroup.h 1 addition, 0 deletionsFramework/API/inc/MantidAPI/WorkspaceGroup.h
- Framework/API/src/AnalysisDataService.cpp 41 additions, 0 deletionsFramework/API/src/AnalysisDataService.cpp
- Framework/API/test/AnalysisDataServiceTest.h 63 additions, 5 deletionsFramework/API/test/AnalysisDataServiceTest.h
- Framework/API/test/FrameworkManagerTest.h 6 additions, 0 deletionsFramework/API/test/FrameworkManagerTest.h
- Framework/API/test/MatrixWorkspaceTest.h 5 additions, 0 deletionsFramework/API/test/MatrixWorkspaceTest.h
- Framework/API/test/WorkspaceGroupTest.h 5 additions, 0 deletionsFramework/API/test/WorkspaceGroupTest.h
- Framework/Algorithms/CMakeLists.txt 3 additions, 0 deletionsFramework/Algorithms/CMakeLists.txt
- Framework/Algorithms/inc/MantidAlgorithms/SortXAxis.h 81 additions, 0 deletionsFramework/Algorithms/inc/MantidAlgorithms/SortXAxis.h
- Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h 3 additions, 6 deletionsFramework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
- Framework/Algorithms/src/AppendSpectra.cpp 24 additions, 23 deletionsFramework/Algorithms/src/AppendSpectra.cpp
- Framework/Algorithms/src/ConjoinWorkspaces.cpp 9 additions, 7 deletionsFramework/Algorithms/src/ConjoinWorkspaces.cpp
- Framework/Algorithms/src/SortXAxis.cpp 265 additions, 0 deletionsFramework/Algorithms/src/SortXAxis.cpp
- Framework/Algorithms/src/WorkspaceJoiners.cpp 14 additions, 12 deletionsFramework/Algorithms/src/WorkspaceJoiners.cpp
- Framework/Algorithms/test/AppendSpectraTest.h 5 additions, 2 deletionsFramework/Algorithms/test/AppendSpectraTest.h
- Framework/Algorithms/test/ConvertSpectrumAxis2Test.h 0 additions, 1 deletionFramework/Algorithms/test/ConvertSpectrumAxis2Test.h
- Framework/Algorithms/test/ConvertSpectrumAxisTest.h 0 additions, 1 deletionFramework/Algorithms/test/ConvertSpectrumAxisTest.h
- Framework/Algorithms/test/ConvertToMatrixWorkspaceTest.h 0 additions, 1 deletionFramework/Algorithms/test/ConvertToMatrixWorkspaceTest.h
- Framework/Algorithms/test/InterpolationOptionTest.h 0 additions, 1 deletionFramework/Algorithms/test/InterpolationOptionTest.h
Loading
Please register or sign in to comment