Merge branch 'master' into 20599_rebin2d_sofqw3_bug
Conflicts: Framework/DataObjects/src/FractionalRebinning.cpp docs/source/algorithms/SofQWNormalisedPolygon-v1.rst docs/source/algorithms/SofQWPolygon-v1.rst
Showing
- CMakeLists.txt 19 additions, 1 deletionCMakeLists.txt
- Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h 31 additions, 6 deletionsFramework/API/inc/MantidAPI/DataProcessorAlgorithm.h
- Framework/API/inc/MantidAPI/DistributedAlgorithm.h 3 additions, 1 deletionFramework/API/inc/MantidAPI/DistributedAlgorithm.h
- Framework/API/inc/MantidAPI/IPeaksWorkspace.h 19 additions, 1 deletionFramework/API/inc/MantidAPI/IPeaksWorkspace.h
- Framework/API/inc/MantidAPI/WorkspaceFactory.h 0 additions, 6 deletionsFramework/API/inc/MantidAPI/WorkspaceFactory.h
- Framework/API/inc/MantidAPI/WorkspaceGroup.h 2 additions, 1 deletionFramework/API/inc/MantidAPI/WorkspaceGroup.h
- Framework/API/src/Algorithm.cpp 35 additions, 7 deletionsFramework/API/src/Algorithm.cpp
- Framework/API/src/DataProcessorAlgorithm.cpp 103 additions, 55 deletionsFramework/API/src/DataProcessorAlgorithm.cpp
- Framework/API/src/DistributedAlgorithm.cpp 23 additions, 1 deletionFramework/API/src/DistributedAlgorithm.cpp
- Framework/API/src/FrameworkManager.cpp 2 additions, 0 deletionsFramework/API/src/FrameworkManager.cpp
- Framework/API/src/WorkspaceFactory.cpp 5 additions, 0 deletionsFramework/API/src/WorkspaceFactory.cpp
- Framework/API/src/WorkspaceGroup.cpp 2 additions, 2 deletionsFramework/API/src/WorkspaceGroup.cpp
- Framework/API/test/FunctionAttributeTest.h 9 additions, 10 deletionsFramework/API/test/FunctionAttributeTest.h
- Framework/API/test/MultiPeriodGroupWorkerTest.h 0 additions, 2 deletionsFramework/API/test/MultiPeriodGroupWorkerTest.h
- Framework/API/test/MultipleFilePropertyTest.h 31 additions, 0 deletionsFramework/API/test/MultipleFilePropertyTest.h
- Framework/Algorithms/CMakeLists.txt 10 additions, 0 deletionsFramework/Algorithms/CMakeLists.txt
- Framework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h 5 additions, 0 deletionsFramework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h
- Framework/Algorithms/inc/MantidAlgorithms/ClearMaskedSpectra.h 54 additions, 0 deletions...work/Algorithms/inc/MantidAlgorithms/ClearMaskedSpectra.h
- Framework/Algorithms/inc/MantidAlgorithms/Comment.h 2 additions, 2 deletionsFramework/Algorithms/inc/MantidAlgorithms/Comment.h
- Framework/Algorithms/inc/MantidAlgorithms/CompareWorkspaces.h 1 addition, 0 deletions...ework/Algorithms/inc/MantidAlgorithms/CompareWorkspaces.h
Loading
Please register or sign in to comment