Merge remote-tracking branch 'origin/master' into 13265_script_abort_functionality (79873b4b) · Commits · mantidproject / mantid

Commit 79873b4b authored 9 years ago by Martyn Gigg

Merge remote-tracking branch 'origin/master' into 13265_script_abort_functionality

Conflicts:
	Code/Mantid/MantidPlot/src/PythonScripting.cpp
Refs #13265

parents e3d39968 87600689

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/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h 52 additions, 45 deletions

...Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h
Code/Mantid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp 205 additions, 221 deletions

...ntid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp
Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h 6 additions, 7 deletions

...d/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
Code/Mantid/Framework/Geometry/src/Instrument.cpp 5 additions, 5 deletions

Code/Mantid/Framework/Geometry/src/Instrument.cpp
Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Environment/CallMethod.h 1 addition, 1 deletion

...inc/MantidPythonInterface/kernel/Environment/CallMethod.h
Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Environment/GlobalInterpreterLock.h 29 additions, 27 deletions

...ythonInterface/kernel/Environment/GlobalInterpreterLock.h
Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PythonObjectInstantiator.h 1 addition, 1 deletion

...c/MantidPythonInterface/kernel/PythonObjectInstantiator.h
Code/Mantid/Framework/PythonInterface/mantid/api/src/Algorithms/RunPythonScript.cpp 1 addition, 1 deletion

...onInterface/mantid/api/src/Algorithms/RunPythonScript.cpp
Code/Mantid/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp 1 addition, 1 deletion

...rface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp
Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt 2 additions, 2 deletions

...id/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Environment/ErrorHandling.cpp 1 addition, 1 deletion

...Interface/mantid/kernel/src/Environment/ErrorHandling.cpp
Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Environment/GlobalInterpreterLock.cpp 47 additions, 0 deletions

...e/mantid/kernel/src/Environment/GlobalInterpreterLock.cpp
Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Environment/Threading.cpp 0 additions, 45 deletions

...thonInterface/mantid/kernel/src/Environment/Threading.cpp
Code/Mantid/Framework/PythonInterface/mantid/kernel/src/kernel.cpp.in 10 additions, 13 deletions

...Framework/PythonInterface/mantid/kernel/src/kernel.cpp.in
Code/Mantid/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py 100 additions, 62 deletions

...ework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py 44 additions, 35 deletions

...Interface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/dnsdata.py 5 additions, 1 deletion

...d/Framework/PythonInterface/plugins/algorithms/dnsdata.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/ISISIndirectDiffractionReductionTest.py 126 additions, 21 deletions

...lugins/algorithms/ISISIndirectDiffractionReductionTest.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/ISISIndirectEnergyTransferTest.py 113 additions, 0 deletions

...thon/plugins/algorithms/ISISIndirectEnergyTransferTest.py
Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py 24 additions, 1 deletion

...rface/test/python/plugins/algorithms/LoadDNSLegacyTest.py

with 773 additions and 490 deletions

Please register or to comment