Merge remote-tracking branch 'origin/master' into 11467_fix_leaks_in_ComputeResourInfo_XML_parsing (7613fc16) · Commits · mantidproject / mantid

Commit 7613fc16 authored 9 years ago by Peterson, Peter

Browse files

Merge remote-tracking branch 'origin/master' into 11467_fix_leaks_in_ComputeResourInfo_XML_parsing

parents 7df52ce5 8b276ddc

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/DataObjects/CMakeLists.txt 7 additions, 1 deletion

Code/Mantid/Framework/DataObjects/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py 30 additions, 18 deletions

...ythonInterface/plugins/algorithms/IndirectTransmission.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py 561 additions, 0 deletions

...rface/plugins/algorithms/LiquidsReflectometryReduction.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py 42 additions, 4 deletions

...ework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateMD.py 232 additions, 0 deletions

...terface/plugins/algorithms/WorkflowAlgorithms/CreateMD.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/dnsdata.py 2 additions, 0 deletions

...d/Framework/PythonInterface/plugins/algorithms/dnsdata.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CreateMDTest.py 134 additions, 0 deletions

...nInterface/test/python/plugins/algorithms/CreateMDTest.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py 23 additions, 0 deletions

...est/python/plugins/algorithms/IndirectTransmissionTest.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py 6 additions, 7 deletions

...rface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
Code/Mantid/Framework/WorkflowAlgorithms/src/RefReduction.cpp 4 additions, 4 deletions

.../Mantid/Framework/WorkflowAlgorithms/src/RefReduction.cpp
Code/Mantid/Framework/WorkflowAlgorithms/src/RefRoi.cpp 60 additions, 22 deletions

Code/Mantid/Framework/WorkflowAlgorithms/src/RefRoi.cpp
Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt 4 additions, 0 deletions

Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.h 41 additions, 0 deletions

...MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.h
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.ui 745 additions, 0 deletions

...antidQtCustomInterfaces/Indirect/AbsorptionCorrections.ui
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h 2 additions, 1 deletion

.../MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui 145 additions, 141 deletions

...MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.ui 0 additions, 1 deletion

...idQtCustomInterfaces/Indirect/IndirectTransmissionCalc.ui
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/UserInputValidator.h 2 additions, 2 deletions

...erfaces/inc/MantidQtCustomInterfaces/UserInputValidator.h
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/AbsorptionCorrections.cpp 279 additions, 0 deletions

...t/CustomInterfaces/src/Indirect/AbsorptionCorrections.cpp
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp 2 additions, 0 deletions

...Qt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp

with 2321 additions and 201 deletions

Please register or to comment