From dce1d3111bc4f5ea2d0bda9763c839018ac6048f Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 23 Nov 2015 15:46:53 +0000
Subject: [PATCH] ADD map(String, String) to pass runheader variables
---
DDCore/src/BasicGrammarTypes.cpp | 4 ++++
DDG4/src/ComponentProperties.cpp | 3 +++
2 files changed, 7 insertions(+)
diff --git a/DDCore/src/BasicGrammarTypes.cpp b/DDCore/src/BasicGrammarTypes.cpp
index a9bd36ce5..6e97c8de4 100644
--- a/DDCore/src/BasicGrammarTypes.cpp
+++ b/DDCore/src/BasicGrammarTypes.cpp
@@ -60,6 +60,10 @@ DD4HEP_DEFINE_PARSER_GRAMMAR_TYPE(std::set<std::string>)
typedef std::map<std::string, int> map_string_int;
DD4HEP_DEFINE_PARSER_GRAMMAR(map_string_int,eval_obj)
+// e.g.,, runHeader map
+typedef std::map<std::string, std::string> map_string_string;
+DD4HEP_DEFINE_PARSER_GRAMMAR(map_string_string,eval_obj)
+
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::XYZPoint,eval_obj)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::XYZVector,eval_obj)
DD4HEP_DEFINE_PARSER_GRAMMAR_CONT(ROOT::Math::PxPyPzEVector,eval_obj)
diff --git a/DDG4/src/ComponentProperties.cpp b/DDG4/src/ComponentProperties.cpp
index fd4995cc9..77f61dd5d 100644
--- a/DDG4/src/ComponentProperties.cpp
+++ b/DDG4/src/ComponentProperties.cpp
@@ -262,6 +262,9 @@ namespace DD4hep {
typedef map<string, int> map_string_int;
DD4HEP_DEFINE_PROPERTY_TYPE(map_string_int);
+ typedef map<string, string> map_string_string;
+ DD4HEP_DEFINE_PROPERTY_TYPE(map_string_string);
+
// ROOT::Math Object instances
DD4HEP_DEFINE_PROPERTY_TYPE(ROOT::Math::XYZPoint);
DD4HEP_DEFINE_PROPERTY_TYPE(ROOT::Math::XYZVector);
--
GitLab