Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LogicalVolume: do not set material registry if addRegistry=False and registry=None #216

Merged
merged 2 commits into from
Dec 9, 2024
Merged

LogicalVolume: do not set material registry if addRegistry=False and registry=None #216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b242a68
LogicalVolume: do not set material registry if addRegistry=False
ManuelHu Dec 5, 2024
326ddfb
Merge branch 'main' into patch-1
stewartboogert Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/pyg4ometry/geant4/LogicalVolume.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ def __init__(self, solid, material, name, registry=None, addRegistry=True, **kwa

if isinstance(material, _mat.Material):
self.material = material
self.material.set_registry(registry, dontWarnIfAlreadyAdded=True)
if registry and addRegistry:
self.material.set_registry(registry, dontWarnIfAlreadyAdded=True)
elif isinstance(material, str):
# If the material is registered already, use it
if registry and material in registry.materialDict:
Expand Down
Loading