From d5a4b3c806a6571d84c62b3e06d5afa00b9e8b09 Mon Sep 17 00:00:00 2001
From: Thomas Latham <T.Latham@warwick.ac.uk>
Date: Wed, 15 May 2024 22:31:30 +0100
Subject: [PATCH] Enhance handling of transformations in VolumeBuilder
---
DDCore/include/XML/VolumeBuilder.h | 2 ++
DDCore/src/XML/VolumeBuilder.cpp | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/DDCore/include/XML/VolumeBuilder.h b/DDCore/include/XML/VolumeBuilder.h
index 1e66570bf..777626314 100644
--- a/DDCore/include/XML/VolumeBuilder.h
+++ b/DDCore/include/XML/VolumeBuilder.h
@@ -187,6 +187,8 @@ namespace dd4hep {
/// Collect a set of materials from the leafs of an xml tag
size_t collectMaterials(Handle_t element);
+ /// Access element from transformation cache by name
+ Transform3D getTransform(const std::string& nam) const;
/// Access element from shape cache by name. Invalid returns means 'veto'. Otherwise exception
Solid getShape(const std::string& nam) const;
/// Create a new shape from the information given in the xml handle
diff --git a/DDCore/src/XML/VolumeBuilder.cpp b/DDCore/src/XML/VolumeBuilder.cpp
index b9929e099..1d5ec3c51 100644
--- a/DDCore/src/XML/VolumeBuilder.cpp
+++ b/DDCore/src/XML/VolumeBuilder.cpp
@@ -94,6 +94,15 @@ dd4hep::Volume VolumeBuilder::volume(const std::string& nam) const {
return vol;
}
+/// Access element from transformation cache by name
+dd4hep::Transform3D VolumeBuilder::getTransform(const std::string& nam) const {
+ auto it = transformations.find(nam);
+ if ( it == transformations.end() ) {
+ except("VolumeBuilder","+++ Tranformation %s is not known to this builder unit. ",nam.c_str());
+ }
+ return (*it).second.second;
+}
+
/// Access element from shape cache by name. Invalid returns means 'veto'. Otherwise exception
dd4hep::Solid VolumeBuilder::getShape(const std::string& nam) const {
auto is = shapes.find(nam);
@@ -434,6 +443,7 @@ std::size_t VolumeBuilder::load(xml_h element, const std::string& tag) {
"++ Processing xml document %s.", doc->uri().c_str());
included_docs[ref] = std::unique_ptr<xml::DocumentHolder>(doc.release());
buildShapes(vols);
+ buildTransformations(vols);
buildVolumes(vols);
++count;
}
--
GitLab