From 93ab781b9ca2a921a31e5d344478dcc04464b74a Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Fri, 4 Sep 2020 13:49:22 +0200
Subject: [PATCH] Change start scripts for new sf_buffer

---
 scripts/JF01-buffer-worker.sh    | 3 ++-
 scripts/JF02-buffer-worker.sh    | 3 ++-
 scripts/JF06-buffer-worker.sh    | 3 ++-
 scripts/JF06_4M-buffer-worker.sh | 3 ++-
 scripts/JF07-buffer-worker.sh    | 3 ++-
 scripts/JF13-buffer-worker.sh    | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/JF01-buffer-worker.sh b/scripts/JF01-buffer-worker.sh
index b907af5..311471a 100644
--- a/scripts/JF01-buffer-worker.sh
+++ b/scripts/JF01-buffer-worker.sh
@@ -16,5 +16,6 @@ coreAssociatedBuffer=(12 12 12)
 initialUDPport=50010
 port=$((${initialUDPport}+10#${M}))
 DETECTOR=JF01T03V01
+N_MODULES=3
 
-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/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M}
diff --git a/scripts/JF02-buffer-worker.sh b/scripts/JF02-buffer-worker.sh
index 226db66..a9fc4c0 100644
--- a/scripts/JF02-buffer-worker.sh
+++ b/scripts/JF02-buffer-worker.sh
@@ -16,5 +16,6 @@ coreAssociatedBuffer=(39 39 39 40 40 40 41 41 41)
 initialUDPport=50020
 port=$((${initialUDPport}+10#${M}))
 DETECTOR=JF02T09V02
+N_MODULES=9
 
-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/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M}
diff --git a/scripts/JF06-buffer-worker.sh b/scripts/JF06-buffer-worker.sh
index dd9c721..731ac88 100644
--- a/scripts/JF06-buffer-worker.sh
+++ b/scripts/JF06-buffer-worker.sh
@@ -16,5 +16,6 @@ coreAssociatedBuffer=(22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 3
 initialUDPport=50060
 port=$((${initialUDPport}+10#${M}))
 DETECTOR=JF06T32V02
+N_MODULES=32
 
-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/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M}
diff --git a/scripts/JF06_4M-buffer-worker.sh b/scripts/JF06_4M-buffer-worker.sh
index c67c0e5..6a6e924 100644
--- a/scripts/JF06_4M-buffer-worker.sh
+++ b/scripts/JF06_4M-buffer-worker.sh
@@ -16,5 +16,6 @@ coreAssociatedBuffer=(22 23 24 25 26 27 28 29)
 initialUDPport=50060
 port=$((${initialUDPport}+10#${M}))
 DETECTOR=JF06T08V01
+N_MODULES=8
 
-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/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M}
diff --git a/scripts/JF07-buffer-worker.sh b/scripts/JF07-buffer-worker.sh
index 5d744e1..2698a36 100644
--- a/scripts/JF07-buffer-worker.sh
+++ b/scripts/JF07-buffer-worker.sh
@@ -23,5 +23,6 @@ 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 1
 initialUDPport=50100
 port=$((${initialUDPport}+10#${M}))
 DETECTOR=JF07T32V01
+N_MODULES=32
 
-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/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M}
diff --git a/scripts/JF13-buffer-worker.sh b/scripts/JF13-buffer-worker.sh
index c269179..21fff2a 100644
--- a/scripts/JF13-buffer-worker.sh
+++ b/scripts/JF13-buffer-worker.sh
@@ -16,5 +16,6 @@ coreAssociatedBuffer=(13)
 initialUDPport=50190
 port=$((${initialUDPport}+10#${M}))
 DETECTOR=JF13T01V01
+N_MODULES=1
 
-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/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M}