From 7f7216e13f066f61fc12ce9a2aa39ef6a4ca432e Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Thu, 3 Mar 2022 14:22:41 +0100 Subject: [PATCH] Don't use $VMCWORKDIR Use @VMCWORKDIR@ instaed which is exchanged by the acctual value while running CMake. In case of $VMCWORKDIR/build uses @CMAKE_BINARY_DIR@. --- MQ/mcbm/CMakeLists.txt | 2 +- MQ/mcbm/startBuildRawEvents2021.sh.in | 35 ++++++++++--------- MQ/mcbm/startBuildRawEventsCosmics2021.sh.in | 35 ++++++++++--------- MQ/mcbm/startEventBuilder.sh.in | 23 ++++++------ MQ/mcbm/startMQBuildRawEvents.sh.in | 23 ++++++------ MQ/mcbm/startMQMcbmEvtBuilderWin2020.sh.in | 23 ++++++------ MQ/mcbm/startMQMcbmPulserMonitor2020.sh.in | 23 ++++++------ MQ/monitor/startMQSamplerMonitor.sh.in | 7 ++-- MQ/monitor/startMQSamplerPsdMonitor2021.sh.in | 8 +++-- MQ/monitor/startMQSamplerT0Monitor2020.sh.in | 7 ++-- MQ/monitor/startMQSamplerT0Monitor2021.sh.in | 15 ++++---- MQ/monitor/startMQSamplerTofMonitor2020.sh.in | 7 ++-- MQ/monitor/startMQSamplerTofMonitor2021.sh.in | 15 ++++---- 13 files changed, 129 insertions(+), 94 deletions(-) diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt index 5df7e0fb21..5abc91623f 100644 --- a/MQ/mcbm/CMakeLists.txt +++ b/MQ/mcbm/CMakeLists.txt @@ -349,7 +349,7 @@ configure_file(${MY_SOURCE_DIR}/startMQMcbmEvtBuilderWin2020.sh.in ${TMPDIR}/b configure_file(${MY_SOURCE_DIR}/startMQBuildRawEvents.sh.in ${TMPDIR}/bin/MQ/topologies/install/startMQBuildRawEvents.sh) configure_file(${MY_SOURCE_DIR}/startBuildRawEvents2021.sh.in ${TMPDIR}/bin/MQ/topologies/install/startBuildRawEvents2021.sh) configure_file(${MY_SOURCE_DIR}/startBuildRawEventsCosmics2021.sh.in ${TMPDIR}/bin/MQ/topologies/install/startBuildRawEventsCosmics2021.sh) -configure_file(${MY_SOURCE_DIR}/startEventBuilder.sh.in ${TMPDIR}/bin/MQ/topologies/startEventBuilder.sh) +configure_file(${MY_SOURCE_DIR}/startEventBuilder.sh.in ${TMPDIR}/bin/MQ/topologies/install/startEventBuilder.sh) install(PROGRAMS ${TMPDIR}/bin/MQ/topologies/install/startMQMcbmPulserMonitor2020.sh ${TMPDIR}/bin/MQ/topologies/install/startMQMcbmEvtBuilderWin2020.sh diff --git a/MQ/mcbm/startBuildRawEvents2021.sh.in b/MQ/mcbm/startBuildRawEvents2021.sh.in index fa87455081..00baf87111 100755 --- a/MQ/mcbm/startBuildRawEvents2021.sh.in +++ b/MQ/mcbm/startBuildRawEvents2021.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,15 +71,15 @@ else _pubmaxsec=10.0 fi -_parfileSts=$VMCWORKDIR/macro/beamtime/mcbm2021/mStsPar.par -_parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2021/mMuchPar.par -_parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.asic.par -_parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.digi.par -_parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.gas.par -_parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.gain.par -_parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2021/mTofCriPar.par -_parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par -_parfilePsd=$VMCWORKDIR/macro/beamtime/mcbm2021/mPsdPar.par +_parfileSts=@VMCWORKDIR@/macro/beamtime/mcbm2021/mStsPar.par +_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2021/mMuchPar.par +_parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.asic.par +_parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.digi.par +_parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.gas.par +_parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.gain.par +_parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2021/mTofCriPar.par +_parfileRich=@VMCWORKDIR@/macro/beamtime/mcbm2021/mRichPar_70.par +_parfilePsd=@VMCWORKDIR@/macro/beamtime/mcbm2021/mPsdPar.par _setup_name=mcbm_beam_2021_07_surveyed _run_id=1588 @@ -123,7 +126,7 @@ SAMPLER+=" --transport zeromq" # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log SAMPLER_LOG="sampler1_$LOGFILETAG" -xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/source/$SAMPLER & +xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/source/$SAMPLER & echo $SAMPLER @@ -161,7 +164,7 @@ while (( _iMoni < _nbmoni )); do # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log UNPACKER_LOG="unp$_iMoni" UNPACKER_LOG+="_$LOGFILETAG" - xterm -l -lf $UNPACKER_LOG -geometry 132x23+400+$_yOffset -hold -e ${VMCWORKDIR}/build/bin/MQ/mcbm/$UNPACKER & + xterm -l -lf $UNPACKER_LOG -geometry 132x23+400+$_yOffset -hold -e @CMAKE_BINARY_DIR@/bin/MQ/mcbm/$UNPACKER & EVTBUILDER="BuildDigiEvents" EVTBUILDER+=" --id build$_iMoni" @@ -198,7 +201,7 @@ while (( _iMoni < _nbmoni )); do # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log EVTBUILDER_LOG="build$_iMoni" EVTBUILDER_LOG+="_$LOGFILETAG" - xterm -l -lf $EVTBUILDER_LOG -geometry 80x23+800+$_yOffset -hold -e ${VMCWORKDIR}/build/bin/MQ/mcbm/$EVTBUILDER & + xterm -l -lf $EVTBUILDER_LOG -geometry 80x23+800+$_yOffset -hold -e @CMAKE_BINARY_DIR@/bin/MQ/mcbm/$EVTBUILDER & done @@ -220,7 +223,7 @@ EVTSINK+=" --channel-config name=histogram-in,type=sub,method=bind,transport=zer # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log EVTSINK_LOG="evtsink1_$LOGFILETAG" -xterm -l -lf $EVTSINK_LOG -geometry 80x23+1200+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/mcbm/$EVTSINK & +xterm -l -lf $EVTSINK_LOG -geometry 80x23+1200+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/mcbm/$EVTSINK & PARAMETERSERVER="parmq-server" PARAMETERSERVER+=" --id parmq-server" @@ -234,7 +237,7 @@ PARAMETERSERVER+=" --setup $_setup_name" # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log PARAMSRV_LOG="parmq_$LOGFILETAG" -xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1600+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/parmq/$PARAMETERSERVER & +xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1600+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/parmq/$PARAMETERSERVER & HISTSERVER="MqHistoServer" HISTSERVER+=" --id server1" @@ -246,4 +249,4 @@ HISTSERVER+=" --channel-config name=canvas-conf,type=sub,method=bind,transport=z # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log HISTSRV_LOG="server1_$LOGFILETAG" -xterm -l -lf $HISTSRV_LOG -geometry 80x23+2000+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/histogramServer/$HISTSERVER & +xterm -l -lf $HISTSRV_LOG -geometry 80x23+2000+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/histogramServer/$HISTSERVER & diff --git a/MQ/mcbm/startBuildRawEventsCosmics2021.sh.in b/MQ/mcbm/startBuildRawEventsCosmics2021.sh.in index f5ecfe7ad3..eb802591b8 100755 --- a/MQ/mcbm/startBuildRawEventsCosmics2021.sh.in +++ b/MQ/mcbm/startBuildRawEventsCosmics2021.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,15 +71,15 @@ else _pubmaxsec=10.0 fi -_parfileSts=$VMCWORKDIR/macro/beamtime/mcbm2021/mStsPar.par -_parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2021/mMuchPar.par -_parfileTrdAsic=$VMCWORKDIR/macro/beamtime/mcbm2022/trd_v21b_mcbm.asic.par -_parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.digi.par -_parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.gas.par -_parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.gain.par -_parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par -_parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par -_parfilePsd=$VMCWORKDIR/macro/beamtime/mcbm2021/mPsdPar.par +_parfileSts=@VMCWORKDIR@/macro/beamtime/mcbm2021/mStsPar.par +_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2021/mMuchPar.par +_parfileTrdAsic=@VMCWORKDIR@/macro/beamtime/mcbm2022/trd_v21b_mcbm.asic.par +_parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.digi.par +_parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.gas.par +_parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.gain.par +_parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2022/mTofCriPar.par +_parfileRich=@VMCWORKDIR@/macro/beamtime/mcbm2021/mRichPar_70.par +_parfilePsd=@VMCWORKDIR@/macro/beamtime/mcbm2021/mPsdPar.par _setup_name=mcbm_beam_2021_07_surveyed _run_id=1660 @@ -123,7 +126,7 @@ SAMPLER+=" --transport zeromq" # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log SAMPLER_LOG="sampler1_$LOGFILETAG" -xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/source/$SAMPLER & +xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/source/$SAMPLER & echo $SAMPLER @@ -162,7 +165,7 @@ while (( _iMoni < _nbmoni )); do # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log UNPACKER_LOG="unp$_iMoni" UNPACKER_LOG+="_$LOGFILETAG" - xterm -l -lf $UNPACKER_LOG -geometry 132x23+400+$_yOffset -hold -e ${VMCWORKDIR}/build/bin/MQ/mcbm/$UNPACKER & + xterm -l -lf $UNPACKER_LOG -geometry 132x23+400+$_yOffset -hold -e @CMAKE_BINARY_DIR@/bin/MQ/mcbm/$UNPACKER & EVTBUILDER="BuildDigiEvents" EVTBUILDER+=" --id build$_iMoni" @@ -199,7 +202,7 @@ while (( _iMoni < _nbmoni )); do # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log EVTBUILDER_LOG="build$_iMoni" EVTBUILDER_LOG+="_$LOGFILETAG" - xterm -l -lf $EVTBUILDER_LOG -geometry 80x23+800+$_yOffset -hold -e ${VMCWORKDIR}/build/bin/MQ/mcbm/$EVTBUILDER & + xterm -l -lf $EVTBUILDER_LOG -geometry 80x23+800+$_yOffset -hold -e @CMAKE_BINARY_DIR@/bin/MQ/mcbm/$EVTBUILDER & done @@ -221,7 +224,7 @@ EVTSINK+=" --channel-config name=histogram-in,type=sub,method=bind,transport=zer # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log EVTSINK_LOG="evtsink1_$LOGFILETAG" -xterm -l -lf $EVTSINK_LOG -geometry 80x23+1200+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/mcbm/$EVTSINK & +xterm -l -lf $EVTSINK_LOG -geometry 80x23+1200+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/mcbm/$EVTSINK & PARAMETERSERVER="parmq-server" PARAMETERSERVER+=" --id parmq-server" @@ -235,7 +238,7 @@ PARAMETERSERVER+=" --setup $_setup_name" # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log PARAMSRV_LOG="parmq_$LOGFILETAG" -xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1600+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/parmq/$PARAMETERSERVER & +xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1600+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/parmq/$PARAMETERSERVER & HISTSERVER="MqHistoServer" HISTSERVER+=" --id server1" @@ -247,4 +250,4 @@ HISTSERVER+=" --channel-config name=canvas-conf,type=sub,method=bind,transport=z # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log HISTSRV_LOG="server1_$LOGFILETAG" -xterm -l -lf $HISTSRV_LOG -geometry 80x23+2000+0 -hold -e ${VMCWORKDIR}/build/bin/MQ/histogramServer/$HISTSERVER & +xterm -l -lf $HISTSRV_LOG -geometry 80x23+2000+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/histogramServer/$HISTSERVER & diff --git a/MQ/mcbm/startEventBuilder.sh.in b/MQ/mcbm/startEventBuilder.sh.in index ea2028d8f9..195f78f8d7 100755 --- a/MQ/mcbm/startEventBuilder.sh.in +++ b/MQ/mcbm/startEventBuilder.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,15 +71,15 @@ else _pubmaxsec=10.0 fi -_parfileSts=$VMCWORKDIR/macro/beamtime/mcbm2021/mStsPar.par -_parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2021/mMuchPar.par -_parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.asic.par -_parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.digi.par -_parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.gas.par -_parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v21b_mcbm.gain.par -_parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2021/mTofCriPar.par -_parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par -_parfilePsd=$VMCWORKDIR/macro/beamtime/mcbm2021/mPsdPar.par +_parfileSts=@VMCWORKDIR@/macro/beamtime/mcbm2021/mStsPar.par +_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2021/mMuchPar.par +_parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.asic.par +_parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.digi.par +_parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.gas.par +_parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v21b_mcbm.gain.par +_parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2021/mTofCriPar.par +_parfileRich=@VMCWORKDIR@/macro/beamtime/mcbm2021/mRichPar_70.par +_parfilePsd=@VMCWORKDIR@/macro/beamtime/mcbm2021/mPsdPar.par _setup_name=mcbm_beam_2021_07_surveyed _run_id=1588 diff --git a/MQ/mcbm/startMQBuildRawEvents.sh.in b/MQ/mcbm/startMQBuildRawEvents.sh.in index 0b94c5b453..cefe04d143 100755 --- a/MQ/mcbm/startMQBuildRawEvents.sh.in +++ b/MQ/mcbm/startMQBuildRawEvents.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,15 +71,15 @@ else _pubmaxsec=10.0 fi -_parfileSts=$VMCWORKDIR/macro/beamtime/mcbm2020/mStsPar.par -_parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2020/mMuchPar.par -_parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v18q_mcbm.asic.par -_parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v18q_mcbm.digi.par -_parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v18q_mcbm.gas.par -_parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v18q_mcbm.gain.par -_parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2020/mTofPar.par -_parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2020/mRichPar.par -_parfilePsd=$VMCWORKDIR/macro/beamtime/mcbm2020/mPsdPar.par +_parfileSts=@VMCWORKDIR@/macro/beamtime/mcbm2020/mStsPar.par +_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2020/mMuchPar.par +_parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.asic.par +_parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.digi.par +_parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.gas.par +_parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.gain.par +_parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2020/mTofPar.par +_parfileRich=@VMCWORKDIR@/macro/beamtime/mcbm2020/mRichPar.par +_parfilePsd=@VMCWORKDIR@/macro/beamtime/mcbm2020/mPsdPar.par LOGFILETAG=`hostname` LOGFILETAG+="_" diff --git a/MQ/mcbm/startMQMcbmEvtBuilderWin2020.sh.in b/MQ/mcbm/startMQMcbmEvtBuilderWin2020.sh.in index 561c5e7ba9..9851420401 100755 --- a/MQ/mcbm/startMQMcbmEvtBuilderWin2020.sh.in +++ b/MQ/mcbm/startMQMcbmEvtBuilderWin2020.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,15 +71,15 @@ else _pubmaxsec=10.0 fi -_parfileSts=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mStsPar.par -_parfileMuch=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mMuchPar.par -_parfileTrdAsic=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.asic.par -_parfileTrdDigi=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.digi.par -_parfileTrdGas=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.gas.par -_parfileTrdGain=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.gain.par -_parfileTof=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mTofPar.par -_parfileRich=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mRichPar.par -_parfilePsd=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mPsdPar.par +_parfileSts=@VMCWORKDIR@/macro/beamtime/mcbm2020/mStsPar.par +_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2020/mMuchPar.par +_parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.asic.par +_parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.digi.par +_parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.gas.par +_parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.gain.par +_parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2020/mTofPar.par +_parfileRich=@VMCWORKDIR@/macro/beamtime/mcbm2020/mRichPar.par +_parfilePsd=@VMCWORKDIR@/macro/beamtime/mcbm2020/mPsdPar.par LOGFILETAG=`hostname` LOGFILETAG+="_" diff --git a/MQ/mcbm/startMQMcbmPulserMonitor2020.sh.in b/MQ/mcbm/startMQMcbmPulserMonitor2020.sh.in index 6bab6e5f25..c9db352cd8 100755 --- a/MQ/mcbm/startMQMcbmPulserMonitor2020.sh.in +++ b/MQ/mcbm/startMQMcbmPulserMonitor2020.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,15 +71,15 @@ else _pubmaxsec=10.0 fi -_parfileSts=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mStsPar.par -_parfileMuch=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mMuchPar.par -_parfileTrdAsic=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.asic.par -_parfileTrdDigi=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.digi.par -_parfileTrdGas=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.gas.par -_parfileTrdGain=/scratch/cbmroot_macro/parameters/trd/trd_v18q_mcbm.gain.par -_parfileTof=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mTofPar.par -_parfileRich=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mRichPar.par -_parfilePsd=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mPsdPar.par +_parfileSts=@VMCWORKDIR@/macro/beamtime/mcbm2020/mStsPar.par +_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2020/mMuchPar.par +_parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.asic.par +_parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.digi.par +_parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.gas.par +_parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v18q_mcbm.gain.par +_parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2020/mTofPar.par +_parfileRich=@VMCWORKDIR@/macro/beamtime/mcbm2020/mRichPar.par +_parfilePsd=@VMCWORKDIR@/macro/beamtime/mcbm2020/mPsdPar.par SAMPLER="MultiTsaSampler" SAMPLER+=" --id sampler1" diff --git a/MQ/monitor/startMQSamplerMonitor.sh.in b/MQ/monitor/startMQSamplerMonitor.sh.in index 217a7af3a0..c6af8b12e6 100755 --- a/MQ/monitor/startMQSamplerMonitor.sh.in +++ b/MQ/monitor/startMQSamplerMonitor.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -44,7 +47,7 @@ else _nbmoni=1 fi -_paramfile=/scratch/cbmroot_macro/macro/beamtime/mcbm2019/mT0Par.par +_paramfile=@VMCWORKDIR@/macro/beamtime/mcbm2019/mT0Par.par SAMPLER="MultiTsaSampler" SAMPLER+=" --id sampler1" diff --git a/MQ/monitor/startMQSamplerPsdMonitor2021.sh.in b/MQ/monitor/startMQSamplerPsdMonitor2021.sh.in index 02d5551fb0..04bd0bba34 100644 --- a/MQ/monitor/startMQSamplerPsdMonitor2021.sh.in +++ b/MQ/monitor/startMQSamplerPsdMonitor2021.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -44,8 +47,7 @@ else _nbmoni=1 fi -_paramfile=/mnt/scratch/users/ploizeau/mcbm2020/cbmroot_pal/macro/beamtime/mcbm2020/mPsdPar.par -##_paramfile=$VMCWORKDIR/macro/beamtime/mcbm2021/mPsdPar.par +_paramfile=@VMCWORKDIR@/macro/beamtime/mcbm2021/mPsdPar.par SAMPLER="MultiTsaSampler" SAMPLER+=" --id sampler1" diff --git a/MQ/monitor/startMQSamplerT0Monitor2020.sh.in b/MQ/monitor/startMQSamplerT0Monitor2020.sh.in index ec1fc8f5ba..b30becf49b 100755 --- a/MQ/monitor/startMQSamplerT0Monitor2020.sh.in +++ b/MQ/monitor/startMQSamplerT0Monitor2020.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,7 +71,7 @@ else _pubmaxsec=10.0 fi -_paramfile=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mT0Par.par +_paramfile=@VMCWORKDIR@/macro/beamtime/mcbm2020/mT0Par.par SAMPLER="MultiTsaSampler" SAMPLER+=" --id sampler1" diff --git a/MQ/monitor/startMQSamplerT0Monitor2021.sh.in b/MQ/monitor/startMQSamplerT0Monitor2021.sh.in index 540ea00aaf..6c5542d515 100755 --- a/MQ/monitor/startMQSamplerT0Monitor2021.sh.in +++ b/MQ/monitor/startMQSamplerT0Monitor2021.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,7 +71,7 @@ else _pubmaxsec=10.0 fi -_paramfile=$VMCWORKDIR/macro/beamtime/mcbm2021/mT0Par.par +_paramfile=@VMCWORKDIR@/macro/beamtime/mcbm2021/mT0Par.par LOGFILETAG=`hostname` LOGFILETAG+="_" @@ -97,7 +100,7 @@ SAMPLER+=" --transport zeromq" # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log SAMPLER_LOG="sampler1_$LOGFILETAG" -xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e $VMCWORKDIR/build/bin/MQ/source/$SAMPLER & +xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/source/$SAMPLER & _iMoni=0 while (( _iMoni < _nbmoni )); do @@ -126,7 +129,7 @@ while (( _iMoni < _nbmoni )); do # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log MONITOR_LOG="monit0_$_iMoni" MONITOR_LOG+="_$LOGFILETAG" - xterm -l -lf $MONITOR_LOG -geometry 80x23+500+$_yOffset -hold -e $VMCWORKDIR/build/bin/MQ/monitor/$MONITOR & + xterm -l -lf $MONITOR_LOG -geometry 80x23+500+$_yOffset -hold -e @CMAKE_BINARY_DIR@/bin/MQ/monitor/$MONITOR & done PARAMETERSERVER="parmq-server" @@ -140,7 +143,7 @@ PARAMETERSERVER+=" --libs-to-load=libCbmFlibMcbm2018" # doesn't work due to runt # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log PARAMSRV_LOG="parmq_$LOGFILETAG" -xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1000+0 -hold -e $VMCWORKDIR/build/bin/MQ/parmq/$PARAMETERSERVER & +xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1000+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/parmq/$PARAMETERSERVER & HISTSERVER="MqHistoServer" HISTSERVER+=" --id server1" @@ -152,4 +155,4 @@ HISTSERVER+=" --channel-config name=canvas-conf,type=sub,method=bind,transport=z # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log HISTSRV_LOG="server1_$LOGFILETAG" -xterm -l -lf $HISTSRV_LOG -geometry 80x23+1500+0 -hold -e $VMCWORKDIR/build/bin/MQ/histogramServer/$HISTSERVER & +xterm -l -lf $HISTSRV_LOG -geometry 80x23+1500+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/histogramServer/$HISTSERVER & diff --git a/MQ/monitor/startMQSamplerTofMonitor2020.sh.in b/MQ/monitor/startMQSamplerTofMonitor2020.sh.in index 38a170f882..49d72c211e 100755 --- a/MQ/monitor/startMQSamplerTofMonitor2020.sh.in +++ b/MQ/monitor/startMQSamplerTofMonitor2020.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,7 +71,7 @@ else _pubmaxsec=10.0 fi -_paramfile=/scratch/cbmroot_macro/macro/beamtime/mcbm2020/mTofPar.par +_paramfile=@VMCWORKDIR@/macro/beamtime/mcbm2020/mTofPar.par SAMPLER="MultiTsaSampler" SAMPLER+=" --id sampler1" diff --git a/MQ/monitor/startMQSamplerTofMonitor2021.sh.in b/MQ/monitor/startMQSamplerTofMonitor2021.sh.in index b8c5bfc923..842aaf1e55 100755 --- a/MQ/monitor/startMQSamplerTofMonitor2021.sh.in +++ b/MQ/monitor/startMQSamplerTofMonitor2021.sh.in @@ -1,5 +1,8 @@ #!/bin/bash -$SIMPATH/bin/fairmq-shmmonitor --cleanup + +if [ -e @SIMPATH@/bin/fairmq-shmmonitor ]; then + @SIMPATH@/bin/fairmq-shmmonitor --cleanup +fi if [ $# -ge 1 ]; then _nbmoni=$1 @@ -68,7 +71,7 @@ else _pubmaxsec=10.0 fi -_paramfile=$VMCWORKDIR/macro/beamtime/mcbm2021/mTofPar.par +_paramfile=@VMCWORKDIR@/macro/beamtime/mcbm2021/mTofPar.par LOGFILETAG=`hostname` LOGFILETAG+="_" @@ -100,7 +103,7 @@ SAMPLER+=" --transport zeromq" # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log SAMPLER_LOG="sampler1_$LOGFILETAG" -xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e $VMCWORKDIR/build/bin/MQ/source/$SAMPLER & +xterm -l -lf $SAMPLER_LOG -geometry 80x23+0+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/source/$SAMPLER & _iMoni=0 ((_oubfreqts = $_nbmoni*100 )) @@ -127,7 +130,7 @@ while (( _iMoni < _nbmoni )); do # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log MONITOR_LOG="monit0_$_iMoni" MONITOR_LOG+="_$LOGFILETAG" - xterm -l -lf $MONITOR_LOG -geometry 80x23+500+$_yOffset -hold -e $VMCWORKDIR/build/bin/MQ/monitor/$MONITOR & + xterm -l -lf $MONITOR_LOG -geometry 80x23+500+$_yOffset -hold -e @CMAKE_BINARY_DIR@/bin/MQ/monitor/$MONITOR & done PARAMETERSERVER="parmq-server" @@ -141,7 +144,7 @@ PARAMETERSERVER+=" --libs-to-load=libCbmFlibMcbm2018" # doesn't work due to runt # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log PARAMSRV_LOG="parmq_$LOGFILETAG" -xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1000+0 -hold -e $VMCWORKDIR/build/bin/MQ/parmq/$PARAMETERSERVER & +xterm -l -lf $PARAMSRV_LOG -geometry 80x23+1000+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/parmq/$PARAMETERSERVER & HISTSERVER="MqHistoServer" HISTSERVER+=" --id server1" @@ -153,4 +156,4 @@ HISTSERVER+=" --channel-config name=canvas-conf,type=sub,method=bind,transport=z # Replaces log filename Xterm.log.hostname.yyyy.mm.dd.hh.mm.ss.XXXXXX # with ProcessName_hostname_yyyy_mm_dd_hh_mm_ss.log HISTSRV_LOG="server1_$LOGFILETAG" -xterm -l -lf $HISTSRV_LOG -geometry 80x23+1500+0 -hold -e $VMCWORKDIR/build/bin/MQ/histogramServer/$HISTSERVER & +xterm -l -lf $HISTSRV_LOG -geometry 80x23+1500+0 -hold -e @CMAKE_BINARY_DIR@/bin/MQ/histogramServer/$HISTSERVER & -- GitLab