From 53c6ec5833043b645e9691872b9787bbf50e5158 Mon Sep 17 00:00:00 2001 From: Gordon McCann Date: Wed, 5 Oct 2022 21:58:37 -0400 Subject: [PATCH] Fix misnomer in list data --- src/CMakeLists.txt | 4 ++-- src/DYio/DYListData.h | 4 ++-- src/DYio/DYRun.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b5556e6..e04a70d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 diff --git a/src/DYio/DYListData.h b/src/DYio/DYListData.h index 2df83b0..43e38b1 100644 --- a/src/DYio/DYListData.h +++ b/src/DYio/DYListData.h @@ -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& buffer, BSListData& data, std::size_t startPosition) + static std::size_t UnLoadBSListDataFromBuffer(const std::vector& buffer, DYListData& data, std::size_t startPosition) { std::size_t position = startPosition; if (buffer.size() - startPosition < Data::dataSize) diff --git a/src/DYio/DYRun.cpp b/src/DYio/DYRun.cpp index 41d4337..381fb15 100644 --- a/src/DYio/DYRun.cpp +++ b/src/DYio/DYRun.cpp @@ -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()))