mirror of
https://github.com/paulscherrerinstitute/sf_daq_buffer.git
synced 2026-06-04 15:08:41 +02:00
Rename core_config to buffer_config namespace
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#include <cstddef>
|
||||
#include <string>
|
||||
|
||||
namespace core_buffer {
|
||||
namespace buffer_config {
|
||||
|
||||
const size_t MODULE_X_SIZE = 1024;
|
||||
const size_t MODULE_Y_SIZE = 512;
|
||||
|
||||
@@ -24,7 +24,7 @@ struct ModuleFrameBuffer {
|
||||
struct BufferBinaryFormat {
|
||||
const char FORMAT_MARKER = 0xBE;
|
||||
ModuleFrame metadata;
|
||||
char data[core_buffer::MODULE_N_BYTES];
|
||||
char data[buffer_config::MODULE_N_BYTES];
|
||||
};
|
||||
#pragma pack(pop)
|
||||
|
||||
@@ -32,7 +32,7 @@ struct BufferBinaryFormat {
|
||||
#pragma pack(1)
|
||||
struct BufferBinaryBlock
|
||||
{
|
||||
BufferBinaryFormat frame[core_buffer::BUFFER_BLOCK_SIZE];
|
||||
BufferBinaryFormat frame[buffer_config::BUFFER_BLOCK_SIZE];
|
||||
uint64_t start_pulse_id;
|
||||
};
|
||||
#pragma pack(pop)
|
||||
|
||||
@@ -10,25 +10,25 @@ string BufferUtils::get_filename(
|
||||
std::string device_name,
|
||||
uint64_t pulse_id)
|
||||
{
|
||||
uint64_t folder_base = pulse_id / core_buffer::FOLDER_MOD;
|
||||
folder_base *= core_buffer::FOLDER_MOD;
|
||||
uint64_t folder_base = pulse_id / buffer_config::FOLDER_MOD;
|
||||
folder_base *= buffer_config::FOLDER_MOD;
|
||||
|
||||
uint64_t file_base = pulse_id / core_buffer::FILE_MOD;
|
||||
file_base *= core_buffer::FILE_MOD;
|
||||
uint64_t file_base = pulse_id / buffer_config::FILE_MOD;
|
||||
file_base *= buffer_config::FILE_MOD;
|
||||
|
||||
stringstream folder;
|
||||
folder << root_folder << "/";
|
||||
folder << device_name << "/";
|
||||
folder << folder_base << "/";
|
||||
folder << file_base << core_buffer::FILE_EXTENSION;
|
||||
folder << file_base << buffer_config::FILE_EXTENSION;
|
||||
|
||||
return folder.str();
|
||||
}
|
||||
|
||||
size_t BufferUtils::get_file_frame_index(uint64_t pulse_id)
|
||||
{
|
||||
uint64_t file_base = pulse_id / core_buffer::FILE_MOD;
|
||||
file_base *= core_buffer::FILE_MOD;
|
||||
uint64_t file_base = pulse_id / buffer_config::FILE_MOD;
|
||||
file_base *= buffer_config::FILE_MOD;
|
||||
|
||||
return pulse_id - file_base;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#include "formats.hpp"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
using namespace core_buffer;
|
||||
using namespace buffer_config;
|
||||
|
||||
TEST(FastQueue, basic_interaction)
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@ extern "C" {
|
||||
}
|
||||
|
||||
using namespace std;
|
||||
using namespace core_buffer;
|
||||
using namespace buffer_config;
|
||||
|
||||
TEST(bitshuffle, simple_compression)
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@ using namespace std;
|
||||
TEST(BufferUtils, get_filename)
|
||||
{
|
||||
auto expected_file = "/root/device-1/12300000/12345000" +
|
||||
core_buffer::FILE_EXTENSION;
|
||||
buffer_config::FILE_EXTENSION;
|
||||
|
||||
auto root_folder = "/root";
|
||||
auto device_name = "device-1";
|
||||
|
||||
Reference in New Issue
Block a user