Merge branch 'ornl-next' into ipeak_cleanup (935fff67) · 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

935fff67

Unverified Commit 935fff67 authored 3 years ago by Jose Borreguero Committed by GitHub 3 years ago

Downloads
- Plain Diff

Merge branch 'ornl-next' into ipeak_cleanup

parents 8d564b40 d310b4d1

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Framework/DataObjects/inc/MantidDataObjects/BasePeak.h 7 additions, 0 deletions

Framework/DataObjects/inc/MantidDataObjects/BasePeak.h
Framework/DataObjects/inc/MantidDataObjects/LeanElasticPeak.h 0 additions, 4 deletions

...ework/DataObjects/inc/MantidDataObjects/LeanElasticPeak.h
Framework/DataObjects/inc/MantidDataObjects/Peak.h 1 addition, 6 deletions

Framework/DataObjects/inc/MantidDataObjects/Peak.h
Framework/DataObjects/src/BasePeak.cpp 31 additions, 6 deletions

Framework/DataObjects/src/BasePeak.cpp
Framework/DataObjects/src/LeanElasticPeak.cpp 0 additions, 19 deletions

Framework/DataObjects/src/LeanElasticPeak.cpp
Framework/DataObjects/src/Peak.cpp 17 additions, 43 deletions

Framework/DataObjects/src/Peak.cpp
Framework/DataObjects/test/LeanElasticPeakTest.h 1 addition, 1 deletion

Framework/DataObjects/test/LeanElasticPeakTest.h
Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py 1 addition, 1 deletion

...erface/plugins/algorithms/IntegratePeaksProfileFitting.py

with 58 additions and 80 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