From 01c836e55ddf0f6a7df813f795d469a6a8cc375c Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Sat, 18 Jan 2025 08:48:19 +0100
Subject: [PATCH] Use GeoIdentifier & nametag from deduplicator
---
.../GeoModelXML/GeoModelXml/src/AssemblyProcessor.cxx | 4 ++--
.../GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/AssemblyProcessor.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/AssemblyProcessor.cxx
index 8c1b225d0..e893f7b06 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/AssemblyProcessor.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/AssemblyProcessor.cxx
@@ -50,7 +50,7 @@ void AssemblyProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, Geo
//
// Name
AssemblyStore& store {m_map[name]};
- physVolName = make_intrusive<GeoNameTag>(name);
+ physVolName = nameTag(name);
store.name = physVolName;
} else { // Already in the registry; use it.
physVolName = entry->second.name;
@@ -58,7 +58,7 @@ void AssemblyProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, Geo
lv = gmxUtil.getAssemblyLV();
toAdd.push_back(physVolName);
gmxUtil.positionIndex.setCopyNo(m_map[name].id);
- toAdd.push_back(make_intrusive<GeoIdentifierTag>(m_map[name].id++));
+ toAdd.push_back(geoId(m_map[name].id++));
//
// Process the assembly's children
//
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx
index 8638d8794..11251f58f 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/LogvolProcessor.cxx
@@ -115,7 +115,7 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
//
LogVolStore* store{&m_map[name]};
if(isNamed) {
- nameTag_physVolName = make_intrusive<GeoNameTag>(name);
+ nameTag_physVolName = nameTag(name);
store->name = nameTag_physVolName;
}
//
@@ -228,15 +228,15 @@ void LogvolProcessor::process(const DOMElement *element, GmxUtil &gmxUtil, GeoNo
newName.append("_");
newName.append(std::to_string(index_i.second));
}
- nameTag_physChildVolName = make_intrusive<GeoNameTag>(newName);//Make sensitive always have a name, to extra Id information from
+ nameTag_physChildVolName = nameTag(newName);//Make sensitive always have a name, to extra Id information from
toAdd.push_back(nameTag_physChildVolName);
if(hasIdentifier) { //TODO: check if all "sensitive" volumes must have an identifier. If that's the case, then we can remove this "if" here
- toAdd.push_back(make_intrusive<GeoIdentifierTag>(sensId));
+ toAdd.push_back(geoId(sensId));
}
}
else {
if(hasIdentifier) {
- toAdd.push_back(make_intrusive<GeoIdentifierTag>(m_map[name].id)); // Normal copy number
+ toAdd.push_back(geoId(m_map[name].id)); // Normal copy number
gmxUtil.positionIndex.setCopyNo(m_map[name].id++);
}
}
--
GitLab