diff --git a/scripts/JF01-buffer-worker.sh b/scripts/JF01-buffer-worker.sh index b907af5..e9a101e 100644 --- a/scripts/JF01-buffer-worker.sh +++ b/scripts/JF01-buffer-worker.sh @@ -8,13 +8,10 @@ fi M=$1 -# Add ourselves to the user cpuset. -# echo $$ > /sys/fs/cgroup/cpuset/user/tasks - coreAssociatedBuffer=(12 12 12) initialUDPport=50010 port=$((${initialUDPport}+10#${M})) DETECTOR=JF01T03V01 -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} +taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF01-buffer-worker@.service b/scripts/JF01-buffer-worker@.service index b8b6a97..afe7806 100644 --- a/scripts/JF01-buffer-worker@.service +++ b/scripts/JF01-buffer-worker@.service @@ -8,7 +8,7 @@ BindsTo=JF01-buffer.service PermissionsStartOnly=true Type=idle User=root -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF01-buffer-worker.sh %i +ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF01-buffer-worker.sh %i TimeoutStartSec=10 RestartSec=10 diff --git a/scripts/JF01-buffer.service b/scripts/JF01-buffer.service index efdc14d..335d8c2 100644 --- a/scripts/JF01-buffer.service +++ b/scripts/JF01-buffer.service @@ -3,7 +3,7 @@ Description=All UDP-buffer instances of JF01 [Service] Type=oneshot -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF01-buffer-worker.sh +ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF01-buffer-worker.sh RemainAfterExit=yes [Install] diff --git a/scripts/JF01-stream.service b/scripts/JF01-stream.service index 8d2fc35..58a7d69 100644 --- a/scripts/JF01-stream.service +++ b/scripts/JF01-stream.service @@ -5,7 +5,7 @@ Description=stream service (to streamvis and live analysis) of JF01 PermissionsStartOnly=true Type=idle User=root -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF01-stream.sh +ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF01-stream.sh TimeoutStartSec=10 Restart=on-failure RestartSec=1 diff --git a/scripts/JF01-stream.sh b/scripts/JF01-stream.sh index c7d1724..85ed846 100644 --- a/scripts/JF01-stream.sh +++ b/scripts/JF01-stream.sh @@ -2,4 +2,4 @@ coreAssociated="24" -taskset -c ${coreAssociated} /usr/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF01.json +taskset -c ${coreAssociated} /usr/local/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF01.json diff --git a/scripts/JF01-vis.service b/scripts/JF01-vis.service new file mode 100644 index 0000000..1eb1ac3 --- /dev/null +++ b/scripts/JF01-vis.service @@ -0,0 +1,13 @@ +[Unit] +Description=streamvis: JF01 + +[Service] +User=root +TimeoutStartSec=2 +ExecStart=/bin/bash ./home/dbe/service_scripts/JF01-vis.sh +Restart=on-failure +RestartSec=4 + +[Install] +WantedBy=multi-user.target + diff --git a/scripts/JF01-vis.sh b/scripts/JF01-vis.sh new file mode 100644 index 0000000..d74b688 --- /dev/null +++ b/scripts/JF01-vis.sh @@ -0,0 +1,19 @@ +export PATH=/home/dbe/miniconda3/bin:$PATH + +source /home/dbe/miniconda3/etc/profile.d/conda.sh + +conda deactivate +conda activate vis + +PORT=5001 +PORT_BACKEND=9001 + +H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` +BACKEND=${H} + +taskset -c 17,18 \ +streamvis bernina --allow-websocket-origin=${H}:${PORT} \ +--allow-websocket-origin=sf-daq-bernina:${PORT} --port=${PORT} \ +--address tcp://${BACKEND}:${PORT_BACKEND} \ +--page-title 1p5M +