From 179ca310f2df55a275e57da0afc3b8c4794c2c4c Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Wed, 3 Apr 2013 15:50:08 +0000
Subject: [PATCH] Fix backwards compatibility issue with magnetic field name
conventions
---
DDCore/src/plugins/Compact2Objects.cpp | 2 ++
DDCore/src/plugins/LCDDConverter.cpp | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index 763ea5f37..d13052c70 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -148,6 +148,8 @@ static Ref_t create_SolenoidField(lcdd_t& lcdd, xml_h e) {
obj.assign(ptr,c.nameStr(),c.typeStr());
return obj;
}
+DECLARE_XMLELEMENT(SolenoidMagnet,create_SolenoidField);
+// This is the plugin required for slic: note the different name
DECLARE_XMLELEMENT(solenoid,create_SolenoidField);
static Ref_t create_DipoleField(lcdd_t& /* lcdd */, xml_h e) {
diff --git a/DDCore/src/plugins/LCDDConverter.cpp b/DDCore/src/plugins/LCDDConverter.cpp
index aa5d12af7..99339b87b 100644
--- a/DDCore/src/plugins/LCDDConverter.cpp
+++ b/DDCore/src/plugins/LCDDConverter.cpp
@@ -1166,7 +1166,7 @@ static long create_visASCII(LCDD& lcdd, int argc, char** argv) {
return 1;
}
-DECLARE_APPLY(DD4hepGeometry2VIS, create_vis);
+DECLARE_APPLY(DD4hepGeometry2VIS, create_vis);
DECLARE_APPLY(DD4hepGeometry2VISASCII, create_visASCII);
-DECLARE_APPLY(DD4hepGeometry2GDML,create_gdml);
-DECLARE_APPLY(DD4hepGeometry2LCDD,create_lcdd);
+DECLARE_APPLY(DD4hepGeometry2GDML, create_gdml);
+DECLARE_APPLY(DD4hepGeometry2LCDD, create_lcdd);
--
GitLab