From 7a115cdbffc133237bd0fc5181ff32429cc25266 Mon Sep 17 00:00:00 2001 From: Dmitry Ozerov Date: Wed, 14 Oct 2020 13:55:51 +0200 Subject: [PATCH 1/5] adaptation to new conda environment name --- scripts/retrieve_detector_data.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/retrieve_detector_data.sh b/scripts/retrieve_detector_data.sh index d697bea..dfd8f5f 100755 --- a/scripts/retrieve_detector_data.sh +++ b/scripts/retrieve_detector_data.sh @@ -86,9 +86,6 @@ PREVIOUS_STILL_RUN=0 while [ ${PREVIOUS_STILL_RUN} == 0 ] do sleep 15 # we need to sleep at least to make sure that we don't read from CURRENT file -# ps -fe | grep "bin/sf_writer " | grep -v grep | grep sf_writer > /dev/null -# PREVIOUS_STILL_RUN=$? # not found == 1 -# PREVIOUS_STILL_RUN=1 n=`ps -fe | grep "bin/sf_writer " | grep -v grep | grep sf_writer | wc -l` if [ ${n} -lt 9 ] then @@ -119,7 +116,7 @@ else fi fi -taskset -c ${coreAssociated} /usr/bin/sf_writer ${OUTFILE_RAW} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${NM} ${START_PULSE_ID} ${STOP_PULSE_ID} ${PULSE_ID_STEP}>> /tmp/detector_retrieve.log & +taskset -c ${coreAssociated} /usr/local/bin/sf_writer ${OUTFILE_RAW} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${NM} ${START_PULSE_ID} ${STOP_PULSE_ID} ${PULSE_ID_STEP}>> /tmp/detector_retrieve.log & wait @@ -159,7 +156,7 @@ else source /home/dbe/miniconda3/etc/profile.d/conda.sh conda deactivate - conda activate bsread + conda activate sf-daq taskset -c ${coreAssociatedConversion} python /home/dbe/git/sf_daq_buffer/scripts/export_file.py ${OUTFILE_RAW} ${OUTFILE} ${RUN_FILE} ${DET_CONFIG_FILE} if [ ${DETECTOR} == "JF06T32V02" ] || [ ${DETECTOR} == "JF06T08V02" ] From 41b8d2d0ef9bd0960b0a81146fcc673e94e663a9 Mon Sep 17 00:00:00 2001 From: Dmitry Ozerov Date: Wed, 14 Oct 2020 15:12:34 +0200 Subject: [PATCH 2/5] for unknown reason bitshuffle starts to ignore settings of number of threads in jungfrau utils. Fix from Ivan Usov --- scripts/retrieve_detector_data.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/retrieve_detector_data.sh b/scripts/retrieve_detector_data.sh index dfd8f5f..e67c202 100755 --- a/scripts/retrieve_detector_data.sh +++ b/scripts/retrieve_detector_data.sh @@ -126,6 +126,9 @@ coreAssociatedConversion="35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18" #TODO: calculate this number from coreAssociatedConversion #export NUMBA_NUM_THREADS=18 +#not clear why, but bitshuffle doesn't respect OMP_NUM_THREADS set in jungfrau_utils anymore, thus we set it here +export OMP_NUM_THREADS=1 + date3=$(date +%s) echo "Finished : "`date` echo -n "Retrieve Time : " From 897189e82bf472bf37e5de2bd77cfcb99e8719b2 Mon Sep 17 00:00:00 2001 From: Dmitry Ozerov Date: Wed, 14 Oct 2020 18:37:35 +0200 Subject: [PATCH 3/5] adapt conversion test script to new environment --- scripts/{test_convertion.sh => test_conversion.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{test_convertion.sh => test_conversion.sh} (100%) diff --git a/scripts/test_convertion.sh b/scripts/test_conversion.sh similarity index 100% rename from scripts/test_convertion.sh rename to scripts/test_conversion.sh From 265e7958b54f2ea262a47b7bab556af7d8886325 Mon Sep 17 00:00:00 2001 From: Dmitry Ozerov Date: Wed, 14 Oct 2020 18:39:39 +0200 Subject: [PATCH 4/5] adapt conversion test script to new environment --- scripts/test_conversion.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/test_conversion.sh b/scripts/test_conversion.sh index cce2d27..18567e8 100755 --- a/scripts/test_conversion.sh +++ b/scripts/test_conversion.sh @@ -3,12 +3,13 @@ export PATH=/home/dbe/miniconda3/bin:$PATH source /home/dbe/miniconda3/etc/profile.d/conda.sh conda deactivate -conda activate bsread +conda activate sf-daq +export OMP_NUM_THREADS=1 #export NUMBA_NUM_THREADS=$1 #OUTDIR=/sf/alvra/data/p18674/raw/run_info/003000/CONVERSION-PAR-${NUMBA_NUM_THREADS} -OUTDIR=/sf/alvra/data/p18674/raw/run_info/003000/CONVERSION-NEW.20-daq2 +OUTDIR=/sf/alvra/data/p18674/raw/run_info/003000/CONVERSION-NEW.21-daq1 #coreAssociatedBuffer=(35 34 33 32 31 30 29 28 27 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 8 7 6 5 4 3 2 1 0) #coreAssociatedBuffer=(35 34 33 32 31 30 29 28 27 18 19 20 21 22 23 24 25 26 9 10 11 12 13 14 15 16 17 8 7 6 5 4 3 2 1 0) From 326c108bda45ae398d794e5045769be05dde24df Mon Sep 17 00:00:00 2001 From: babic_a Date: Tue, 27 Oct 2020 19:51:03 +0100 Subject: [PATCH 5/5] usefull messages in case of frame number disagreement --- scripts/JF01-stream.service | 2 +- sf-stream/src/ZmqLiveSender.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/JF01-stream.service b/scripts/JF01-stream.service index 79e7b1b..8d2fc35 100644 --- a/scripts/JF01-stream.service +++ b/scripts/JF01-stream.service @@ -8,7 +8,7 @@ User=root ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF01-stream.sh TimeoutStartSec=10 Restart=on-failure -RestartSec=10 +RestartSec=1 [Install] WantedBy=multi-user.target diff --git a/sf-stream/src/ZmqLiveSender.cpp b/sf-stream/src/ZmqLiveSender.cpp index 78cf055..5a2719b 100644 --- a/sf-stream/src/ZmqLiveSender.cpp +++ b/sf-stream/src/ZmqLiveSender.cpp @@ -4,6 +4,8 @@ #include "zmq.h" #include +#include +// using namespace std; using namespace stream_config; @@ -98,6 +100,9 @@ void ZmqLiveSender::send(const ModuleFrameBuffer *meta, const char *data) if (module_metadata.n_recv_packets != 128 ) is_good_frame = false; } + if (pulse_id % 10000 == 0 && is_good_frame != true) { + cout << "Frame is not good " << pulse_id << " module : " << i_module << " frame_index(0) : " << frame_index << " frame_index : " << module_metadata.frame_index << endl; + } } // TODO: Here we need to send to streamvis and live analysis metadata(probably need to operate still on them) and data(not every frame)