Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
acts-framework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Gabriel Farrugia
acts-framework
Commits
9a393144
Commit
9a393144
authored
5 years ago
by
Paul Gessinger
Browse files
Options
Downloads
Patches
Plain Diff
Update submodule, fix method name
parent
938930f1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Plugins/Root/src/RootMaterialWriter.cpp
+10
-10
10 additions, 10 deletions
Plugins/Root/src/RootMaterialWriter.cpp
external/acts-core
+1
-1
1 addition, 1 deletion
external/acts-core
with
11 additions
and
11 deletions
Plugins/Root/src/RootMaterialWriter.cpp
+
10
−
10
View file @
9a393144
...
@@ -235,8 +235,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
...
@@ -235,8 +235,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
{
{
// If the volume has volume material, write that
// If the volume has volume material, write that
if
(
tVolume
.
volumeMaterialPtr
()
!=
nullptr
and
m_cfg
.
processVolumes
)
{
if
(
tVolume
.
volumeMaterial
Shared
Ptr
()
!=
nullptr
and
m_cfg
.
processVolumes
)
{
detMatMap
.
second
[
tVolume
.
geoID
()]
=
tVolume
.
volumeMaterialPtr
();
detMatMap
.
second
[
tVolume
.
geoID
()]
=
tVolume
.
volumeMaterial
Shared
Ptr
();
}
}
// If confined layers exist, loop over them and collect the layer material
// If confined layers exist, loop over them and collect the layer material
...
@@ -250,8 +250,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
...
@@ -250,8 +250,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
if
(
m_cfg
.
processBoundaries
)
{
if
(
m_cfg
.
processBoundaries
)
{
for
(
auto
&
bou
:
tVolume
.
boundarySurfaces
())
{
for
(
auto
&
bou
:
tVolume
.
boundarySurfaces
())
{
const
auto
&
bSurface
=
bou
->
surfaceRepresentation
();
const
auto
&
bSurface
=
bou
->
surfaceRepresentation
();
if
(
bSurface
.
surfaceMaterialPtr
()
!=
nullptr
)
{
if
(
bSurface
.
surfaceMaterial
Shared
Ptr
()
!=
nullptr
)
{
detMatMap
.
first
[
bSurface
.
geoID
()]
=
bSurface
.
surfaceMaterialPtr
();
detMatMap
.
first
[
bSurface
.
geoID
()]
=
bSurface
.
surfaceMaterial
Shared
Ptr
();
}
}
}
}
}
}
...
@@ -271,15 +271,15 @@ FW::Root::RootMaterialWriter::collectMaterial(
...
@@ -271,15 +271,15 @@ FW::Root::RootMaterialWriter::collectMaterial(
{
{
// If the representing surface has material, collect it
// If the representing surface has material, collect it
const
auto
&
rSurface
=
tLayer
.
surfaceRepresentation
();
const
auto
&
rSurface
=
tLayer
.
surfaceRepresentation
();
if
(
rSurface
.
surfaceMaterialPtr
()
!=
nullptr
and
m_cfg
.
processRepresenting
)
{
if
(
rSurface
.
surfaceMaterial
Shared
Ptr
()
!=
nullptr
and
m_cfg
.
processRepresenting
)
{
detMatMap
.
first
[
rSurface
.
geoID
()]
=
rSurface
.
surfaceMaterialPtr
();
detMatMap
.
first
[
rSurface
.
geoID
()]
=
rSurface
.
surfaceMaterial
Shared
Ptr
();
}
}
// Check the approach surfaces
// Check the approach surfaces
if
(
tLayer
.
approachDescriptor
()
!=
nullptr
and
m_cfg
.
processApproaches
)
{
if
(
tLayer
.
approachDescriptor
()
!=
nullptr
and
m_cfg
.
processApproaches
)
{
for
(
auto
&
aSurface
:
tLayer
.
approachDescriptor
()
->
containedSurfaces
())
{
for
(
auto
&
aSurface
:
tLayer
.
approachDescriptor
()
->
containedSurfaces
())
{
if
(
aSurface
->
surfaceMaterialPtr
()
!=
nullptr
)
{
if
(
aSurface
->
surfaceMaterial
Shared
Ptr
()
!=
nullptr
)
{
detMatMap
.
first
[
aSurface
->
geoID
()]
=
aSurface
->
surfaceMaterialPtr
();
detMatMap
.
first
[
aSurface
->
geoID
()]
=
aSurface
->
surfaceMaterial
Shared
Ptr
();
}
}
}
}
}
}
...
@@ -288,8 +288,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
...
@@ -288,8 +288,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
if
(
tLayer
.
surfaceArray
()
!=
nullptr
and
m_cfg
.
processSensitives
)
{
if
(
tLayer
.
surfaceArray
()
!=
nullptr
and
m_cfg
.
processSensitives
)
{
// sensitive surface loop
// sensitive surface loop
for
(
auto
&
sSurface
:
tLayer
.
surfaceArray
()
->
surfaces
())
{
for
(
auto
&
sSurface
:
tLayer
.
surfaceArray
()
->
surfaces
())
{
if
(
sSurface
->
surfaceMaterialPtr
()
!=
nullptr
)
{
if
(
sSurface
->
surfaceMaterial
Shared
Ptr
()
!=
nullptr
)
{
detMatMap
.
first
[
sSurface
->
geoID
()]
=
sSurface
->
surfaceMaterialPtr
();
detMatMap
.
first
[
sSurface
->
geoID
()]
=
sSurface
->
surfaceMaterial
Shared
Ptr
();
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
acts-core
@
585704c8
Compare
19d57d96
...
585704c8
Subproject commit
19d57d9646a3c5ad89a55ed7f6a8fe355e77d63a
Subproject commit
585704c82eb139694828f56fd729da2d94ccd451
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment