Merge pull request #24556 from mantidproject/21466_materials_without_formulas (a2535a67) · 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

a2535a67

Commit a2535a67 authored 6 years ago by Martyn Gigg

Downloads
- Plain Diff

Merge pull request #24556 from mantidproject/21466_materials_without_formulas

parents 309d54c8 24d2d1df

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Framework/API/inc/MantidAPI/Sample.h 0 additions, 1 deletion

Framework/API/inc/MantidAPI/Sample.h
Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h 2 additions, 2 deletions

Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h
Framework/DataHandling/src/ReadMaterial.cpp 37 additions, 15 deletions

Framework/DataHandling/src/ReadMaterial.cpp
Framework/DataHandling/src/SetSampleMaterial.cpp 11 additions, 10 deletions

Framework/DataHandling/src/SetSampleMaterial.cpp
Framework/DataHandling/test/ReadMaterialTest.h 92 additions, 5 deletions

Framework/DataHandling/test/ReadMaterialTest.h
Framework/Kernel/inc/MantidKernel/Atom.h 0 additions, 1 deletion

Framework/Kernel/inc/MantidKernel/Atom.h
Framework/Kernel/inc/MantidKernel/MaterialBuilder.h 1 addition, 3 deletions

Framework/Kernel/inc/MantidKernel/MaterialBuilder.h
Framework/Kernel/inc/MantidKernel/NeutronAtom.h 1 addition, 1 deletion

Framework/Kernel/inc/MantidKernel/NeutronAtom.h
Framework/Kernel/src/Atom.cpp 4 additions, 4 deletions

Framework/Kernel/src/Atom.cpp
Framework/Kernel/src/MaterialBuilder.cpp 29 additions, 31 deletions

Framework/Kernel/src/MaterialBuilder.cpp
Framework/Kernel/src/NeutronAtom.cpp 25 additions, 18 deletions

Framework/Kernel/src/NeutronAtom.cpp
Framework/Kernel/test/MaterialBuilderTest.h 63 additions, 0 deletions

Framework/Kernel/test/MaterialBuilderTest.h
docs/source/algorithms/SetSampleMaterial-v1.rst 7 additions, 10 deletions

docs/source/algorithms/SetSampleMaterial-v1.rst
docs/source/release/v3.14.0/framework.rst 3 additions, 2 deletions

docs/source/release/v3.14.0/framework.rst

with 275 additions and 103 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