Merge remote-tracking branch 'origin/master' into 18666_ISIS_Powder_inital_feedback_fixes
Re #18666 Fix merge conflicts
No related branches found
No related tags found
Showing
- Framework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h 0 additions, 6 deletionsFramework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h
- Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h 9 additions, 4 deletions...rk/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h
- Framework/Algorithms/inc/MantidAlgorithms/CreateLogTimeCorrection.h 15 additions, 11 deletions...Algorithms/inc/MantidAlgorithms/CreateLogTimeCorrection.h
- Framework/Algorithms/src/AddPeak.cpp 12 additions, 14 deletionsFramework/Algorithms/src/AddPeak.cpp
- Framework/Algorithms/src/CalculateDIFC.cpp 31 additions, 38 deletionsFramework/Algorithms/src/CalculateDIFC.cpp
- Framework/Algorithms/src/ConvertDiffCal.cpp 11 additions, 15 deletionsFramework/Algorithms/src/ConvertDiffCal.cpp
- Framework/Algorithms/src/ConvertSpectrumAxis.cpp 2 additions, 4 deletionsFramework/Algorithms/src/ConvertSpectrumAxis.cpp
- Framework/Algorithms/src/ConvertSpectrumAxis2.cpp 39 additions, 33 deletionsFramework/Algorithms/src/ConvertSpectrumAxis2.cpp
- Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp 3 additions, 2 deletionsFramework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
- Framework/Algorithms/src/CreateLogTimeCorrection.cpp 53 additions, 64 deletionsFramework/Algorithms/src/CreateLogTimeCorrection.cpp
- Framework/Algorithms/src/DetectorDiagnostic.cpp 5 additions, 3 deletionsFramework/Algorithms/src/DetectorDiagnostic.cpp
- Framework/Algorithms/src/FilterEvents.cpp 5 additions, 1 deletionFramework/Algorithms/src/FilterEvents.cpp
- Framework/Algorithms/src/RemoveLowResTOF.cpp 4 additions, 7 deletionsFramework/Algorithms/src/RemoveLowResTOF.cpp
- Framework/Algorithms/test/BinaryOperationTest.h 13 additions, 12 deletionsFramework/Algorithms/test/BinaryOperationTest.h
- Framework/Algorithms/test/CheckWorkspacesMatchTest.h 1 addition, 1 deletionFramework/Algorithms/test/CheckWorkspacesMatchTest.h
- Framework/Algorithms/test/CommutativeBinaryOperationTest.h 13 additions, 13 deletionsFramework/Algorithms/test/CommutativeBinaryOperationTest.h
- Framework/Algorithms/test/CompareWorkspacesTest.h 1 addition, 1 deletionFramework/Algorithms/test/CompareWorkspacesTest.h
- Framework/Algorithms/test/ConvertSpectrumAxisTest.h 36 additions, 0 deletionsFramework/Algorithms/test/ConvertSpectrumAxisTest.h
- Framework/Algorithms/test/ExponentialTest.h 1 addition, 1 deletionFramework/Algorithms/test/ExponentialTest.h
- Framework/Algorithms/test/LogarithmTest.h 1 addition, 1 deletionFramework/Algorithms/test/LogarithmTest.h
Loading
Please register or sign in to comment