From ca3f2365a58f884ac65b7f769c64a104c497ff49 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 15 Jul 2022 11:08:42 +0200
Subject: [PATCH] Improve property parsing. Add DDG4 example to test properties
---
DDCore/include/DD4hep/GrammarParsed.h | 8 ++++----
DDCore/src/GrammarTypes.cpp | 7 +++++++
examples/DDG4/scripts/TestProperties.py | 1 +
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/DDCore/include/DD4hep/GrammarParsed.h b/DDCore/include/DD4hep/GrammarParsed.h
index 83e1cc8db..45509c693 100644
--- a/DDCore/include/DD4hep/GrammarParsed.h
+++ b/DDCore/include/DD4hep/GrammarParsed.h
@@ -26,10 +26,10 @@
#endif
/// Framework include files
-#include "DD4hep/Grammar.h"
-#include "DD4hep/Printout.h"
-#include "Parsers/Parsers.h"
-#include "Evaluator/Evaluator.h"
+#include <DD4hep/Grammar.h>
+#include <DD4hep/Printout.h>
+#include <Parsers/Parsers.h>
+#include <Evaluator/Evaluator.h>
/// C/C++ include files
#include <string>
diff --git a/DDCore/src/GrammarTypes.cpp b/DDCore/src/GrammarTypes.cpp
index 33ebbbc77..eee5971c8 100644
--- a/DDCore/src/GrammarTypes.cpp
+++ b/DDCore/src/GrammarTypes.cpp
@@ -18,6 +18,13 @@
#include "Math/Vector4D.h"
#include "Math/Vector3D.h"
+#ifndef DD4HEP_PARSERS_NO_ROOT
+
+/// ROOT include files
+#include <Math/Point3D.h>
+#include <Math/Vector4D.h>
+#include <Math/Vector3D.h>
+
namespace ROOT {
namespace Math {
/// Allow point insertion of a point in maps
diff --git a/examples/DDG4/scripts/TestProperties.py b/examples/DDG4/scripts/TestProperties.py
index 4e690bad2..aaf8abff3 100644
--- a/examples/DDG4/scripts/TestProperties.py
+++ b/examples/DDG4/scripts/TestProperties.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# ==========================================================================
# AIDA Detector description implementation
# --------------------------------------------------------------------------
--
GitLab