From e68a77ce8b01337717e7100096d11ecc7c45df59 Mon Sep 17 00:00:00 2001
From: Dmitry Ozerov <dmitry.ozerov@psi.ch>
Date: Fri, 4 Dec 2020 18:40:42 +0100
Subject: [PATCH] arrangement of alra detectors on daq8 server

---
 scripts/JF02-buffer-worker.sh    | 2 +-
 scripts/JF02-stream.sh           | 2 +-
 scripts/JF02-vis.sh              | 2 +-
 scripts/JF04-buffer-worker.sh    | 2 +-
 scripts/JF04-stream.sh           | 2 +-
 scripts/JF04-vis.sh              | 4 +++-
 scripts/JF06-buffer-worker.sh    | 6 +-----
 scripts/JF06-stream.sh           | 3 +--
 scripts/JF06-vis.sh              | 4 +++-
 scripts/JF06_4M-buffer-worker.sh | 5 +----
 scripts/JF06_4M-stream.sh        | 2 +-
 scripts/JF09-buffer-worker.sh    | 2 +-
 scripts/JF09-stream.sh           | 2 +-
 scripts/JF09-vis.sh              | 4 +++-
 scripts/JF10-buffer-worker.sh    | 2 +-
 scripts/JF10-stream.sh           | 2 +-
 scripts/JF10-vis.sh              | 4 +++-
 17 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/scripts/JF02-buffer-worker.sh b/scripts/JF02-buffer-worker.sh
index 8ab83c8..a358eec 100644
--- a/scripts/JF02-buffer-worker.sh
+++ b/scripts/JF02-buffer-worker.sh
@@ -15,7 +15,7 @@ case ${H} in
   coreAssociatedBuffer=(11 12 13 14 15 16 17 18 19)
   ;;
 'sf-daq-8')
-  coreAssociatedBuffer=(11 11 12 12 13 13 1 1 0)
+  coreAssociatedBuffer=(1 1 1 2 2 2 3 3 3)
   ;;
 *)
   CORES=(25 25 26 26 27 27 28 28 29)
diff --git a/scripts/JF02-stream.sh b/scripts/JF02-stream.sh
index 0df4e74..2ee361f 100644
--- a/scripts/JF02-stream.sh
+++ b/scripts/JF02-stream.sh
@@ -7,7 +7,7 @@ case ${H} in
     config=/gpfs/photonics/swissfel/buffer/config/stream-JF02.json
     ;;
 'sf-daq-8')
-    coreAssociated="14,15,16"
+    coreAssociated="20,21"
     config=/gpfs/photonics/swissfel/buffer/config/stream-JF02.daq8.json
     ;;
 *)
diff --git a/scripts/JF02-vis.sh b/scripts/JF02-vis.sh
index 2aa7816..f13f7a8 100644
--- a/scripts/JF02-vis.sh
+++ b/scripts/JF02-vis.sh
@@ -17,7 +17,7 @@ case ${H} in
   CORES='36,37'
   ;;
 'sf-daq-8')
-  CORES='17,18'
+  CORES='33,34'
   ;;
 *)
   CORES='2'
diff --git a/scripts/JF04-buffer-worker.sh b/scripts/JF04-buffer-worker.sh
index c479a3d..e0be303 100644
--- a/scripts/JF04-buffer-worker.sh
+++ b/scripts/JF04-buffer-worker.sh
@@ -8,7 +8,7 @@ fi
 
 M=$1
 
