Merge branch 'master' into 11395_filefinder_ignore_dirs_opt (69060944) · Commits · mantidproject / mantid

Commit 69060944 authored 10 years ago by Gigg, Martyn Anthony

Browse files

Merge branch 'master' into 11395_filefinder_ignore_dirs_opt

parents 09bab26a 88408484

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Build/CMake/FindQwt.cmake 1 addition, 1 deletion

Code/Mantid/Build/CMake/FindQwt.cmake
Code/Mantid/Build/Jenkins/buildscript 5 additions, 1 deletion

Code/Mantid/Build/Jenkins/buildscript
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py 0 additions, 5 deletions

...hms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py 158 additions, 0 deletions

...lgorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py 145 additions, 0 deletions

...gorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py 155 additions, 0 deletions

...orithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt 3 additions, 0 deletions

...onInterface/test/python/plugins/algorithms/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/IndirectAnnulusAbsorptionTest.py 91 additions, 0 deletions

...ython/plugins/algorithms/IndirectAnnulusAbsorptionTest.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/IndirectCylinderAbsorptionTest.py 79 additions, 0 deletions

...thon/plugins/algorithms/IndirectCylinderAbsorptionTest.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/IndirectFlatPlateAbsorptionTest.py 88 additions, 0 deletions

...hon/plugins/algorithms/IndirectFlatPlateAbsorptionTest.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/InelasticIndirectReductionTest.py 1 addition, 2 deletions

...thon/plugins/algorithms/InelasticIndirectReductionTest.py
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h 9 additions, 5 deletions

...faces/inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp 33 additions, 25 deletions

...Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp 32 additions, 19 deletions

Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Fury.cpp 11 additions, 7 deletions

Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Fury.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/FuryFit.cpp 16 additions, 13 deletions

...Mantid/MantidQt/CustomInterfaces/src/Indirect/FuryFit.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISCalibration.cpp 67 additions, 42 deletions

...antidQt/CustomInterfaces/src/Indirect/ISISCalibration.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISDiagnostics.cpp 27 additions, 19 deletions

...antidQt/CustomInterfaces/src/Indirect/ISISDiagnostics.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectMoments.cpp 9 additions, 7 deletions

...antidQt/CustomInterfaces/src/Indirect/IndirectMoments.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp 62 additions, 47 deletions

...idQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp

with 992 additions and 193 deletions

Please register or to comment