sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-29 20:42:22 +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
core-buffer/include/BufferUtils.hpp
+2 -2
View File
@@ -7,8 +7,8 @@
namespace BufferUtils
{
std::string get_filename(
std::string root_folder,
std::string device_name,
std::string detector_folder,
std::string module_name,
uint64_t pulse_id);
std::size_t get_file_frame_index(uint64_t pulse_id);
core-buffer/src/BufferUtils.cpp
+10 -10
View File
@@ -6,21 +6,21 @@
using namespace std;
string BufferUtils::get_filename(
std::string root_folder,
std::string device_name,
std::string detector_folder,
std::string module_name,
uint64_t pulse_id)
{
uint64_t folder_base = pulse_id / buffer_config::FOLDER_MOD;
folder_base *= buffer_config::FOLDER_MOD;
uint64_t data_folder = pulse_id / buffer_config::FOLDER_MOD;
data_folder *= buffer_config::FOLDER_MOD;
uint64_t file_base = pulse_id / buffer_config::FILE_MOD;
file_base *= buffer_config::FILE_MOD;
uint64_t data_file = pulse_id / buffer_config::FILE_MOD;
data_file *= buffer_config::FILE_MOD;
stringstream folder;
folder << root_folder << "/";
folder << device_name << "/";
folder << folder_base << "/";
folder << file_base << buffer_config::FILE_EXTENSION;
folder << detector_folder << "/";
folder << module_name << "/";
folder << data_folder << "/";
folder << data_file << buffer_config::FILE_EXTENSION;
return folder.str();
}
core-buffer/test/test_buffer_utils.cpp
+10 -10
View File
@@ -9,33 +9,33 @@ TEST(BufferUtils, get_filename)
auto expected_file = "/root/device-1/12300000/12345000" +
buffer_config::FILE_EXTENSION;
auto root_folder = "/root";
auto device_name = "device-1";
auto detector_folder = "/root";
auto module_name = "device-1";
auto result = BufferUtils::get_filename(
root_folder,
device_name,
detector_folder,
module_name,
12345000);
ASSERT_EQ(result, expected_file);
auto result2 = BufferUtils::get_filename(
root_folder,
device_name,
detector_folder,
module_name,
12345999);
ASSERT_EQ(result2, expected_file);
auto result3 = BufferUtils::get_filename(
root_folder,
device_name,
detector_folder,
module_name,
12346000);
ASSERT_NE(result3, expected_file);
auto result4 = BufferUtils::get_filename(
root_folder,
device_name,
detector_folder,
module_name,
12344999);
ASSERT_NE(result4, expected_file);