Merge branch 'master' into 21507-workbench-algorithm-progress
No related branches found
No related tags found
Showing
- Framework/API/inc/MantidAPI/IPeaksWorkspace.h 19 additions, 1 deletionFramework/API/inc/MantidAPI/IPeaksWorkspace.h
- Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h 18 additions, 9 deletions...ataHandling/inc/MantidDataHandling/LoadILLReflectometry.h
- Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h 2 additions, 2 deletions.../DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h
- Framework/DataHandling/src/LoadILLReflectometry.cpp 239 additions, 142 deletionsFramework/DataHandling/src/LoadILLReflectometry.cpp
- Framework/DataHandling/src/SaveNexusProcessed.cpp 23 additions, 15 deletionsFramework/DataHandling/src/SaveNexusProcessed.cpp
- Framework/DataHandling/src/SetSampleMaterial.cpp 7 additions, 8 deletionsFramework/DataHandling/src/SetSampleMaterial.cpp
- Framework/DataHandling/test/LoadILLReflectometryTest.h 158 additions, 14 deletionsFramework/DataHandling/test/LoadILLReflectometryTest.h
- Framework/DataHandling/test/SetSampleMaterialTest.h 4 additions, 4 deletionsFramework/DataHandling/test/SetSampleMaterialTest.h
- Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h 9 additions, 0 deletionsFramework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
- Framework/DataObjects/src/PeaksWorkspace.cpp 47 additions, 0 deletionsFramework/DataObjects/src/PeaksWorkspace.cpp
- Framework/DataObjects/test/PeaksWorkspaceTest.h 169 additions, 61 deletionsFramework/DataObjects/test/PeaksWorkspaceTest.h
- Framework/Kernel/inc/MantidKernel/Material.h 20 additions, 15 deletionsFramework/Kernel/inc/MantidKernel/Material.h
- Framework/Kernel/src/Material.cpp 37 additions, 27 deletionsFramework/Kernel/src/Material.cpp
- Framework/Kernel/src/NeutronAtom.cpp 10 additions, 2 deletionsFramework/Kernel/src/NeutronAtom.cpp
- Framework/PythonInterface/CMakeLists.txt 0 additions, 1 deletionFramework/PythonInterface/CMakeLists.txt
- Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/DateAndTime.h 46 additions, 0 deletions...inc/MantidPythonInterface/kernel/Converters/DateAndTime.h
- Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/NumpyFunctions.h 3 additions, 0 deletions.../MantidPythonInterface/kernel/Converters/NumpyFunctions.h
- Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp 3 additions, 1 deletion...ythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
- Framework/PythonInterface/mantid/kernel/CMakeLists.txt 2 additions, 0 deletionsFramework/PythonInterface/mantid/kernel/CMakeLists.txt
- Framework/PythonInterface/mantid/kernel/src/Converters/CloneToNumpy.cpp 28 additions, 0 deletions...onInterface/mantid/kernel/src/Converters/CloneToNumpy.cpp
Loading
Please register or sign in to comment