diff --git a/DDDigi/CMakeLists.txt b/DDDigi/CMakeLists.txt index f8bd4ce3c025db7ef78235cfd8ae78484db54c7f..d329bccd0021538faf47a671d90dd90d85ba70c5 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 7c1db7a4053e6ae6df8df8f5ddeecb037ab13b5b..cdd2b238c4f7c4a4a4542b93c2dead7080c79c72 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 84c4744ee1e7150ff091170fea24e94ffe93141c..04f714dd41051bcaa6558853fab8483f58b44f5e 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()); }