Skip to content

allowing xml file for materials#2333

Merged
paulromano merged 2 commits intodevelopfrom
optional_materials_when_loading_geometry_2
Jan 11, 2023
Merged

allowing xml file for materials#2333
paulromano merged 2 commits intodevelopfrom
optional_materials_when_loading_geometry_2

Conversation

@shimwell
Copy link
Copy Markdown
Member

This PR replaces #2326 which got a bit conflicted with the develop branch after #2291 was merged in.

This PR attempts to allow the materials.xml filename / filepath to be specified when creating a geometry from a xml file. Perhaps this is slightly more flexible that the hard coded use of 'materials.xml' which we have currently.

I have added to the existing test to check the geometry is still loaded for a few different combinations of arguments.

Also it opens up the potential use of materials=None to pass in no materials. In the longer term I would be keen to propose the option of no materials when loading the geometry.

Copy link
Copy Markdown
Contributor

@paulromano paulromano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @shimwell. Two trivial change requests:

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
@shimwell shimwell requested a review from paulromano January 11, 2023 12:51
Copy link
Copy Markdown
Contributor

@paulromano paulromano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @shimwell!

@paulromano paulromano merged commit 02abb63 into develop Jan 11, 2023
@shimwell shimwell deleted the optional_materials_when_loading_geometry_2 branch February 4, 2023 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants