From 04e41fff4d895b66b239f7fd43790d87239c64f5 Mon Sep 17 00:00:00 2001
From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Tue, 20 Feb 2024 14:34:48 +0100
Subject: [PATCH] Fix EtherName
---
GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx | 4 ++--
.../GeoModelXML/GeoModelXml/src/StrictErrorHandler.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx b/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
index 02eeb3c43..2b292e451 100644
--- a/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
@@ -201,12 +201,12 @@ void MaterialManager::buildSpecialMaterials() {
// Ether
GeoIntrusivePtr<GeoElement> ethElement{new GeoElement("Ether","ET",500.0,0.0)};
m_elements.insert(std::make_pair("Ether",ethElement));
- GeoIntrusivePtr<GeoMaterial> ether{new GeoMaterial("Ether",0.0)};
+ GeoIntrusivePtr<GeoMaterial> ether{new GeoMaterial("special::Ether",0.0)};
ether->add(ethElement,1.);
ether->lock();
m_materials.insert(std::make_pair("special::Ether", ether));
// HyperUranium
- GeoIntrusivePtr<GeoMaterial> hu{new GeoMaterial("HyperUranium",0.0)};
+ GeoIntrusivePtr<GeoMaterial> hu{new GeoMaterial("special::HyperUranium",0.0)};
hu->add(ethElement,1.);
hu->lock();
m_materials.insert(std::make_pair("special::HyperUranium", hu));
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/StrictErrorHandler.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/StrictErrorHandler.cxx
index 40880270d..5ab72c300 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/StrictErrorHandler.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/StrictErrorHandler.cxx
@@ -30,7 +30,7 @@ bool StrictErrorHandler::handleError(const xercesc::DOMError &domError) {
msglog << "\nFatal Error at file \n";
}
msglog << XMLString::transcode(domError.getLocation()->getURI())
- << ", line " << domError.getLocation()->getLineNumber()
+ << " - line " << domError.getLocation()->getLineNumber()
<< ", char " << domError.getLocation()->getColumnNumber()
<< "\n Message: " << XMLString::transcode(domError.getMessage()) << endmsg;
--
GitLab