Merge branch 'main' into physmon-ttbar-tracksummary

acts-project · Oct 5, 2023 · 8c99917 · 8c99917
2 parents 365efff + 6474bd2
commit 8c99917
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Core/src/Geometry/CylinderVolumeBuilder.cpp b/Core/src/Geometry/CylinderVolumeBuilder.cpp
@@ -161,6 +161,15 @@ Acts::CylinderVolumeBuilder::trackingVolume(
   wConfig.cVolumeConfig = analyzeContent(gctx, centralLayers, centralVolumes);
   wConfig.pVolumeConfig = analyzeContent(gctx, positiveLayers, {});  // TODO
 
+  bool hasLayers = wConfig.nVolumeConfig.present ||
+                   wConfig.cVolumeConfig.present ||
+                   wConfig.pVolumeConfig.present;
+
+  if (!hasLayers) {
+    ACTS_INFO("No layers present, returning nullptr");
+    return nullptr;
+  }
+
   std::string layerConfiguration = "|";
   if (wConfig.nVolumeConfig) {
     // negative layers are present

diff --git a/Core/src/Geometry/TrackingGeometryBuilder.cpp b/Core/src/Geometry/TrackingGeometryBuilder.cpp
@@ -47,7 +47,14 @@ Acts::TrackingGeometryBuilder::trackingGeometry(
   for (auto& volumeBuilder : m_cfg.trackingVolumeBuilders) {
     // assign a new highest volume (and potentially wrap around the given
     // highest volume so far)
-    highestVolume = volumeBuilder(gctx, highestVolume, nullptr);
+    auto volume = volumeBuilder(gctx, highestVolume, nullptr);
+    if (!volume) {
+      ACTS_INFO(
+          "Received nullptr volume from builder, keeping previous highest "
+          "volume");
+    } else {
+      highestVolume = std::move(volume);
+    }
   }
 
   // create the TrackingGeometry & decorate it with the material