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

Merge branch 'eiger' of https://github.com/paulscherrerinstitute/sf_daq_buffer into eiger

Browse Source 
Conflicts:
	core-buffer/test/test_RamBuffer.cpp
	jf-assembler/src/main.cpp
This commit is contained in:
lhdamiani
2021-07-06 14:41:04 +02:00
parent 96a9802e91 e53439795f
commit 71658e34e5
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/src/RamBuffer.cpp
+4 -4
View File
@@ -5,7 +5,6 @@
#include <sstream>
#include <unistd.h>
#include "RamBuffer.hpp"
#include "buffer_config.hpp"
#include "date.h"
#include <chrono>
#include <iostream>
@@ -30,8 +29,8 @@ RamBuffer::RamBuffer(const string& buffer_name,
#ifdef DEBUG_OUTPUT
using namespace date;
cout << " [" << std::chrono::system_clock::now();
cout << "] [RamBuffer::RamBuffer] :";
cout << " || buffer_name_ " << buffer_name;
cout << "] [RamBuffer::RamBuffer] ";
cout << " buffer_name_ " << buffer_name;
cout << " || n_modules_ " << n_modules_;
cout << " || n_slots_ " << n_slots_;
cout << " || meta_bytes_" << meta_bytes_;
@@ -91,7 +90,8 @@ void RamBuffer::write_frame(
#ifdef DEBUG_OUTPUT
using namespace date;
cout << " [" << std::chrono::system_clock::now();
cout << "] [RamBuffer::write_frame] :";
cout << "] [RamBuffer::write_frame] ";
cout << " src_meta.id " << src_meta.id;
cout << " || src_meta.frame_index " << src_meta.frame_index;
cout << " || src_meta.n_recv_packets " << src_meta.n_recv_packets;
cout << " || src_meta.daq_rec " << src_meta.daq_rec;