Merge remote-tracking branch 'origin/master' into 19461_find_peaks_edge (cacb2978) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

Admin message

Admins will be upgrading ORNL GitLab Servers on Saturday, 12 Apr 2025, from 8 AM until 10 AM EST. Repositories will experience intermittent outages during this time.

cacb2978

Commit cacb2978 authored 7 years ago by Lynch, Vickie

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 19461_find_peaks_edge

parents fbf2b375 ff03e2ee

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Framework/Algorithms/inc/MantidAlgorithms/Qxy.h 1 addition, 0 deletions

Framework/Algorithms/inc/MantidAlgorithms/Qxy.h
Framework/Algorithms/src/Qxy.cpp 30 additions, 14 deletions

Framework/Algorithms/src/Qxy.cpp
Framework/Crystal/inc/MantidCrystal/PredictPeaks.h 2 additions, 1 deletion

Framework/Crystal/inc/MantidCrystal/PredictPeaks.h
Framework/Crystal/src/PredictPeaks.cpp 57 additions, 2 deletions

Framework/Crystal/src/PredictPeaks.cpp
Framework/Crystal/test/PredictPeaksTest.h 6 additions, 2 deletions

Framework/Crystal/test/PredictPeaksTest.h
Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py 21 additions, 3 deletions

...PythonInterface/plugins/algorithms/CreateCacheFilename.py
Testing/SystemTests/lib/systemtests/stresstesting.py 1 addition, 0 deletions

Testing/SystemTests/lib/systemtests/stresstesting.py
Testing/SystemTests/scripts/InstallerTests.py 32 additions, 52 deletions

Testing/SystemTests/scripts/InstallerTests.py
Testing/SystemTests/scripts/mantidinstaller.py 33 additions, 27 deletions

Testing/SystemTests/scripts/mantidinstaller.py
Testing/SystemTests/scripts/runSystemTests.py 17 additions, 16 deletions

Testing/SystemTests/scripts/runSystemTests.py
buildconfig/Jenkins/systemtests 7 additions, 3 deletions

buildconfig/Jenkins/systemtests
docs/source/concepts/ORNL_SANS_Reduction.rst 2 additions, 2 deletions

docs/source/concepts/ORNL_SANS_Reduction.rst
docs/source/release/v3.10.0/diffraction.rst 1 addition, 0 deletions

docs/source/release/v3.10.0/diffraction.rst

with 210 additions and 122 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment