gwm17/Daqromancy
1
0
Fork 0
mirror of https://github.com/gwm17/Daqromancy.git synced 2024-11-22 18:58:51 -05:00
Code Issues Projects Releases Wiki Activity

Fix misnomer in list data

Browse Source
This commit is contained in:
Gordon McCann 2022-10-05 21:58:37 -04:00
parent 00bf570b51
commit 53c6ec5833
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -119,9 +119,9 @@ endif()
if(CMAKE_BUILD_TYPE STREQUAL "Release")
target_compile_definitions(Daqromancy PRIVATE BS_RELEASE)
target_compile_definitions(Daqromancy PRIVATE DY_RELEASE)
elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(Daqromancy PRIVATE BS_DEBUG)
target_compile_definitions(Daqromancy PRIVATE DY_DEBUG)
endif()
#Some extra defs

4
src/DYio/DYListData.h
View File

@ -7,7 +7,7 @@ namespace Daqromancy {
//This is the subset of DYData that will be transferred via binary writes/reads
//on either network or file io
struct BSListData
struct DYListData
{
uint16_t board;
uint16_t channel;
@ -75,7 +75,7 @@ namespace Daqromancy {
Again, rather nasty. Here we C-style cast the data in the buffer to our types in the list data,
write them to the input parameter reference, and then iterate forward the appropriate number of bytes.
*/
static std::size_t UnLoadBSListDataFromBuffer(const std::vector<char>& buffer, BSListData& data, std::size_t startPosition)
static std::size_t UnLoadBSListDataFromBuffer(const std::vector<char>& buffer, DYListData& data, std::size_t startPosition)
{
std::size_t position = startPosition;
if (buffer.size() - startPosition < Data::dataSize)

2
src/DYio/DYRun.cpp
View File

@ -35,7 +35,7 @@ namespace Daqromancy {
{
for (int i = 0; i < args.channels; i++)
{
filename = args.name + "_CH_" + std::to_string(i) + ".bsbin";
filename = args.name + "_CH_" + std::to_string(i) + ".dybin";
key = SzudzikPairingFunction(args.handle, i);
m_files.insert_or_assign(key, DYFile(runPath / filename));
if (!(m_files[key].IsOpen()))