Merge remote-tracking branch 'origin/master' into faster_iscommonbins (a866f9a7) · Commits · mantidproject / mantid

Commit a866f9a7 authored 6 years ago by Hahn, Steven

Browse files

Merge remote-tracking branch 'origin/master' into faster_iscommonbins

parents a457c208 e2fd1964

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Framework/Algorithms/CMakeLists.txt 1 addition, 0 deletions

Framework/Algorithms/CMakeLists.txt
Framework/Algorithms/inc/MantidAlgorithms/EditInstrumentGeometry.h 2 additions, 2 deletions

.../Algorithms/inc/MantidAlgorithms/EditInstrumentGeometry.h
Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOne2.h 1 addition, 2 deletions

...orithms/inc/MantidAlgorithms/ReflectometryReductionOne2.h
Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto2.h 3 additions, 6 deletions

...hms/inc/MantidAlgorithms/ReflectometryReductionOneAuto2.h
Framework/Algorithms/inc/MantidAlgorithms/ReflectometryWorkflowBase2.h 28 additions, 4 deletions

...orithms/inc/MantidAlgorithms/ReflectometryWorkflowBase2.h
Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionPositionCorrect2.h 34 additions, 3 deletions

...inc/MantidAlgorithms/SpecularReflectionPositionCorrect2.h
Framework/Algorithms/src/CreateTransmissionWorkspace2.cpp 7 additions, 2 deletions

Framework/Algorithms/src/CreateTransmissionWorkspace2.cpp
Framework/Algorithms/src/CreateTransmissionWorkspaceAuto2.cpp 4 additions, 2 deletions

...ework/Algorithms/src/CreateTransmissionWorkspaceAuto2.cpp
Framework/Algorithms/src/ReflectometryReductionOne2.cpp 26 additions, 159 deletions

Framework/Algorithms/src/ReflectometryReductionOne2.cpp
Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp 31 additions, 29 deletions

Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
Framework/Algorithms/src/ReflectometryWorkflowBase2.cpp 125 additions, 35 deletions

Framework/Algorithms/src/ReflectometryWorkflowBase2.cpp
Framework/Algorithms/src/SpecularReflectionPositionCorrect2.cpp 278 additions, 72 deletions

...ork/Algorithms/src/SpecularReflectionPositionCorrect2.cpp
Framework/Algorithms/test/CMakeLists.txt 2 additions, 1 deletion

Framework/Algorithms/test/CMakeLists.txt
Framework/Algorithms/test/CreateTransmissionWorkspace2Test.h 17 additions, 17 deletions

Framework/Algorithms/test/CreateTransmissionWorkspace2Test.h
Framework/Algorithms/test/CreateTransmissionWorkspaceAuto2Test.h 13 additions, 8 deletions

...rk/Algorithms/test/CreateTransmissionWorkspaceAuto2Test.h
Framework/Algorithms/test/IndirectFitDataCreationHelperTest.h 186 additions, 0 deletions

...ework/Algorithms/test/IndirectFitDataCreationHelperTest.h
Framework/Algorithms/test/ReflectometryReductionOne2Test.h 84 additions, 59 deletions

Framework/Algorithms/test/ReflectometryReductionOne2Test.h
Framework/Algorithms/test/ReflectometryReductionOneAuto2Test.h 39 additions, 38 deletions

...work/Algorithms/test/ReflectometryReductionOneAuto2Test.h
Framework/Algorithms/test/SpecularReflectionPositionCorrect2Test.h 157 additions, 48 deletions

.../Algorithms/test/SpecularReflectionPositionCorrect2Test.h
Framework/DataHandling/src/MoveInstrumentComponent.cpp 4 additions, 8 deletions

Framework/DataHandling/src/MoveInstrumentComponent.cpp

with 1042 additions and 495 deletions

Please register or to comment