Refs #17289 resolve merge issues
# Conflicts: # docs/source/release/v3.9.0/indirect_inelastic.rst
Showing
- Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h 0 additions, 9 deletionsFramework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
- Framework/Algorithms/inc/MantidAlgorithms/NormaliseByDetector.h 4 additions, 4 deletions...ork/Algorithms/inc/MantidAlgorithms/NormaliseByDetector.h
- Framework/Algorithms/inc/MantidAlgorithms/NormaliseToMonitor.h 11 additions, 2 deletions...work/Algorithms/inc/MantidAlgorithms/NormaliseToMonitor.h
- Framework/Algorithms/inc/MantidAlgorithms/PDFFourierTransform.h 1 addition, 0 deletions...ork/Algorithms/inc/MantidAlgorithms/PDFFourierTransform.h
- Framework/Algorithms/inc/MantidAlgorithms/Q1D2.h 29 additions, 19 deletionsFramework/Algorithms/inc/MantidAlgorithms/Q1D2.h
- Framework/Algorithms/inc/MantidAlgorithms/Rebin2D.h 3 additions, 5 deletionsFramework/Algorithms/inc/MantidAlgorithms/Rebin2D.h
- Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOne.h 0 additions, 5 deletions...gorithms/inc/MantidAlgorithms/ReflectometryReductionOne.h
- Framework/Algorithms/inc/MantidAlgorithms/SampleCorrections/MayersSampleCorrectionStrategy.h 10 additions, 13 deletions...rithms/SampleCorrections/MayersSampleCorrectionStrategy.h
- Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h 8 additions, 6 deletionsFramework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h
- Framework/Algorithms/inc/MantidAlgorithms/UnwrapSNS.h 2 additions, 1 deletionFramework/Algorithms/inc/MantidAlgorithms/UnwrapSNS.h
- Framework/Algorithms/inc/MantidAlgorithms/WienerSmooth.h 5 additions, 3 deletionsFramework/Algorithms/inc/MantidAlgorithms/WienerSmooth.h
- Framework/Algorithms/src/BinaryOperation.cpp 1 addition, 52 deletionsFramework/Algorithms/src/BinaryOperation.cpp
- Framework/Algorithms/src/ConvertUnits.cpp 7 additions, 7 deletionsFramework/Algorithms/src/ConvertUnits.cpp
- Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp 0 additions, 2 deletionsFramework/Algorithms/src/DetectorEfficiencyCorUser.cpp
- Framework/Algorithms/src/GetEiMonDet2.cpp 1 addition, 0 deletionsFramework/Algorithms/src/GetEiMonDet2.cpp
- Framework/Algorithms/src/NormaliseByCurrent.cpp 2 additions, 2 deletionsFramework/Algorithms/src/NormaliseByCurrent.cpp
- Framework/Algorithms/src/NormaliseByDetector.cpp 12 additions, 16 deletionsFramework/Algorithms/src/NormaliseByDetector.cpp
- Framework/Algorithms/src/NormaliseToMonitor.cpp 43 additions, 40 deletionsFramework/Algorithms/src/NormaliseToMonitor.cpp
- Framework/Algorithms/src/PDCalibration.cpp 3 additions, 3 deletionsFramework/Algorithms/src/PDCalibration.cpp
- Framework/Algorithms/src/PDFFourierTransform.cpp 12 additions, 10 deletionsFramework/Algorithms/src/PDFFourierTransform.cpp
Loading
Please register or sign in to comment