From 0d9118671d2ff2c90c7b2205e5c00dbe7888b129 Mon Sep 17 00:00:00 2001
From: "P.-A. Loizeau" <p.-a.loizeau@gsi.de>
Date: Fri, 8 Jul 2022 16:58:03 +0200
Subject: [PATCH] [MQ] in sbatch scripts, add usage of histo suffixes when
relevant
---
macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch | 2 ++
macro/beamtime/mcbm2022/online/mq_sink.sbatch | 1 +
macro/beamtime/mcbm2022/online/mq_source.sbatch | 1 +
3 files changed, 4 insertions(+)
diff --git a/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch b/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch
index 0426a6a9b7..9748c572b5 100644
--- a/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch
@@ -419,6 +419,7 @@ SAMPLER+=" --ChNameCmds commands"
SAMPLER+=" --PubFreqTs $_pubfreqts"
SAMPLER+=" --PubTimeMin $_pubminsec"
SAMPLER+=" --PubTimeMax $_pubmaxsec"
+SAMPLER+=" --HistosSuffix _${_localhost}"
SAMPLER+=" --channel-config name=ts-request,type=rep,method=bind,transport=zeromq,address=tcp://127.0.0.1:11555,rateLogging=$_ratelog"
SAMPLER+=" --channel-config name=histogram-in,type=pub,method=connect,transport=zeromq,address=tcp://${_histServHost}:11666,rateLogging=$_ratelog"
SAMPLER+=" --channel-config name=missedts,type=pub,method=bind,address=tcp://127.0.0.1:11006,rateLogging=$_ratelog"
@@ -473,6 +474,7 @@ EVTSINK+=" --FillHistos true"
EVTSINK+=" --PubFreqTs $_pubfreqts"
EVTSINK+=" --PubTimeMin $_pubminsec"
EVTSINK+=" --PubTimeMax $_pubmaxsec"
+EVTSINK+=" --HistosSuffix _${_localhost}"
EVTSINK+=" --EvtNameIn events"
EVTSINK+=" --channel-config name=events,type=pull,method=bind,transport=zeromq,rcvBufSize=1,address=tcp://127.0.0.1:11556,rateLogging=$_ratelog"
EVTSINK+=" --channel-config name=missedts,type=sub,method=connect,transport=zeromq,address=tcp://127.0.0.1:11006,rateLogging=$_ratelog"
diff --git a/macro/beamtime/mcbm2022/online/mq_sink.sbatch b/macro/beamtime/mcbm2022/online/mq_sink.sbatch
index 21c060eba8..34fc0674ec 100644
--- a/macro/beamtime/mcbm2022/online/mq_sink.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_sink.sbatch
@@ -85,6 +85,7 @@ EVTSINK+=" --FillHistos true"
EVTSINK+=" --PubFreqTs $_pubfreqts"
EVTSINK+=" --PubTimeMin $_pubminsec"
EVTSINK+=" --PubTimeMax $_pubmaxsec"
+EVTSINK+=" --HistosSuffix _${_localhost}"
EVTSINK+=" --EvtNameIn events"
EVTSINK+=" --channel-config name=events,type=pull,method=bind,transport=zeromq,rcvBufSize=1,address=tcp://127.0.0.1:11556,rateLogging=$_ratelog"
EVTSINK+=" --channel-config name=missedts,type=sub,method=connect,transport=zeromq,address=tcp://127.0.0.1:11006,rateLogging=$_ratelog"
diff --git a/macro/beamtime/mcbm2022/online/mq_source.sbatch b/macro/beamtime/mcbm2022/online/mq_source.sbatch
index 6fd0e7bcce..e378171e53 100644
--- a/macro/beamtime/mcbm2022/online/mq_source.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_source.sbatch
@@ -79,6 +79,7 @@ SAMPLER+=" --ChNameCmds commands"
SAMPLER+=" --PubFreqTs $_pubfreqts"
SAMPLER+=" --PubTimeMin $_pubminsec"
SAMPLER+=" --PubTimeMax $_pubmaxsec"
+SAMPLER+=" --HistosSuffix _${_localhost}"
SAMPLER+=" --channel-config name=ts-request,type=rep,method=bind,transport=zeromq,address=tcp://127.0.0.1:11555,rateLogging=$_ratelog"
SAMPLER+=" --channel-config name=histogram-in,type=pub,method=connect,transport=zeromq,address=tcp://${_histServHost}:11666,rateLogging=$_ratelog"
SAMPLER+=" --channel-config name=missedts,type=pub,method=bind,address=tcp://127.0.0.1:11006,rateLogging=$_ratelog"
--
GitLab