Skip to content
Snippets Groups Projects
Commit 9a393144 authored by Paul Gessinger's avatar Paul Gessinger
Browse files

Update submodule, fix method name

parent 938930f1
No related branches found
No related tags found
No related merge requests found
...@@ -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.volumeMaterialSharedPtr() != nullptr and m_cfg.processVolumes) {
detMatMap.second[tVolume.geoID()] = tVolume.volumeMaterialPtr(); detMatMap.second[tVolume.geoID()] = tVolume.volumeMaterialSharedPtr();
} }
// 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.surfaceMaterialSharedPtr() != nullptr) {
detMatMap.first[bSurface.geoID()] = bSurface.surfaceMaterialPtr(); detMatMap.first[bSurface.geoID()] = bSurface.surfaceMaterialSharedPtr();
} }
} }
} }
...@@ -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.surfaceMaterialSharedPtr() != nullptr and m_cfg.processRepresenting) {
detMatMap.first[rSurface.geoID()] = rSurface.surfaceMaterialPtr(); detMatMap.first[rSurface.geoID()] = rSurface.surfaceMaterialSharedPtr();
} }
// 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->surfaceMaterialSharedPtr() != nullptr) {
detMatMap.first[aSurface->geoID()] = aSurface->surfaceMaterialPtr(); detMatMap.first[aSurface->geoID()] = aSurface->surfaceMaterialSharedPtr();
} }
} }
} }
...@@ -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->surfaceMaterialSharedPtr() != nullptr) {
detMatMap.first[sSurface->geoID()] = sSurface->surfaceMaterialPtr(); detMatMap.first[sSurface->geoID()] = sSurface->surfaceMaterialSharedPtr();
} }
} }
} }
......
Subproject commit 19d57d9646a3c5ad89a55ed7f6a8fe355e77d63a Subproject commit 585704c82eb139694828f56fd729da2d94ccd451
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment