mirror of
https://github.com/paulscherrerinstitute/sf_daq_buffer.git
synced 2026-04-29 22:02:23 +02:00
merged conflicts. assembler with external sync.
This commit is contained in:
@@ -10,10 +10,12 @@
|
||||
#include "sync_config.hpp"
|
||||
#include "ZmqPulseSyncReceiver.hpp"
|
||||
#include "UdpSyncConfig.hpp"
|
||||
#include "buffer_config.hpp"
|
||||
|
||||
|
||||
using namespace std;
|
||||
using namespace sync_config;
|
||||
using namespace buffer_config;
|
||||
|
||||
#ifdef USE_EIGER
|
||||
#include "eiger.hpp"
|
||||
@@ -44,8 +46,7 @@ int main (int argc, char *argv[])
|
||||
auto sender = BufferUtils::bind_socket(ctx, config.detector_name, "sync");
|
||||
|
||||
RamBuffer frame_buffer(config.detector_name, sizeof(ModuleFrame),
|
||||
FRAME_N_BYTES, config.n_modules,
|
||||
buffer_config::RAM_BUFFER_N_SLOTS);
|
||||
FRAME_N_BYTES, config.n_modules, RAM_BUFFER_N_SLOTS);
|
||||
|
||||
ZmqPulseSyncReceiver receiver(ctx, config.detector_name, config.n_modules);
|
||||
SyncStats stats(config.detector_name, SYNC_STATS_MODULO);
|
||||
|
||||
Reference in New Issue
Block a user