sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-05-04 20:04:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

bit depth parameter infrastructure. partial eiger assemble image routine.

Browse Source
This commit is contained in:
lhdamiani
2021-07-02 10:44:51 +02:00
parent 3f7fef4f61
commit c344daaffe
37 changed files with 4369 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jf-assembler/src/ZmqPulseSyncReceiver.cpp
+2 -3
View File
@@ -46,7 +46,6 @@ PulseAndSync ZmqPulseSyncReceiver::get_next_pulse_id() const
bool modules_in_sync = true;
for (int i = 0; i < n_modules_; i++) {
zmq_recv(sockets_[i], &pulses[i], sizeof(uint64_t), 0);
if (pulses[0] != pulses[i]) {
modules_in_sync = false;
}
@@ -56,8 +55,8 @@ PulseAndSync ZmqPulseSyncReceiver::get_next_pulse_id() const
#ifdef DEBUG_OUTPUT
using namespace date;
cout << " [" << std::chrono::system_clock::now();
cout << "] [ZmqPulseSyncReceiver::get_next_pulse_id] modules_in_sync true";
cout << "] returning pulses[0] (frame index):" << pulses[0];
cout << "] [ZmqPulseSyncReceiver::get_next_pulse_id] ";
cout << "] (modules_in_sync) Frame index:" << pulses[0];
cout << endl;
#endif
return {pulses[0], 0};
jf-assembler/src/main.cpp
+19 -11
View File
@@ -9,6 +9,7 @@
#include <chrono>
#include "assembler_config.hpp"
#include "ZmqPulseSyncReceiver.hpp"
using namespace std;
using namespace buffer_config;
@@ -16,42 +17,49 @@ using namespace assembler_config;
int main (int argc, char *argv[])
{
if (argc != 2) {
if (argc != 3) {
cout << endl;
#ifndef USE_EIGER
cout << "Usage: jf_assembler [detector_json_filename]" << endl;
cout << "Usage: jf_assembler [detector_json_filename] [bit_depth]" << endl;
#else
cout << "Usage: eiger_assembler [detector_json_filename]" << endl;
cout << "Usage: eiger_assembler [detector_json_filename] [bit_depth]" << endl;
#endif
cout << "\tdetector_json_filename: detector config file path." << endl;
cout << "\tbit_depth: bit depth of the incoming udp packets." << endl;
cout << endl;
exit(-1);
}
auto config = BufferUtils::read_json_config(string(argv[1]));
const int bit_depth = atoi(argv[2]);
auto const stream_name = "assembler";
auto ctx = zmq_ctx_new();
zmq_ctx_set(ctx, ZMQ_IO_THREADS, ASSEMBLER_ZMQ_IO_THREADS);
auto sender = BufferUtils::bind_socket(
ctx, config.detector_name, stream_name);
ZmqPulseSyncReceiver receiver(ctx, config.detector_name, config.n_modules);
RamBuffer ram_buffer(config.detector_name, config.n_modules);
AssemblerStats stats(config.detector_name, ASSEMBLER_STATS_MODULO);
ImageMetadata meta;
const int n_receivers = config.n_modules * config.n_submodules;
#ifdef DEBUG_OUTPUT
using namespace date;
cout << " [" << std::chrono::system_clock::now();
cout << "] [Assembler] :";
cout << " Details of Assembler:";
cout << "detector_name: " << config.detector_name;
cout << "n_modules: " << config.n_modules;
cout << " detector_name: " << config.detector_name;
cout << " || n_modules: " << config.n_modules;
cout << " || n_receivers: " << n_receivers;
cout << endl;
#endif
ZmqPulseSyncReceiver receiver(ctx, config.detector_name, n_receivers);
RamBuffer ram_buffer(config.detector_name, n_receivers, config.n_submodules, bit_depth);
AssemblerStats stats(config.detector_name, ASSEMBLER_STATS_MODULO);
ImageMetadata meta;
while (true) {
auto pulse_and_sync = receiver.get_next_pulse_id();
ram_buffer.assemble_image(pulse_and_sync.pulse_id, meta);