From b1df0fe9f60243cd82357fbf55052e0815681f4a Mon Sep 17 00:00:00 2001 From: Dmitry Ozerov Date: Fri, 16 Jul 2021 13:04:50 +0200 Subject: [PATCH] removed not needed anymore scripts (they moved to ansible on operation_tools of sf_daq_broker) --- scripts/JF01-buffer-worker.sh | 18 --------------- scripts/JF01-buffer-worker@.service | 16 ------------- scripts/JF01-buffer.service | 10 --------- scripts/JF01-stream.service | 15 ------------- scripts/JF01-stream.sh | 9 -------- scripts/JF01-vis.service | 13 ----------- scripts/JF01-vis.sh | 19 ---------------- scripts/JF02-buffer-worker.sh | 29 ------------------------ scripts/JF02-buffer-worker@.service | 16 ------------- scripts/JF02-buffer.service | 10 --------- scripts/JF02-stream.service | 15 ------------- scripts/JF02-stream.sh | 22 ------------------ scripts/JF02-vis.service | 13 ----------- scripts/JF02-vis.sh | 31 -------------------------- scripts/JF03-buffer-worker.sh | 17 -------------- scripts/JF03-buffer-worker@.service | 16 ------------- scripts/JF03-buffer.service | 10 --------- scripts/JF03-stream.service | 15 ------------- scripts/JF03-stream.sh | 9 -------- scripts/JF03-vis.service | 13 ----------- scripts/JF03-vis.sh | 21 ----------------- scripts/JF04-buffer-worker.sh | 17 -------------- scripts/JF04-buffer-worker@.service | 16 ------------- scripts/JF04-buffer.service | 10 --------- scripts/JF04-stream.service | 15 ------------- scripts/JF04-stream.sh | 9 -------- scripts/JF04-vis.service | 13 ----------- scripts/JF04-vis.sh | 21 ----------------- scripts/JF06-buffer-worker.sh | 18 --------------- scripts/JF06-buffer-worker@.service | 16 ------------- scripts/JF06-buffer.service | 10 --------- scripts/JF06-stream.service | 15 ------------- scripts/JF06-stream.sh | 9 -------- scripts/JF06-vis.service | 13 ----------- scripts/JF06-vis.sh | 20 ----------------- scripts/JF06_4M-buffer-worker.sh | 18 --------------- scripts/JF06_4M-buffer-worker@.service | 16 ------------- scripts/JF06_4M-buffer.service | 10 --------- scripts/JF06_4M-stream.service | 15 ------------- scripts/JF06_4M-stream.sh | 10 --------- scripts/JF07-buffer-worker.sh | 28 ----------------------- scripts/JF07-buffer-worker@.service | 16 ------------- scripts/JF07-buffer.service | 10 --------- scripts/JF07-stream.service | 15 ------------- scripts/JF07-stream.sh | 9 -------- scripts/JF09-buffer-worker.sh | 17 -------------- scripts/JF09-buffer-worker@.service | 16 ------------- scripts/JF09-buffer.service | 10 --------- scripts/JF09-stream.service | 15 ------------- scripts/JF09-stream.sh | 9 -------- scripts/JF09-vis.service | 13 ----------- scripts/JF09-vis.sh | 21 ----------------- scripts/JF10-buffer-worker.sh | 17 -------------- scripts/JF10-buffer-worker@.service | 16 ------------- scripts/JF10-buffer.service | 10 --------- scripts/JF10-stream.service | 15 ------------- scripts/JF10-stream.sh | 9 -------- scripts/JF10-vis.service | 13 ----------- scripts/JF10-vis.sh | 21 ----------------- scripts/JF11-buffer-worker.sh | 17 -------------- scripts/JF11-buffer-worker@.service | 16 ------------- scripts/JF11-buffer.service | 10 --------- scripts/JF11-stream.service | 15 ------------- scripts/JF11-stream.sh | 9 -------- scripts/JF11-vis.service | 13 ----------- scripts/JF11-vis.sh | 18 --------------- scripts/JF13-buffer-worker.sh | 21 ----------------- scripts/JF13-buffer-worker@.service | 16 ------------- scripts/JF13-buffer.service | 10 --------- scripts/JF13-stream.service | 15 ------------- scripts/JF13-stream.sh | 9 -------- scripts/poor_pulseid_now.py | 6 ----- 72 files changed, 1063 deletions(-) delete mode 100644 scripts/JF01-buffer-worker.sh delete mode 100644 scripts/JF01-buffer-worker@.service delete mode 100644 scripts/JF01-buffer.service delete mode 100644 scripts/JF01-stream.service delete mode 100644 scripts/JF01-stream.sh delete mode 100644 scripts/JF01-vis.service delete mode 100644 scripts/JF01-vis.sh delete mode 100644 scripts/JF02-buffer-worker.sh delete mode 100644 scripts/JF02-buffer-worker@.service delete mode 100644 scripts/JF02-buffer.service delete mode 100644 scripts/JF02-stream.service delete mode 100644 scripts/JF02-stream.sh delete mode 100644 scripts/JF02-vis.service delete mode 100644 scripts/JF02-vis.sh delete mode 100644 scripts/JF03-buffer-worker.sh delete mode 100644 scripts/JF03-buffer-worker@.service delete mode 100644 scripts/JF03-buffer.service delete mode 100644 scripts/JF03-stream.service delete mode 100644 scripts/JF03-stream.sh delete mode 100644 scripts/JF03-vis.service delete mode 100644 scripts/JF03-vis.sh delete mode 100644 scripts/JF04-buffer-worker.sh delete mode 100644 scripts/JF04-buffer-worker@.service delete mode 100644 scripts/JF04-buffer.service delete mode 100644 scripts/JF04-stream.service delete mode 100644 scripts/JF04-stream.sh delete mode 100644 scripts/JF04-vis.service delete mode 100644 scripts/JF04-vis.sh delete mode 100644 scripts/JF06-buffer-worker.sh delete mode 100644 scripts/JF06-buffer-worker@.service delete mode 100644 scripts/JF06-buffer.service delete mode 100644 scripts/JF06-stream.service delete mode 100644 scripts/JF06-stream.sh delete mode 100644 scripts/JF06-vis.service delete mode 100644 scripts/JF06-vis.sh delete mode 100644 scripts/JF06_4M-buffer-worker.sh delete mode 100644 scripts/JF06_4M-buffer-worker@.service delete mode 100644 scripts/JF06_4M-buffer.service delete mode 100644 scripts/JF06_4M-stream.service delete mode 100644 scripts/JF06_4M-stream.sh delete mode 100644 scripts/JF07-buffer-worker.sh delete mode 100644 scripts/JF07-buffer-worker@.service delete mode 100644 scripts/JF07-buffer.service delete mode 100644 scripts/JF07-stream.service delete mode 100644 scripts/JF07-stream.sh delete mode 100644 scripts/JF09-buffer-worker.sh delete mode 100644 scripts/JF09-buffer-worker@.service delete mode 100644 scripts/JF09-buffer.service delete mode 100644 scripts/JF09-stream.service delete mode 100644 scripts/JF09-stream.sh delete mode 100644 scripts/JF09-vis.service delete mode 100644 scripts/JF09-vis.sh delete mode 100644 scripts/JF10-buffer-worker.sh delete mode 100644 scripts/JF10-buffer-worker@.service delete mode 100644 scripts/JF10-buffer.service delete mode 100644 scripts/JF10-stream.service delete mode 100644 scripts/JF10-stream.sh delete mode 100644 scripts/JF10-vis.service delete mode 100644 scripts/JF10-vis.sh delete mode 100644 scripts/JF11-buffer-worker.sh delete mode 100644 scripts/JF11-buffer-worker@.service delete mode 100644 scripts/JF11-buffer.service delete mode 100644 scripts/JF11-stream.service delete mode 100644 scripts/JF11-stream.sh delete mode 100644 scripts/JF11-vis.service delete mode 100644 scripts/JF11-vis.sh delete mode 100644 scripts/JF13-buffer-worker.sh delete mode 100644 scripts/JF13-buffer-worker@.service delete mode 100644 scripts/JF13-buffer.service delete mode 100644 scripts/JF13-stream.service delete mode 100644 scripts/JF13-stream.sh delete mode 100644 scripts/poor_pulseid_now.py diff --git a/scripts/JF01-buffer-worker.sh b/scripts/JF01-buffer-worker.sh deleted file mode 100644 index a7ae3db..0000000 --- a/scripts/JF01-buffer-worker.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF01-buffer-worker@{00..02} - exit -fi - -M=$1 - -coreAssociatedBuffer=(12 12 12) - -initialUDPport=50010 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF01T03V01 -N_MODULES=3 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF01-buffer-worker@.service b/scripts/JF01-buffer-worker@.service deleted file mode 100644 index afe7806..0000000 --- a/scripts/JF01-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF01 UDP2buffer worker instance as a service, instance %i -Requires=JF01-buffer.service -Before=JF01-buffer.service -BindsTo=JF01-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF01-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=10 - -[Install] -WantedBy=JF01-buffer.service diff --git a/scripts/JF01-buffer.service b/scripts/JF01-buffer.service deleted file mode 100644 index 335d8c2..0000000 --- a/scripts/JF01-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF01 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF01-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF01-stream.service b/scripts/JF01-stream.service deleted file mode 100644 index 58a7d69..0000000 --- a/scripts/JF01-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF01 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF01-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF01-stream.sh b/scripts/JF01-stream.sh deleted file mode 100644 index 6341508..0000000 --- a/scripts/JF01-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="24" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF01.json -SERVICE=JF01-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF01-vis.service b/scripts/JF01-vis.service deleted file mode 100644 index 1eb1ac3..0000000 --- a/scripts/JF01-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[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 deleted file mode 100644 index d74b688..0000000 --- a/scripts/JF01-vis.sh +++ /dev/null @@ -1,19 +0,0 @@ -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 - diff --git a/scripts/JF02-buffer-worker.sh b/scripts/JF02-buffer-worker.sh deleted file mode 100644 index 1bb35e0..0000000 --- a/scripts/JF02-buffer-worker.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF02-buffer-worker@{00..08} - exit -fi - -M=$1 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` - -case ${H} in -'sf-daq-4') - coreAssociatedBuffer=(11 12 13 14 15 16 17 18 19) - ;; -'sf-daq-8') - coreAssociatedBuffer=(1 1 1 2 2 2 3 3 3) - ;; -*) - CORES=(25 25 26 26 27 27 28 28 29) -esac - -initialUDPport=50020 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF02T09V02 -N_MODULES=9 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF02-buffer-worker@.service b/scripts/JF02-buffer-worker@.service deleted file mode 100644 index 55031e4..0000000 --- a/scripts/JF02-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF02 UDP2buffer worker instance as a service, instance %i -Requires=JF02-buffer.service -Before=JF02-buffer.service -BindsTo=JF02-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF02-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF02-buffer.service diff --git a/scripts/JF02-buffer.service b/scripts/JF02-buffer.service deleted file mode 100644 index 4302f4a..0000000 --- a/scripts/JF02-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF02 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF02-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF02-stream.service b/scripts/JF02-stream.service deleted file mode 100644 index 0cd706e..0000000 --- a/scripts/JF02-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF02 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF02-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF02-stream.sh b/scripts/JF02-stream.sh deleted file mode 100644 index 7912e94..0000000 --- a/scripts/JF02-stream.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -case ${H} in -'sf-daq-4') - coreAssociated="33,34,35" - CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF02.daq4.json - ;; -'sf-daq-8') - coreAssociated="20,21" - CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF02.json - ;; -*) - coreAssociated="12" -esac - -SERVICE=JF02-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} - diff --git a/scripts/JF02-vis.service b/scripts/JF02-vis.service deleted file mode 100644 index a80fe66..0000000 --- a/scripts/JF02-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=streamvis: JF02 - -[Service] -User=root -TimeoutStartSec=2 -ExecStart=/bin/bash ./home/dbe/service_scripts/JF02-vis.sh -Restart=on-failure -RestartSec=4 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF02-vis.sh b/scripts/JF02-vis.sh deleted file mode 100644 index f13f7a8..0000000 --- a/scripts/JF02-vis.sh +++ /dev/null @@ -1,31 +0,0 @@ -export PATH=/home/dbe/miniconda3/bin:$PATH - -source /home/dbe/miniconda3/etc/profile.d/conda.sh - -conda deactivate -conda activate vis - -PORT=5002 -PORT_BACKEND=9002 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -BACKEND=${H} - - -case ${H} in -'sf-daq-4') - CORES='36,37' - ;; -'sf-daq-8') - CORES='33,34' - ;; -*) - CORES='2' -esac - -taskset -c ${CORES} \ -streamvis alvra --allow-websocket-origin=${H}:${PORT} \ ---allow-websocket-origin=sf-daq-alvra:${PORT} --port=${PORT} \ ---address tcp://${BACKEND}:${PORT_BACKEND} \ ---page-title 4p5M_Alvra - diff --git a/scripts/JF03-buffer-worker.sh b/scripts/JF03-buffer-worker.sh deleted file mode 100644 index 00ecbc4..0000000 --- a/scripts/JF03-buffer-worker.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF03-buffer-worker@00 - exit -fi - -M=$1 - -coreAssociatedBuffer=(12) - -initialUDPport=50030 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF03T01V01 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF03-buffer-worker@.service b/scripts/JF03-buffer-worker@.service deleted file mode 100644 index 758aed9..0000000 --- a/scripts/JF03-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF03 UDP2buffer worker instance as a service, instance %i -Requires=JF03-buffer.service -Before=JF03-buffer.service -BindsTo=JF03-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF03-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF03-buffer.service diff --git a/scripts/JF03-buffer.service b/scripts/JF03-buffer.service deleted file mode 100644 index 7e87546..0000000 --- a/scripts/JF03-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF03 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF03-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF03-stream.service b/scripts/JF03-stream.service deleted file mode 100644 index 0cce437..0000000 --- a/scripts/JF03-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF03 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF03-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF03-stream.sh b/scripts/JF03-stream.sh deleted file mode 100644 index 62ef433..0000000 --- a/scripts/JF03-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="27" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF03.json -SERVICE=JF03-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF03-vis.service b/scripts/JF03-vis.service deleted file mode 100644 index 636e27c..0000000 --- a/scripts/JF03-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=streamvis: JF03 - -[Service] -User=root -TimeoutStartSec=2 -ExecStart=/bin/bash ./home/dbe/service_scripts/JF03-vis.sh -Restart=on-failure -RestartSec=4 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF03-vis.sh b/scripts/JF03-vis.sh deleted file mode 100644 index 9fa8dd4..0000000 --- a/scripts/JF03-vis.sh +++ /dev/null @@ -1,21 +0,0 @@ -export PATH=/home/dbe/miniconda3/bin:$PATH - -source /home/dbe/miniconda3/etc/profile.d/conda.sh - -conda deactivate -conda activate vis - -PORT=5003 -PORT_BACKEND=9003 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -BACKEND=${H} - -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} \ ---page-title I0 - diff --git a/scripts/JF04-buffer-worker.sh b/scripts/JF04-buffer-worker.sh deleted file mode 100644 index e0be303..0000000 --- a/scripts/JF04-buffer-worker.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF04-buffer-worker@00 - exit -fi - -M=$1 - -coreAssociatedBuffer=(12) - -initialUDPport=50040 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF04T01V01 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF04-buffer-worker@.service b/scripts/JF04-buffer-worker@.service deleted file mode 100644 index b913054..0000000 --- a/scripts/JF04-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF04 UDP2buffer worker instance as a service, instance %i -Requires=JF04-buffer.service -Before=JF04-buffer.service -BindsTo=JF04-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF04-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF04-buffer.service diff --git a/scripts/JF04-buffer.service b/scripts/JF04-buffer.service deleted file mode 100644 index 6bfdadb..0000000 --- a/scripts/JF04-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF04 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF04-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF04-stream.service b/scripts/JF04-stream.service deleted file mode 100644 index 8ffd01a..0000000 --- a/scripts/JF04-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF04 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF04-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF04-stream.sh b/scripts/JF04-stream.sh deleted file mode 100644 index e8690d2..0000000 --- a/scripts/JF04-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="27" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF04.json -SERVICE=JF04-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF04-vis.service b/scripts/JF04-vis.service deleted file mode 100644 index 78ae2bb..0000000 --- a/scripts/JF04-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=streamvis: JF04 - -[Service] -User=root -TimeoutStartSec=2 -ExecStart=/bin/bash ./home/dbe/service_scripts/JF04-vis.sh -Restart=on-failure -RestartSec=4 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF04-vis.sh b/scripts/JF04-vis.sh deleted file mode 100644 index 72478a8..0000000 --- a/scripts/JF04-vis.sh +++ /dev/null @@ -1,21 +0,0 @@ -export PATH=/home/dbe/miniconda3/bin:$PATH - -source /home/dbe/miniconda3/etc/profile.d/conda.sh - -conda deactivate -conda activate vis - -PORT=5004 -PORT_BACKEND=9004 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -BACKEND=${H} - -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} \ ---page-title Fluorescence - diff --git a/scripts/JF06-buffer-worker.sh b/scripts/JF06-buffer-worker.sh deleted file mode 100644 index 3124952..0000000 --- a/scripts/JF06-buffer-worker.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF06-buffer-worker@{00..31} - exit -fi - -M=$1 - -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})) -DETECTOR=JF06T32V02 -N_MODULES=32 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF06-buffer-worker@.service b/scripts/JF06-buffer-worker@.service deleted file mode 100644 index c0380f1..0000000 --- a/scripts/JF06-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF06 UDP2buffer worker instance as a service, instance %i -Requires=JF06-buffer.service -Before=JF06-buffer.service -BindsTo=JF06-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF06-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF06-buffer.service diff --git a/scripts/JF06-buffer.service b/scripts/JF06-buffer.service deleted file mode 100644 index 4195d8e..0000000 --- a/scripts/JF06-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF06 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF06-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF06-stream.service b/scripts/JF06-stream.service deleted file mode 100644 index d4fdd80..0000000 --- a/scripts/JF06-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF06 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF06-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF06-stream.sh b/scripts/JF06-stream.sh deleted file mode 100644 index 03d6adf..0000000 --- a/scripts/JF06-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="22,23,24" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF06.json -SERVICE=JF06-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF06-vis.service b/scripts/JF06-vis.service deleted file mode 100644 index ff6b509..0000000 --- a/scripts/JF06-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=streamvis: JF06 - -[Service] -User=root -TimeoutStartSec=2 -ExecStart=/bin/bash ./home/dbe/service_scripts/JF06-vis.sh -Restart=on-failure -RestartSec=4 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF06-vis.sh b/scripts/JF06-vis.sh deleted file mode 100644 index a3050f9..0000000 --- a/scripts/JF06-vis.sh +++ /dev/null @@ -1,20 +0,0 @@ -export PATH=/home/dbe/miniconda3/bin:$PATH - -source /home/dbe/miniconda3/etc/profile.d/conda.sh - -conda deactivate -conda activate vis - -PORT=5006 -PORT_BACKEND=9006 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -BACKEND=${H} - -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 deleted file mode 100644 index 846f5eb..0000000 --- a/scripts/JF06_4M-buffer-worker.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF06_4M-buffer-worker@{00..07} - exit -fi - -M=$1 - -coreAssociatedBuffer=(4 5 6 7 8 9 10 11) - -initialUDPport=50060 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF06T08V02 -N_MODULES=8 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} ${N_MODULES} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF06_4M-buffer-worker@.service b/scripts/JF06_4M-buffer-worker@.service deleted file mode 100644 index 9960018..0000000 --- a/scripts/JF06_4M-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF06(4M mode) UDP2buffer worker instance as a service, instance %i -Requires=JF06_4M-buffer.service -Before=JF06_4M-buffer.service -BindsTo=JF06_4M-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF06_4M-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF06_4M-buffer.service diff --git a/scripts/JF06_4M-buffer.service b/scripts/JF06_4M-buffer.service deleted file mode 100644 index 41d5610..0000000 --- a/scripts/JF06_4M-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF06(4M mode) - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF06_4M-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF06_4M-stream.service b/scripts/JF06_4M-stream.service deleted file mode 100644 index bd332ab..0000000 --- a/scripts/JF06_4M-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF06 (4M mode) - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF06_4M-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF06_4M-stream.sh b/scripts/JF06_4M-stream.sh deleted file mode 100644 index 7896ef8..0000000 --- a/scripts/JF06_4M-stream.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -coreAssociated="20,21" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF06_4M.daq8.json -SERVICE=JF06_4M-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} - diff --git a/scripts/JF07-buffer-worker.sh b/scripts/JF07-buffer-worker.sh deleted file mode 100644 index 2698a36..0000000 --- a/scripts/JF07-buffer-worker.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF07-buffer-worker@{00..31} - exit -fi - -M=$1 - -# Add ourselves to the user cpuset. -# echo $$ > /sys/fs/cgroup/cpuset/user/tasks - -#8 udp2buffer workers per core -#coreAssociatedBuffer=(4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 6 6 6 6 6 6 6 6 7 7 7 7 7 7 7 7 8 8 8 8 8 8 8 8) -#4 udp2buffer workers per core -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) -#2 udp2buffer workers per core -#coreAssociatedBuffer=(4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11 12 12 13 13 14 14 15 15 16 16 17 17 18 18 19 19) -# 1 udp2buffer worker per core -#coreAssociatedBuffer=(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32) - -initialUDPport=50100 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF07T32V01 -N_MODULES=32 - -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@.service b/scripts/JF07-buffer-worker@.service deleted file mode 100644 index dde262a..0000000 --- a/scripts/JF07-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF07 UDP2buffer worker instance as a service, instance %i -Requires=JF07-buffer.service -Before=JF07-buffer.service -BindsTo=JF07-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF07-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=10 - -[Install] -WantedBy=JF07-buffer.service diff --git a/scripts/JF07-buffer.service b/scripts/JF07-buffer.service deleted file mode 100644 index 553ea7a..0000000 --- a/scripts/JF07-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF07 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF07-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF07-stream.service b/scripts/JF07-stream.service deleted file mode 100644 index 84046fc..0000000 --- a/scripts/JF07-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF07 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF07-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=10 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF07-stream.sh b/scripts/JF07-stream.sh deleted file mode 100644 index 48a0e6b..0000000 --- a/scripts/JF07-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="20,21,22,23" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF07.json -SERVICE=JF07-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF09-buffer-worker.sh b/scripts/JF09-buffer-worker.sh deleted file mode 100644 index 49f6013..0000000 --- a/scripts/JF09-buffer-worker.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF09-buffer-worker@00 - exit -fi - -M=$1 - -coreAssociatedBuffer=(12) - -initialUDPport=50150 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF09T01V01 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF09-buffer-worker@.service b/scripts/JF09-buffer-worker@.service deleted file mode 100644 index b199c34..0000000 --- a/scripts/JF09-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF09 UDP2buffer worker instance as a service, instance %i -Requires=JF09-buffer.service -Before=JF09-buffer.service -BindsTo=JF09-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF09-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF09-buffer.service diff --git a/scripts/JF09-buffer.service b/scripts/JF09-buffer.service deleted file mode 100644 index 1423a8f..0000000 --- a/scripts/JF09-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF09 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF09-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF09-stream.service b/scripts/JF09-stream.service deleted file mode 100644 index 3dc6548..0000000 --- a/scripts/JF09-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF09 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF09-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF09-stream.sh b/scripts/JF09-stream.sh deleted file mode 100644 index d05d2be..0000000 --- a/scripts/JF09-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="25" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF09.json -SERVICE=JF09-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF09-vis.service b/scripts/JF09-vis.service deleted file mode 100644 index ed7815e..0000000 --- a/scripts/JF09-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=streamvis: JF09 - -[Service] -User=root -TimeoutStartSec=2 -ExecStart=/bin/bash ./home/dbe/service_scripts/JF09-vis.sh -Restart=on-failure -RestartSec=4 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF09-vis.sh b/scripts/JF09-vis.sh deleted file mode 100644 index 3b7eeb7..0000000 --- a/scripts/JF09-vis.sh +++ /dev/null @@ -1,21 +0,0 @@ -export PATH=/home/dbe/miniconda3/bin:$PATH - -source /home/dbe/miniconda3/etc/profile.d/conda.sh - -conda deactivate -conda activate vis - -PORT=5009 -PORT_BACKEND=9009 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -BACKEND=${H} - -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} \ ---page-title FLEX:Normal - diff --git a/scripts/JF10-buffer-worker.sh b/scripts/JF10-buffer-worker.sh deleted file mode 100644 index b17dac8..0000000 --- a/scripts/JF10-buffer-worker.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF10-buffer-worker@00 - exit -fi - -M=$1 - -coreAssociatedBuffer=(12) - -initialUDPport=50160 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF10T01V01 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF10-buffer-worker@.service b/scripts/JF10-buffer-worker@.service deleted file mode 100644 index 508c60e..0000000 --- a/scripts/JF10-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF10 UDP2buffer worker instance as a service, instance %i -Requires=JF10-buffer.service -Before=JF10-buffer.service -BindsTo=JF10-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF10-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF10-buffer.service diff --git a/scripts/JF10-buffer.service b/scripts/JF10-buffer.service deleted file mode 100644 index 5a820de..0000000 --- a/scripts/JF10-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF10 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF10-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF10-stream.service b/scripts/JF10-stream.service deleted file mode 100644 index 786222f..0000000 --- a/scripts/JF10-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF10 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF10-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF10-stream.sh b/scripts/JF10-stream.sh deleted file mode 100644 index b73b2df..0000000 --- a/scripts/JF10-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="26" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF10.json -SERVICE=JF10-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF10-vis.service b/scripts/JF10-vis.service deleted file mode 100644 index b08cb69..0000000 --- a/scripts/JF10-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=streamvis: JF10 - -[Service] -User=root -TimeoutStartSec=2 -ExecStart=/bin/bash ./home/dbe/service_scripts/JF10-vis.sh -Restart=on-failure -RestartSec=4 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF10-vis.sh b/scripts/JF10-vis.sh deleted file mode 100644 index fe77449..0000000 --- a/scripts/JF10-vis.sh +++ /dev/null @@ -1,21 +0,0 @@ -export PATH=/home/dbe/miniconda3/bin:$PATH - -source /home/dbe/miniconda3/etc/profile.d/conda.sh - -conda deactivate -conda activate vis - -PORT=5010 -PORT_BACKEND=9010 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -BACKEND=${H} - -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} \ ---page-title FLEX:Stripsel - diff --git a/scripts/JF11-buffer-worker.sh b/scripts/JF11-buffer-worker.sh deleted file mode 100644 index 39dccca..0000000 --- a/scripts/JF11-buffer-worker.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF11-buffer-worker@{00..03} - exit -fi - -M=$1 - -coreAssociatedBuffer=(11 12 13 1) - -initialUDPport=50170 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF11T04V01 - -taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/local/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M} diff --git a/scripts/JF11-buffer-worker@.service b/scripts/JF11-buffer-worker@.service deleted file mode 100644 index 0c19154..0000000 --- a/scripts/JF11-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF11 UDP2buffer worker instance as a service, instance %i -Requires=JF11-buffer.service -Before=JF11-buffer.service -BindsTo=JF11-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF11-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=1 - -[Install] -WantedBy=JF11-buffer.service diff --git a/scripts/JF11-buffer.service b/scripts/JF11-buffer.service deleted file mode 100644 index 8730947..0000000 --- a/scripts/JF11-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF11 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF11-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF11-stream.service b/scripts/JF11-stream.service deleted file mode 100644 index 4743c94..0000000 --- a/scripts/JF11-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF11(TXS Flex) - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/dbe/service_scripts/JF11-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=1 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF11-stream.sh b/scripts/JF11-stream.sh deleted file mode 100644 index 93db1d6..0000000 --- a/scripts/JF11-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="14,15,16" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF11.json -SERVICE=JF11-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/JF11-vis.service b/scripts/JF11-vis.service deleted file mode 100644 index 82a1698..0000000 --- a/scripts/JF11-vis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=streamvis: JF11 - -[Service] -User=root -TimeoutStartSec=2 -ExecStart=/bin/bash ./home/dbe/service_scripts/JF11-vis.sh -Restart=on-failure -RestartSec=4 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF11-vis.sh b/scripts/JF11-vis.sh deleted file mode 100644 index 22b2b14..0000000 --- a/scripts/JF11-vis.sh +++ /dev/null @@ -1,18 +0,0 @@ -export PATH=/home/dbe/miniconda3/bin:$PATH - -source /home/dbe/miniconda3/etc/profile.d/conda.sh - -conda deactivate -conda activate vis - -PORT=5011 -PORT_BACKEND=9011 - -H=`echo ${HOSTNAME} | sed 's/.psi.ch//'` -BACKEND=${H} - -taskset -c 17,18 \ -streamvis alvra --allow-websocket-origin=${H}:${PORT} \ ---allow-websocket-origin=sf-daq-alvra:${PORT} --port=${PORT} \ ---address tcp://${BACKEND}:${PORT_BACKEND} \ ---page-title TXS_Flex diff --git a/scripts/JF13-buffer-worker.sh b/scripts/JF13-buffer-worker.sh deleted file mode 100644 index 21fff2a..0000000 --- a/scripts/JF13-buffer-worker.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -if [ $# != 1 ] -then - systemctl start JF13-buffer-worker@00 - exit -fi - -M=$1 - -# Add ourselves to the user cpuset. -# echo $$ > /sys/fs/cgroup/cpuset/user/tasks - -coreAssociatedBuffer=(13) - -initialUDPport=50190 -port=$((${initialUDPport}+10#${M})) -DETECTOR=JF13T01V01 -N_MODULES=1 - -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@.service b/scripts/JF13-buffer-worker@.service deleted file mode 100644 index 0ccd3d5..0000000 --- a/scripts/JF13-buffer-worker@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=JF13 UDP2buffer worker instance as a service, instance %i -Requires=JF13-buffer.service -Before=JF13-buffer.service -BindsTo=JF13-buffer.service - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF13-buffer-worker.sh %i -TimeoutStartSec=10 -RestartSec=10 - -[Install] -WantedBy=JF13-buffer.service diff --git a/scripts/JF13-buffer.service b/scripts/JF13-buffer.service deleted file mode 100644 index 2c435ce..0000000 --- a/scripts/JF13-buffer.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=All UDP-buffer instances of JF13 - -[Service] -Type=oneshot -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF13-buffer-worker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/scripts/JF13-stream.service b/scripts/JF13-stream.service deleted file mode 100644 index 7e0a492..0000000 --- a/scripts/JF13-stream.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=stream service (to streamvis and live analysis) of JF13 - -[Service] -PermissionsStartOnly=true -Type=idle -User=root -ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF13-stream.sh -TimeoutStartSec=10 -Restart=on-failure -RestartSec=10 - -[Install] -WantedBy=multi-user.target - diff --git a/scripts/JF13-stream.sh b/scripts/JF13-stream.sh deleted file mode 100644 index 4489505..0000000 --- a/scripts/JF13-stream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -coreAssociated="25" -CONFIG=/gpfs/photonics/swissfel/buffer/config/stream-JF13.json -SERVICE=JF13-stream - -/home/dbe/git/sf_daq_buffer/scripts/check_config_changed.sh ${CONFIG} ${SERVICE} & - -taskset -c ${coreAssociated} /usr/local/bin/sf_stream ${CONFIG} diff --git a/scripts/poor_pulseid_now.py b/scripts/poor_pulseid_now.py deleted file mode 100644 index 957b1d7..0000000 --- a/scripts/poor_pulseid_now.py +++ /dev/null @@ -1,6 +0,0 @@ -import datetime -#2020-05-08 08:29:52.742737 : 11718049010 -reference_date = datetime.datetime(2020, 5, 8, 8, 29, 52) -now = datetime.datetime.utcnow() -delta = (datetime.datetime.utcnow()-reference_date).total_seconds()*1000 -print(int(delta/10)+11718049010)