Skip to content
Snippets Groups Projects
Commit 0d911867 authored by Pierre-Alain Loizeau's avatar Pierre-Alain Loizeau
Browse files

[MQ] in sbatch scripts, add usage of histo suffixes when relevant

parent 318436bf
No related branches found
No related tags found
1 merge request!882Changes from mCBM 2022 prod to mCBM MQ devices and execution
Pipeline #17967 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch
    + 2
    − 0
    View file @ 0d911867
    ...@@ -419,6 +419,7 @@ SAMPLER+=" --ChNameCmds commands" ...@@ -419,6 +419,7 @@ SAMPLER+=" --ChNameCmds commands"
    SAMPLER+=" --PubFreqTs $_pubfreqts" SAMPLER+=" --PubFreqTs $_pubfreqts"
    SAMPLER+=" --PubTimeMin $_pubminsec" SAMPLER+=" --PubTimeMin $_pubminsec"
    SAMPLER+=" --PubTimeMax $_pubmaxsec" 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=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=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" 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" ...@@ -473,6 +474,7 @@ EVTSINK+=" --FillHistos true"
    EVTSINK+=" --PubFreqTs $_pubfreqts" EVTSINK+=" --PubFreqTs $_pubfreqts"
    EVTSINK+=" --PubTimeMin $_pubminsec" EVTSINK+=" --PubTimeMin $_pubminsec"
    EVTSINK+=" --PubTimeMax $_pubmaxsec" EVTSINK+=" --PubTimeMax $_pubmaxsec"
    EVTSINK+=" --HistosSuffix _${_localhost}"
    EVTSINK+=" --EvtNameIn events" 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=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" EVTSINK+=" --channel-config name=missedts,type=sub,method=connect,transport=zeromq,address=tcp://127.0.0.1:11006,rateLogging=$_ratelog"
    ......
    macro/beamtime/mcbm2022/online/mq_sink.sbatch
    + 1
    − 0
    View file @ 0d911867
    ...@@ -85,6 +85,7 @@ EVTSINK+=" --FillHistos true" ...@@ -85,6 +85,7 @@ EVTSINK+=" --FillHistos true"
    EVTSINK+=" --PubFreqTs $_pubfreqts" EVTSINK+=" --PubFreqTs $_pubfreqts"
    EVTSINK+=" --PubTimeMin $_pubminsec" EVTSINK+=" --PubTimeMin $_pubminsec"
    EVTSINK+=" --PubTimeMax $_pubmaxsec" EVTSINK+=" --PubTimeMax $_pubmaxsec"
    EVTSINK+=" --HistosSuffix _${_localhost}"
    EVTSINK+=" --EvtNameIn events" 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=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" EVTSINK+=" --channel-config name=missedts,type=sub,method=connect,transport=zeromq,address=tcp://127.0.0.1:11006,rateLogging=$_ratelog"
    ......
    macro/beamtime/mcbm2022/online/mq_source.sbatch
    + 1
    − 0
    View file @ 0d911867
    ...@@ -79,6 +79,7 @@ SAMPLER+=" --ChNameCmds commands" ...@@ -79,6 +79,7 @@ SAMPLER+=" --ChNameCmds commands"
    SAMPLER+=" --PubFreqTs $_pubfreqts" SAMPLER+=" --PubFreqTs $_pubfreqts"
    SAMPLER+=" --PubTimeMin $_pubminsec" SAMPLER+=" --PubTimeMin $_pubminsec"
    SAMPLER+=" --PubTimeMax $_pubmaxsec" 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=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=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" SAMPLER+=" --channel-config name=missedts,type=pub,method=bind,address=tcp://127.0.0.1:11006,rateLogging=$_ratelog"
    ......
    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