Merge branch 'master'
of https://github.com/mantidproject/mantid into 22318_workspace_documentation
No related branches found
No related tags found
Showing
- CMakeLists.txt 17 additions, 11 deletionsCMakeLists.txt
- Framework/API/inc/MantidAPI/IFunction1D.h 7 additions, 0 deletionsFramework/API/inc/MantidAPI/IFunction1D.h
- Framework/API/inc/MantidAPI/IFunction1D.tcc 84 additions, 0 deletionsFramework/API/inc/MantidAPI/IFunction1D.tcc
- Framework/API/inc/MantidAPI/IPeakFunction.h 3 additions, 3 deletionsFramework/API/inc/MantidAPI/IPeakFunction.h
- Framework/API/src/IFunction.cpp 21 additions, 21 deletionsFramework/API/src/IFunction.cpp
- Framework/API/src/IFunction1D.cpp 7 additions, 2 deletionsFramework/API/src/IFunction1D.cpp
- Framework/API/src/IPeakFunction.cpp 18 additions, 0 deletionsFramework/API/src/IPeakFunction.cpp
- Framework/Algorithms/test/DiffractionFocussing2Test.h 1 addition, 1 deletionFramework/Algorithms/test/DiffractionFocussing2Test.h
- Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h 5 additions, 2 deletions.../DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h
- Framework/DataHandling/src/LoadILLDiffraction.cpp 104 additions, 12 deletionsFramework/DataHandling/src/LoadILLDiffraction.cpp
- Framework/DataHandling/src/LoadSampleShape.cpp 129 additions, 3 deletionsFramework/DataHandling/src/LoadSampleShape.cpp
- Framework/DataHandling/test/LoadILLDiffractionTest.h 54 additions, 0 deletionsFramework/DataHandling/test/LoadILLDiffractionTest.h
- Framework/DataHandling/test/LoadIsawDetCalTest.h 22 additions, 11 deletionsFramework/DataHandling/test/LoadIsawDetCalTest.h
- Framework/DataHandling/test/LoadSampleShapeTest.h 75 additions, 7 deletionsFramework/DataHandling/test/LoadSampleShapeTest.h
- Framework/DataHandling/test/SaveMaskTest.h 4 additions, 2 deletionsFramework/DataHandling/test/SaveMaskTest.h
- Framework/Geometry/CMakeLists.txt 1 addition, 1 deletionFramework/Geometry/CMakeLists.txt
- Framework/Geometry/src/Instrument/StructuredDetector.cpp 3 additions, 9 deletionsFramework/Geometry/src/Instrument/StructuredDetector.cpp
- Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h 3 additions, 4 deletions...ntidPythonInterface/api/FitFunctions/IFunction1DAdapter.h
- Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h 17 additions, 7 deletions...MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h
- Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h 6 additions, 3 deletions...idPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h
Loading
Please register or sign in to comment