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

Update buffer folder and files naming convention

Browse Source 
All references to folders and files inside buffer were updated.
- Base folder to write detector: detector_folder
- Name of the modules inside detector_folder: module_name
- Data grouping folders based on pulse_id: data_folder
- Data grouping files, based on pulse_id: data_file
This commit is contained in:
babic_a
2020-07-20 11:06:13 +02:00
parent 8c1182e412
commit dbc913ee78
10 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sf-buffer/include/BufferBinaryWriter.hpp
+4 -4
View File
@@ -10,8 +10,8 @@ class BufferBinaryWriter {
const size_t MAX_FILE_BYTES =
buffer_config::FILE_MOD * sizeof(BufferBinaryFormat);
const std::string root_folder_;
const std::string device_name_;
const std::string detector_folder_;
const std::string module_name_;
std::string latest_filename_;
std::string current_output_filename_;
@@ -23,8 +23,8 @@ class BufferBinaryWriter {
public:
BufferBinaryWriter(
const std::string& root_folder,
const std::string& device_name);
const std::string& detector_folder,
const std::string& module_name);
virtual ~BufferBinaryWriter();
sf-buffer/src/BufferBinaryWriter.cpp
+6 -6
View File
@@ -13,11 +13,11 @@
using namespace std;
BufferBinaryWriter::BufferBinaryWriter(
const string& root_folder,
const string& device_name):
root_folder_(root_folder),
device_name_(device_name),
latest_filename_(root_folder + "/" + device_name + "/LATEST"),
const string& detector_folder,
const string& module_name):
detector_folder_(detector_folder),
module_name_(module_name),
latest_filename_(detector_folder + "/" + module_name + "/LATEST"),
current_output_filename_(""),
output_file_fd_(-1)
{
@@ -33,7 +33,7 @@ void BufferBinaryWriter::write(
const BufferBinaryFormat* buffer)
{
auto current_frame_file =
BufferUtils::get_filename(root_folder_, device_name_, pulse_id);
BufferUtils::get_filename(detector_folder_, module_name_, pulse_id);
if (current_frame_file != current_output_filename_) {
open_file(current_frame_file);
sf-buffer/test/test_BufferBinaryWriter.cpp
+8 -8
View File
@@ -5,11 +5,11 @@
TEST(BinaryWriter, basic_interaction)
{
auto root_folder = ".";
auto device_name = "test_device";
auto detector_folder = ".";
auto module_name = "test_device";
uint64_t pulse_id = 5;
BufferBinaryWriter writer(device_name, root_folder);
BufferBinaryWriter writer(module_name, detector_folder);
BufferBinaryFormat frame_data;
frame_data.metadata.pulse_id = 1;
@@ -20,7 +20,7 @@ TEST(BinaryWriter, basic_interaction)
writer.write(5, &frame_data);
auto output_filename =
BufferUtils::get_filename(root_folder, device_name, pulse_id);
BufferUtils::get_filename(detector_folder, module_name, pulse_id);
auto read_fd = open(output_filename.c_str(), O_RDONLY);
ASSERT_NE(read_fd, -1);
@@ -42,11 +42,11 @@ TEST(BinaryWriter, basic_interaction)
TEST(BinaryWriter, test_format_marker)
{
auto root_folder = ".";
auto device_name = "test_device";
auto detector_folder = ".";
auto module_name = "M0";
uint64_t pulse_id = 5;
BufferBinaryWriter writer(device_name, root_folder);
BufferBinaryWriter writer(module_name, detector_folder);
BufferBinaryFormat frame_data;
frame_data.metadata.pulse_id = 1;
@@ -57,7 +57,7 @@ TEST(BinaryWriter, test_format_marker)
writer.write(5, &frame_data);
auto output_filename =
BufferUtils::get_filename(root_folder, device_name, pulse_id);
BufferUtils::get_filename(detector_folder, module_name, pulse_id);
auto read_fd = open(output_filename.c_str(), O_RDONLY);
ASSERT_NE(read_fd, -1);