From 8efd018163d920533b7dd486eb324b64dabb77b4 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 20 Jun 2024 11:55:51 +0200 Subject: [PATCH] Make the wrapper not be reentrant --- k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h | 5 ++--- k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h b/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h index 00b57ba8..4a4d344a 100644 --- a/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h +++ b/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h @@ -20,8 +20,6 @@ #define K4MARLINWRAPPER_MARLINPROCESSORWRAPPER_H // std -#include -#include #include #include @@ -48,7 +46,6 @@ #include // k4MarlinWrapper -#include "k4MarlinWrapper/LCEventWrapper.h" #include "k4MarlinWrapper/converters/IEDMConverter.h" namespace marlin { @@ -87,6 +84,8 @@ class MarlinProcessorWrapper : public Gaudi::Algorithm { mutable ToolHandle m_lcio_conversionTool{"IEDMConverter/Lcio2EDM4hep", this}; static std::stack& ProcessorStack(); + + bool isReEntrant() const override { return false; } }; std::stack& MarlinProcessorWrapper::ProcessorStack() { diff --git a/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp b/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp index 6534e9a6..439d44a5 100644 --- a/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp +++ b/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp @@ -19,6 +19,7 @@ #include "k4MarlinWrapper/MarlinProcessorWrapper.h" #include "IMPL/LCEventImpl.h" +#include "k4MarlinWrapper/LCEventWrapper.h" #include "k4MarlinWrapper/util/k4MarlinWrapperUtil.h" DECLARE_COMPONENT(MarlinProcessorWrapper)