Commit 8764ad90 authored by Sylvain Fargier's avatar Sylvain Fargier 🐾
Browse files

Merge branch 'wip-fixes' into 'master'

🔧 small fixes

See merge request apc/experiments/ntof/addh!8
parents 8d6b4a17 c3a93f2f
Pipeline #2002494 passed with stages
in 8 minutes and 30 seconds
......@@ -11,3 +11,9 @@ find_library(PTHREAD_LIBRARIES pthread)
if(PTHREAD_LIBRARIES)
list(APPEND Boost_LIBRARIES ${PTHREAD_LIBRARIES})
endif()
# for interprocess
find_library(RT_LIBRARIES rt)
if(RT_LIBRARIES)
list(APPEND Boost_LIBRARIES ${RT_LIBRARIES})
endif()
include(xProject)
include(Cern)
xProject_Add(DIM
GIT_SUBMODULE
......
ntofutils @ 86f0be7b
Subproject commit a3b3bce95e5d7f8603ba379965f8f92a37f4c03b
Subproject commit 86f0be7b4284c1097a09b58e9af8a708f291f7c7
......@@ -38,7 +38,7 @@ int main(int argc, char **argv)
ntof::addh::Config::load(configFile, configMiscFile);
// Get the path of the config file of the logger
std::string logConfFile = "/root/config/nTOF_ADDH_logger.conf";
std::string logConfFile = "/etc/ntof/nTOF_ADDH_logger.conf";
if (argc > 3)
{
logConfFile = argv[3];
......
......@@ -73,7 +73,7 @@ public:
DimInfoWaiter info("HV_0/OnChannels");
ntof::dim::DIMDataSet serv("HV_0/OnChannels");
serv.addNewData("value", "V", int32_t(42));
serv.addData("value", "V", int32_t(42), ntof::dim::AddMode::CREATE);
EQ(true, info.waitUpdate());
......
......@@ -126,7 +126,7 @@ public:
DimInfoWaiter infoData("HV_0/OnChannels");
ntof::dim::DIMDataSet serv("HV_0/OnChannels");
serv.addNewData("value", "V", int32_t(42));
serv.addData("value", "V", int32_t(42), ntof::dim::AddMode::CREATE);
EQ(true, infoData.waitUpdate());
COMMAND_ELEMENT command = {std::string("write"), 6789, 12345, filename};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment