From 6bebc7a11a7d108d950906010846c57617a3067c Mon Sep 17 00:00:00 2001
From: Jan de Cuveland <cuveland@compeng.uni-frankfurt.de>
Date: Tue, 12 Apr 2022 11:43:18 +0200
Subject: [PATCH] Make code compatible with updated flesnet interface
---
MQ/source/CbmMQTsaInfo.cxx | 2 +-
MQ/source/CbmMQTsaSampler.cxx | 4 ++--
MQ/source/CbmMQTsaSamplerTof.cxx | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MQ/source/CbmMQTsaInfo.cxx b/MQ/source/CbmMQTsaInfo.cxx
index d555bb6636..f6271cc698 100644
--- a/MQ/source/CbmMQTsaInfo.cxx
+++ b/MQ/source/CbmMQTsaInfo.cxx
@@ -86,7 +86,7 @@ try {
if (0 == fFileName.size() && 0 != fHost.size()) {
std::string connector = "tcp://" + fHost + ":" + std::to_string(fPort);
LOG(info) << "Open TSPublisher at " << connector;
- fSource = new fles::TimesliceSubscriber(connector);
+ fSource = new fles::TimesliceSubscriber(connector, 1);
if (!fSource) { throw InitTaskError("Could not connect to publisher."); }
}
else {
diff --git a/MQ/source/CbmMQTsaSampler.cxx b/MQ/source/CbmMQTsaSampler.cxx
index 5aeceeda07..cff74002b6 100644
--- a/MQ/source/CbmMQTsaSampler.cxx
+++ b/MQ/source/CbmMQTsaSampler.cxx
@@ -179,7 +179,7 @@ try {
if (0 == fFileName.size() && 0 != fHost.size()) {
std::string connector = "tcp://" + fHost + ":" + std::to_string(fPort);
LOG(info) << "Open TSPublisher at " << connector;
- fSource = new fles::TimesliceSubscriber(connector);
+ fSource = new fles::TimesliceSubscriber(connector, 1);
if (!fSource) { throw InitTaskError("Could not connect to publisher."); }
}
else {
@@ -305,7 +305,7 @@ bool CbmMQTsaSampler::CreateAndSendComponent(const fles::Timeslice& ts, int nrCo
if (fComponentsToSend[idx] > 0) {
LOG(info) << "Create timeslice component for link " << nrComp;
- fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp), ts.index())};
+ fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp)), ts.index()};
component.append_component(ts.num_microslices(0));
for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
diff --git a/MQ/source/CbmMQTsaSamplerTof.cxx b/MQ/source/CbmMQTsaSamplerTof.cxx
index 6612b99d97..c9deed042f 100644
--- a/MQ/source/CbmMQTsaSamplerTof.cxx
+++ b/MQ/source/CbmMQTsaSamplerTof.cxx
@@ -181,7 +181,7 @@ try {
if (0 == fFileName.size() && 0 != fHost.size()) {
std::string connector = "tcp://" + fHost + ":" + std::to_string(fPort);
LOG(info) << "Open TSPublisher at " << connector;
- fSource = new fles::TimesliceSubscriber(connector);
+ fSource = new fles::TimesliceSubscriber(connector, 1);
if (!fSource) { throw InitTaskError("Could not connect to publisher."); }
}
else {
@@ -306,7 +306,7 @@ bool CbmMQTsaSamplerTof::ConditionalRun()
if (fComponentsToSend[idx] > 0) {
LOG(debug) << "Append timeslice component of link " << nrComp << " to idx " << idx;
- fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp), ts.index())};
+ fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp)), ts.index()};
component.append_component(ts.num_microslices(0));
for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
@@ -462,7 +462,7 @@ bool CbmMQTsaSamplerTof::CreateAndSendComponent(const fles::Timeslice& ts, int n
if (fComponentsToSend[idx] > 0) {
LOG(debug) << "Create timeslice component for link " << nrComp;
- fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp), ts.index())};
+ fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp)), ts.index()};
component.append_component(ts.num_microslices(0));
for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
--
GitLab