Merge branch 'master' of github.com:mantidproject/mantid into...
Merge branch 'master' of github.com:mantidproject/mantid into 24126_only_show_instrument_if_ws_has_sp_axis
Showing
- Framework/API/inc/MantidAPI/AlgorithmHistory.h 0 additions, 2 deletionsFramework/API/inc/MantidAPI/AlgorithmHistory.h
- Framework/API/src/IMDWorkspace.cpp 1 addition, 1 deletionFramework/API/src/IMDWorkspace.cpp
- Framework/API/src/IndexProperty.cpp 3 additions, 0 deletionsFramework/API/src/IndexProperty.cpp
- Framework/Algorithms/src/ConvertSpectrumAxis.cpp 4 additions, 6 deletionsFramework/Algorithms/src/ConvertSpectrumAxis.cpp
- Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp 0 additions, 1 deletionFramework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
- Framework/Algorithms/test/WienerSmoothTest.h 3 additions, 2 deletionsFramework/Algorithms/test/WienerSmoothTest.h
- Framework/CMakeLists.txt 7 additions, 2 deletionsFramework/CMakeLists.txt
- Framework/CurveFitting/src/Functions/ComptonScatteringCountRate.cpp 2 additions, 3 deletions...CurveFitting/src/Functions/ComptonScatteringCountRate.cpp
- Framework/CurveFitting/test/AugmentedLagrangianOptimizerTest.h 2 additions, 2 deletions...work/CurveFitting/test/AugmentedLagrangianOptimizerTest.h
- Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h 3 additions, 1 deletionFramework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
- Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h 5 additions, 0 deletionsFramework/DataHandling/inc/MantidDataHandling/SaveAscii2.h
- Framework/DataHandling/src/EventWorkspaceCollection.cpp 0 additions, 1 deletionFramework/DataHandling/src/EventWorkspaceCollection.cpp
- Framework/DataHandling/src/LoadAscii.cpp 8 additions, 3 deletionsFramework/DataHandling/src/LoadAscii.cpp
- Framework/DataHandling/src/LoadAscii2.cpp 154 additions, 5 deletionsFramework/DataHandling/src/LoadAscii2.cpp
- Framework/DataHandling/src/LoadHFIRSANS.cpp 16 additions, 0 deletionsFramework/DataHandling/src/LoadHFIRSANS.cpp
- Framework/DataHandling/src/LoadPreNexus.cpp 3 additions, 1 deletionFramework/DataHandling/src/LoadPreNexus.cpp
- Framework/DataHandling/src/LoadTBL.cpp 8 additions, 3 deletionsFramework/DataHandling/src/LoadTBL.cpp
- Framework/DataHandling/src/SaveAscii2.cpp 146 additions, 56 deletionsFramework/DataHandling/src/SaveAscii2.cpp
- Framework/DataHandling/test/LoadAscii2Test.h 104 additions, 12 deletionsFramework/DataHandling/test/LoadAscii2Test.h
- Framework/DataHandling/test/SaveAscii2Test.h 77 additions, 0 deletionsFramework/DataHandling/test/SaveAscii2Test.h
Loading
Please register or sign in to comment