 babic_a
|
cc85b6e71d
|
Merge branch 'ram_buffer'
# Conflicts:
# CMakeLists.txt
# jf-assembler/test/main.cpp
# jf-live-writer/CMakeLists.txt
# jf-live-writer/include/live_writer_config.hpp
# jf-live-writer/src/main.cpp
# jf-live-writer/test/CMakeLists.txt
# jf-live-writer/test/main.cpp
# scripts/JF01-buffer-worker.sh
# scripts/JF02-buffer-worker.sh
# scripts/JF06-buffer-worker.sh
# scripts/JF06_4M-buffer-worker.sh
# sf-stream/include/stream_config.hpp
# sf-stream/src/ZmqLiveSender.cpp
|
2021-02-26 12:32:36 +01:00 |
|
 Dmitry Ozerov
|
e68a77ce8b
|
arrangement of alra detectors on daq8 server
|
2020-12-04 18:40:42 +01:00 |
|
|
Dmitry Ozerov
|
0e001f4daf
|
standartisation of scripts
|
2020-11-05 21:46:22 +01:00 |
|
|
Dmitry Ozerov
|
fe39841df9
|
adaptation of scripts to run on sf-daq-4
|
2020-11-04 09:23:09 +01:00 |
|
|
babic_a
|
c494e7a9ab
|
Local changes
|
2020-09-29 09:39:43 +02:00 |
|
|
babic_a
|
93ab781b9c
|
Change start scripts for new sf_buffer
|
2020-09-04 13:49:22 +02:00 |
|
|
Dmitry Ozerov
|
c4a737557d
|
adding Alvra 4p5M and 16M(jf02,jf06)
|
2020-07-01 00:04:30 +02:00 |
|