From e796e0f49d018519bdc021dee25a0b2954a38e84 Mon Sep 17 00:00:00 2001
From: Dmitry Ozerov <dmitry.ozerov@psi.ch>
Date: Fri, 1 May 2020 12:40:25 +0200
Subject: [PATCH] systemd scripts modified to use /usr/bin

---
 scripts/JF07-buffer-worker.sh       | 4 ++--
 scripts/JF07-buffer-worker@.service | 2 +-
 scripts/JF07-buffer.service         | 2 +-
 scripts/JF07-replay-worker.sh       | 7 ++++---
 scripts/JF07-replay-worker@.service | 2 +-
 scripts/JF07-replay.service         | 2 +-
 scripts/JF07-replay.sh              | 2 --
 7 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 scripts/JF07-replay.sh

diff --git a/scripts/JF07-buffer-worker.sh b/scripts/JF07-buffer-worker.sh
index 981f4ca..edd2e86 100644
--- a/scripts/JF07-buffer-worker.sh
+++ b/scripts/JF07-buffer-worker.sh
@@ -19,5 +19,5 @@ port=$((${initialUDPport}+10#${M}))
 DETECTOR=JF07T32V01
 echo ${port}
 
-#taskset -c ${coreAssociatedBuffer[10#${M}]} /home/dbe/test/sf_buffer M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} > /gpfs/photonics/swissfel/buffer/${port}.log
-taskset -c ${coreAssociatedBuffer[10#${M}]} /home/dbe/test/sf_buffer M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} 
+#taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/bin/sf_buffer M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} > /gpfs/photonics/swissfel/buffer/${port}.log
+taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/bin/sf_buffer M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} 
diff --git a/scripts/JF07-buffer-worker@.service b/scripts/JF07-buffer-worker@.service
index 5da760c..dde262a 100644
--- a/scripts/JF07-buffer-worker@.service
+++ b/scripts/JF07-buffer-worker@.service
@@ -8,7 +8,7 @@ BindsTo=JF07-buffer.service
 PermissionsStartOnly=true
 Type=idle
 User=root
-ExecStart=/usr/bin/sh /home/dbe/test/systemd/JF07-buffer-worker.sh %i
+ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF07-buffer-worker.sh %i
 TimeoutStartSec=10
 RestartSec=10
 
diff --git a/scripts/JF07-buffer.service b/scripts/JF07-buffer.service
index a6967bc..553ea7a 100644
--- a/scripts/JF07-buffer.service
+++ b/scripts/JF07-buffer.service
@@ -3,7 +3,7 @@ Description=All UDP-buffer instances of JF07
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/sh /home/dbe/test/systemd/JF07-buffer-worker.sh
+ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF07-buffer-worker.sh
 RemainAfterExit=yes
 
 [Install]
diff --git a/scripts/JF07-replay-worker.sh b/scripts/JF07-replay-worker.sh
index fc82903..2a60dbe 100644
--- a/scripts/JF07-replay-worker.sh
+++ b/scripts/JF07-replay-worker.sh
@@ -2,7 +2,7 @@
 
 if [ $# != 1 ]
 then
-    echo "need parameter, exit"
+    systemctl start JF07-replay-worker@{00..32}
     exit
 fi
 
@@ -20,7 +20,8 @@ echo "First/last pulse_id : ${first_pulse_id} ${last_pulse_id}"
 
 if [ ${M} == 32 ]
 then
-    taskset -c ${coreAssociated[10#${M}]} /home/dbe/test/sf_writer /gpfs/photonics/swissfel/buffer/test.${first_pulse_id}-${last_pulse_id}.h5 ${first_pulse_id} ${last_pulse_id}
+#    taskset -c ${coreAssociated[10#${M}]} /usr/bin/sf_writer /gpfs/photonics/swissfel/buffer/test.${first_pulse_id}-${last_pulse_id}.h5 ${first_pulse_id} ${last_pulse_id}
+    taskset -c ${coreAssociated[10#${M}]} /usr/bin/sf_stream tcp://129.129.241.42:9007 30 tcp://129.129.241.42:9107 30
 else
-    taskset -c ${coreAssociated[10#${M}]} /home/dbe/test/sf_replay /gpfs/photonics/swissfel/buffer/JF07T32V01 M${M} ${M} ${first_pulse_id} ${last_pulse_id}
+    taskset -c ${coreAssociated[10#${M}]} /usr/bin/sf_replay /gpfs/photonics/swissfel/buffer/JF07T32V01 M${M} ${M} ${first_pulse_id} ${last_pulse_id}
 fi
diff --git a/scripts/JF07-replay-worker@.service b/scripts/JF07-replay-worker@.service
index 8524c99..42e8dda 100644
--- a/scripts/JF07-replay-worker@.service
+++ b/scripts/JF07-replay-worker@.service
@@ -8,7 +8,7 @@ BindsTo=JF07-replay.service
 PermissionsStartOnly=true
 Type=idle
 User=root
-ExecStart=/usr/bin/sh /home/dbe/test/systemd/JF07-replay-worker.sh %i
+ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF07-replay-worker.sh %i
 TimeoutStartSec=10
 RestartSec=10
 
diff --git a/scripts/JF07-replay.service b/scripts/JF07-replay.service
index 193276c..288b922 100644
--- a/scripts/JF07-replay.service
+++ b/scripts/JF07-replay.service
@@ -3,7 +3,7 @@ Description=All replay instances of JF07
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/sh /home/dbe/test/systemd/JF07-replay.sh
+ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF07-replay-worker.sh
 RemainAfterExit=yes
 
 [Install]
diff --git a/scripts/JF07-replay.sh b/scripts/JF07-replay.sh
deleted file mode 100644
index 63a2f8d..0000000
--- a/scripts/JF07-replay.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-systemctl start JF07-replay-worker@{00..32}