From 6d03c7136db2972b48a2c96198f05698cea57e7b Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Mon, 9 Jan 2023 17:44:01 +0100
Subject: [PATCH] Fix compile error
---
DDDigi/CMakeLists.txt | 6 +++---
DDDigi/src/DigiMonitorParser.cpp | 8 ++++----
DDDigi/src/DigiStoreDump.cpp | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/DDDigi/CMakeLists.txt b/DDDigi/CMakeLists.txt
index f8bd4ce3c..d329bccd0 100644
--- a/DDDigi/CMakeLists.txt
+++ b/DDDigi/CMakeLists.txt
@@ -47,10 +47,10 @@ dd4hep_add_plugin(DDDigiPlugins
)
#
#---------------- I/O Plugin library to read/write DDG4 and edm4hep files ---------
-set(DDDigiIO_USES "DD4hep::DDDigi;DD4hep::DDCore")
-set(DDDigiIO_SOURCES "io/DigiIO.cpp")
+set(DDDigiIO_USES "DD4hep::DDDigi;DD4hep::DDCore")
+set(DDDigiIO_SOURCES "io/DigiIO.cpp")
set(DDDigiIO_GENERATED)
-set(DDDigiIO_DEFINITIONS)
+set(DDDigiIO_DEFINITIONS "DD4HEP_BUILD_DDDIGI_IO=1")
if(DD4HEP_USE_GEANT4)
dd4hep_add_dictionary(G__DDDigi_DDG4_IO
SOURCES ../DDCore/include/ROOT/Warnings.h io/DDG4IO.cpp
diff --git a/DDDigi/src/DigiMonitorParser.cpp b/DDDigi/src/DigiMonitorParser.cpp
index 7c1db7a40..cdd2b238c 100644
--- a/DDDigi/src/DigiMonitorParser.cpp
+++ b/DDDigi/src/DigiMonitorParser.cpp
@@ -160,11 +160,11 @@ namespace dd4hep {
void operator()(dd4hep::digi::H2DParams& val, const float y, tag_max_y) const {
val.max_y = y;
}
- void operator()(dd4hep::digi::H2DParams& val, const std::string& name, tag_name) const {
- val.name = name;
+ void operator()(dd4hep::digi::H2DParams& val, const std::string& nam, tag_name) const {
+ val.name = nam;
}
- void operator()(dd4hep::digi::H2DParams& val, const std::string& title, tag_title) const {
- val.title = title;
+ void operator()(dd4hep::digi::H2DParams& val, const std::string& tit, tag_title) const {
+ val.title = tit;
}
};
diff --git a/DDDigi/src/DigiStoreDump.cpp b/DDDigi/src/DigiStoreDump.cpp
index 84c4744ee..04f714dd4 100644
--- a/DDDigi/src/DigiStoreDump.cpp
+++ b/DDDigi/src/DigiStoreDump.cpp
@@ -69,7 +69,7 @@ template <> std::string DigiStoreDump::data_header(Key key, const std::string& t
}
return this->format("%04X %04X %08X %-32s: %-12s %s",
key.segment(), key.mask(), key.item(),
- ('"'+Key::key_name(key)+'"'), tag.c_str(),
+ ('"'+Key::key_name(key)+'"').c_str(), tag.c_str(),
typ.c_str());
}
--
GitLab