From 9a3931442a3a9432f7da13f667e9dd62af8410a8 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Mon, 15 Jul 2019 11:36:42 +0200
Subject: [PATCH 1/3] Update submodule, fix method name
---
Plugins/Root/src/RootMaterialWriter.cpp | 20 ++++++++++----------
external/acts-core | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Plugins/Root/src/RootMaterialWriter.cpp b/Plugins/Root/src/RootMaterialWriter.cpp
index a00523d42..8e3c9e8cb 100644
--- a/Plugins/Root/src/RootMaterialWriter.cpp
+++ b/Plugins/Root/src/RootMaterialWriter.cpp
@@ -235,8 +235,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
{
// If the volume has volume material, write that
- if (tVolume.volumeMaterialPtr() != nullptr and m_cfg.processVolumes) {
- detMatMap.second[tVolume.geoID()] = tVolume.volumeMaterialPtr();
+ if (tVolume.volumeMaterialSharedPtr() != nullptr and m_cfg.processVolumes) {
+ detMatMap.second[tVolume.geoID()] = tVolume.volumeMaterialSharedPtr();
}
// If confined layers exist, loop over them and collect the layer material
@@ -250,8 +250,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
if (m_cfg.processBoundaries) {
for (auto& bou : tVolume.boundarySurfaces()) {
const auto& bSurface = bou->surfaceRepresentation();
- if (bSurface.surfaceMaterialPtr() != nullptr) {
- detMatMap.first[bSurface.geoID()] = bSurface.surfaceMaterialPtr();
+ if (bSurface.surfaceMaterialSharedPtr() != nullptr) {
+ detMatMap.first[bSurface.geoID()] = bSurface.surfaceMaterialSharedPtr();
}
}
}
@@ -271,15 +271,15 @@ FW::Root::RootMaterialWriter::collectMaterial(
{
// If the representing surface has material, collect it
const auto& rSurface = tLayer.surfaceRepresentation();
- if (rSurface.surfaceMaterialPtr() != nullptr and m_cfg.processRepresenting) {
- detMatMap.first[rSurface.geoID()] = rSurface.surfaceMaterialPtr();
+ if (rSurface.surfaceMaterialSharedPtr() != nullptr and m_cfg.processRepresenting) {
+ detMatMap.first[rSurface.geoID()] = rSurface.surfaceMaterialSharedPtr();
}
// Check the approach surfaces
if (tLayer.approachDescriptor() != nullptr and m_cfg.processApproaches) {
for (auto& aSurface : tLayer.approachDescriptor()->containedSurfaces()) {
- if (aSurface->surfaceMaterialPtr() != nullptr) {
- detMatMap.first[aSurface->geoID()] = aSurface->surfaceMaterialPtr();
+ if (aSurface->surfaceMaterialSharedPtr() != nullptr) {
+ detMatMap.first[aSurface->geoID()] = aSurface->surfaceMaterialSharedPtr();
}
}
}
@@ -288,8 +288,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
if (tLayer.surfaceArray() != nullptr and m_cfg.processSensitives) {
// sensitive surface loop
for (auto& sSurface : tLayer.surfaceArray()->surfaces()) {
- if (sSurface->surfaceMaterialPtr() != nullptr) {
- detMatMap.first[sSurface->geoID()] = sSurface->surfaceMaterialPtr();
+ if (sSurface->surfaceMaterialSharedPtr() != nullptr) {
+ detMatMap.first[sSurface->geoID()] = sSurface->surfaceMaterialSharedPtr();
}
}
}
diff --git a/external/acts-core b/external/acts-core
index 19d57d964..585704c82 160000
--- a/external/acts-core
+++ b/external/acts-core
@@ -1 +1 @@
-Subproject commit 19d57d9646a3c5ad89a55ed7f6a8fe355e77d63a
+Subproject commit 585704c82eb139694828f56fd729da2d94ccd451
--
GitLab
From f0f825c90fc52edeedca7af7dd502d21f3abf7a1 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Mon, 15 Jul 2019 12:25:00 +0200
Subject: [PATCH 2/3] fix format
---
Plugins/Root/src/RootMaterialWriter.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Plugins/Root/src/RootMaterialWriter.cpp b/Plugins/Root/src/RootMaterialWriter.cpp
index 8e3c9e8cb..2244cabaf 100644
--- a/Plugins/Root/src/RootMaterialWriter.cpp
+++ b/Plugins/Root/src/RootMaterialWriter.cpp
@@ -271,7 +271,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
{
// If the representing surface has material, collect it
const auto& rSurface = tLayer.surfaceRepresentation();
- if (rSurface.surfaceMaterialSharedPtr() != nullptr and m_cfg.processRepresenting) {
+ if (rSurface.surfaceMaterialSharedPtr() != nullptr
+ and m_cfg.processRepresenting) {
detMatMap.first[rSurface.geoID()] = rSurface.surfaceMaterialSharedPtr();
}
@@ -279,7 +280,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
if (tLayer.approachDescriptor() != nullptr and m_cfg.processApproaches) {
for (auto& aSurface : tLayer.approachDescriptor()->containedSurfaces()) {
if (aSurface->surfaceMaterialSharedPtr() != nullptr) {
- detMatMap.first[aSurface->geoID()] = aSurface->surfaceMaterialSharedPtr();
+ detMatMap.first[aSurface->geoID()]
+ = aSurface->surfaceMaterialSharedPtr();
}
}
}
@@ -289,7 +291,8 @@ FW::Root::RootMaterialWriter::collectMaterial(
// sensitive surface loop
for (auto& sSurface : tLayer.surfaceArray()->surfaces()) {
if (sSurface->surfaceMaterialSharedPtr() != nullptr) {
- detMatMap.first[sSurface->geoID()] = sSurface->surfaceMaterialSharedPtr();
+ detMatMap.first[sSurface->geoID()]
+ = sSurface->surfaceMaterialSharedPtr();
}
}
}
--
GitLab
From 8631c67f86ecd9a0cb73f237f9481a7fbe2b0bb5 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Mon, 15 Jul 2019 12:26:35 +0200
Subject: [PATCH 3/3] update core submodule to v0.9.4
---
external/acts-core | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/external/acts-core b/external/acts-core
index 585704c82..e5dd9fbe1 160000
--- a/external/acts-core
+++ b/external/acts-core
@@ -1 +1 @@
-Subproject commit 585704c82eb139694828f56fd729da2d94ccd451
+Subproject commit e5dd9fbe179201e70347d1a3b9fa1899c226798f
--
GitLab