Group common XML parsers (XMLParsers.h,XMLParsers.cpp).

DDCond/src/plugins/ConditionsRepositoryParser.cpp

@@ -343,8 +343,8 @@ namespace DD4hep {
     xml_h              child_rot, child_pos, child_piv;
     ConversionArg*     arg = _param<ConversionArg>();
     Condition          con = create_condition(arg->detector, e);
-    Alignments::Delta& del = con.bind<Alignments::Delta>();
-    XML::parse(e, del);
+    //Alignments::Delta& del = con.bind<Alignments::Delta>();
+    XML::parse_delta(e, con->data);
     con->setFlag(Condition::ALIGNMENT);
     arg->manager.registerUnlocked(arg->pool, con);
   }

DDCore/include/DD4hep/objects/ConditionsInterna.h

@@ -243,9 +243,6 @@ namespace DD4hep {
 
 #define DD4HEP_DEFINE_CONDITIONS_TYPE(x)                               \
   namespace DD4hep {                                                   \
-    template x& OpaqueDataBlock::bind<x>();                            \
-    template x& OpaqueDataBlock::bind<x>(const std::string& val);      \
-    template x& OpaqueDataBlock::set<x> (const std::string& val);      \
     namespace Conditions  {                                            \
       template x& Condition::bind<x>(const std::string& val);          \
       template x& Condition::bind<x>();                                \

DDCore/include/DD4hep/objects/OpaqueData_inl.h

@@ -78,4 +78,12 @@ namespace DD4hep {
   }
 
 } /* End namespace DD4hep               */
+
+#define DD4HEP_DEFINE_OPAQUEDATA_TYPE(x)                               \
+  namespace DD4hep {                                                   \
+    template x& OpaqueDataBlock::bind<x>();                            \
+    template x& OpaqueDataBlock::bind<x>(const std::string& val);      \
+    template x& OpaqueDataBlock::set<x> (const std::string& val);      \
+  }
+
 #endif    /* DD4HEP_OPAQUEDATA_INL_H    */

DDCore/src/AlignmentData.cpp

@@ -204,6 +204,8 @@ Alignment AlignmentData::nominal() const   {
 
 #include "DD4hep/ToStream.h"
 #include "DD4hep/objects/ConditionsInterna.h"
+DD4HEP_DEFINE_OPAQUEDATA_TYPE(Delta)
+DD4HEP_DEFINE_OPAQUEDATA_TYPE(AlignmentData)
 DD4HEP_DEFINE_CONDITIONS_TYPE_DUMMY(Delta)
 DD4HEP_DEFINE_CONDITIONS_TYPE_DUMMY(AlignmentData)