-coreAssociatedBuffer=(33)
+coreAssociatedBuffer=(12)
 
 initialUDPport=50040
 port=$((${initialUDPport}+10#${M}))
diff --git a/scripts/JF04-stream.sh b/scripts/JF04-stream.sh
index d38ce38..307df8f 100644
--- a/scripts/JF04-stream.sh
+++ b/scripts/JF04-stream.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-coreAssociated="36"
+coreAssociated="27"
 
 taskset -c ${coreAssociated} /usr/local/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF04.json
diff --git a/scripts/JF04-vis.sh b/scripts/JF04-vis.sh
index 4fd87a0..72478a8 100644
--- a/scripts/JF04-vis.sh
+++ b/scripts/JF04-vis.sh
@@ -11,7 +11,9 @@ PORT_BACKEND=9004
 H=`echo ${HOSTNAME} | sed 's/.psi.ch//'`
 BACKEND=${H}
 
-taskset -c 16 \
+CORES=39
+
+taskset -c ${CORES} \
 streamvis bernina --allow-websocket-origin=${H}:${PORT} \
 --allow-websocket-origin=sf-daq-bernina:${PORT} --port=${PORT} \
 --address tcp://${BACKEND}:${PORT_BACKEND} \
diff --git a/scripts/JF06-buffer-worker.sh b/scripts/JF06-buffer-worker.sh
index bf9691b..1c94d44 100644
--- a/scripts/JF06-buffer-worker.sh
+++ b/scripts/JF06-buffer-worker.sh
@@ -8,11 +8,7 @@ fi
 
 M=$1
 
-# Add ourselves to the user cpuset.
-# echo $$ > /sys/fs/cgroup/cpuset/user/tasks
-
-#coreAssociatedBuffer=(22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 31 32 32 33 33 34 34 35 35 36 36 37 37)
-coreAssociatedBuffer=(6 6 7 7 8 8 9 9 10 10 22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 31 32 32)
+coreAssociatedBuffer=(4 4 4 4 5 5 5 5 6 6 6 6 7 7 7 7 8 8 8 8 9 9 9 9 10 10 10 10 11 11 11 11)
 
 initialUDPport=50060
 port=$((${initialUDPport}+10#${M}))
diff --git a/scripts/JF06-stream.sh b/scripts/JF06-stream.sh
index 9a90023..28a48db 100644
--- a/scripts/JF06-stream.sh
+++ b/scripts/JF06-stream.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-coreAssociated="2,3,4,5"
-#echo $$ > /sys/fs/cgroup/cpuset/user/tasks
+coreAssociated="22,23,24"
 
 taskset -c ${coreAssociated} /usr/local/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF06.daq8.json
diff --git a/scripts/JF06-vis.sh b/scripts/JF06-vis.sh
index 829531b..a3050f9 100644
--- a/scripts/JF06-vis.sh
+++ b/scripts/JF06-vis.sh
@@ -11,7 +11,9 @@ PORT_BACKEND=9006
 H=`echo ${HOSTNAME} | sed 's/.psi.ch//'`
 BACKEND=${H}
 
-taskset -c 19,20 \
+CORES="35,36"
+
+taskset -c ${CORES} \
 streamvis default16m --allow-websocket-origin=${H}:${PORT} --allow-websocket-origin=sf-daq-alvra:${PORT} \
 --port=${PORT} --address  tcp://${BACKEND}:${PORT_BACKEND} \
 --page-title 16M_Jungfrau_Alvra
diff --git a/scripts/JF06_4M-buffer-worker.sh b/scripts/JF06_4M-buffer-worker.sh
index 6d0c062..7bc9afd 100644
--- a/scripts/JF06_4M-buffer-worker.sh
+++ b/scripts/JF06_4M-buffer-worker.sh
@@ -8,10 +8,7 @@ fi
 
 M=$1
 
-# Add ourselves to the user cpuset.
-# echo $$ > /sys/fs/cgroup/cpuset/user/tasks
-
-coreAssociatedBuffer=(6 7 8 9 10 22 23 24)
+coreAssociatedBuffer=(4 5 6 7 8 9 10 11)
 
 initialUDPport=50060
 port=$((${initialUDPport}+10#${M}))
diff --git a/scripts/JF06_4M-stream.sh b/scripts/JF06_4M-stream.sh
index 21966d4..44c5f49 100644
--- a/scripts/JF06_4M-stream.sh
+++ b/scripts/JF06_4M-stream.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-coreAssociated="2,3,4,5"
+coreAssociated="20,21"
 
 taskset -c ${coreAssociated} /usr/local/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF06_4M.daq8.json
diff --git a/scripts/JF09-buffer-worker.sh b/scripts/JF09-buffer-worker.sh
index 6056cc6..49f6013 100644
--- a/scripts/JF09-buffer-worker.sh
+++ b/scripts/JF09-buffer-worker.sh
@@ -8,7 +8,7 @@ fi
 
 M=$1
 
-coreAssociatedBuffer=(34)
+coreAssociatedBuffer=(12)
 
 initialUDPport=50150
 port=$((${initialUDPport}+10#${M}))
diff --git a/scripts/JF09-stream.sh b/scripts/JF09-stream.sh
index f0b5a33..e1c239b 100644
--- a/scripts/JF09-stream.sh
+++ b/scripts/JF09-stream.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-coreAssociated="37"
+coreAssociated="25"
 
 taskset -c ${coreAssociated} /usr/local/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF09.json
diff --git a/scripts/JF09-vis.sh b/scripts/JF09-vis.sh
index b8e2b24..3b7eeb7 100644
--- a/scripts/JF09-vis.sh
+++ b/scripts/JF09-vis.sh
@@ -11,7 +11,9 @@ PORT_BACKEND=9009
 H=`echo ${HOSTNAME} | sed 's/.psi.ch//'`
 BACKEND=${H}
 
-taskset -c 17 \
+CORES=37
+
+taskset -c ${CORES} \
 streamvis alvra --allow-websocket-origin=${H}:${PORT} \
 --allow-websocket-origin=sf-daq-alvra:${PORT} --port=${PORT} \
 --address tcp://${BACKEND}:${PORT_BACKEND} \
diff --git a/scripts/JF10-buffer-worker.sh b/scripts/JF10-buffer-worker.sh
index 7f57f56..b17dac8 100644
--- a/scripts/JF10-buffer-worker.sh
+++ b/scripts/JF10-buffer-worker.sh
@@ -8,7 +8,7 @@ fi
 
 M=$1
 
-coreAssociatedBuffer=(35)
+coreAssociatedBuffer=(12)
 
 initialUDPport=50160
 port=$((${initialUDPport}+10#${M}))
diff --git a/scripts/JF10-stream.sh b/scripts/JF10-stream.sh
index 507e28b..d204c45 100644
--- a/scripts/JF10-stream.sh
+++ b/scripts/JF10-stream.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-coreAssociated="38"
+coreAssociated="26"
 
 taskset -c ${coreAssociated} /usr/local/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF10.json
diff --git a/scripts/JF10-vis.sh b/scripts/JF10-vis.sh
index f7f6a9a..fe77449 100644
--- a/scripts/JF10-vis.sh
+++ b/scripts/JF10-vis.sh
@@ -11,7 +11,9 @@ PORT_BACKEND=9010
 H=`echo ${HOSTNAME} | sed 's/.psi.ch//'`
 BACKEND=${H}
 
-taskset -c 18 \
+CORES=38
+
+taskset -c ${CORES} \
 streamvis alvra --allow-websocket-origin=${H}:${PORT} \
 --allow-websocket-origin=sf-daq-alvra:${PORT} --port=${PORT} \
 --address tcp://${BACKEND}:${PORT_BACKEND} \