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

Fix bug in evaluating size of nscldaq data buffer and type mask of MesyTec unpacker

Browse Source
This commit is contained in:
Gordon McCann 2022-11-07 12:00:44 -05:00
parent d34f5d676b
commit 8f9dcf2914
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Specter/src/Specter/Physics/nscldaq/CharonOnlineSource.cpp
View File

@ -37,7 +37,7 @@ namespace Specter {
void CharonOnlineSource::UnpackRawBuffer() void CharonOnlineSource::UnpackRawBuffer()
{ {
uint32_t* iter = (uint32_t*) m_rawBuffer.data(); uint32_t* iter = (uint32_t*) m_rawBuffer.data();
uint32_t* end = iter + m_rawBuffer.size(); uint32_t* end = iter + m_rawBuffer.size() / sizeof(uint32_t);
bool wasUnpacked = false; bool wasUnpacked = false;
UnpackerResult result; UnpackerResult result;

2
Specter/src/Specter/Physics/nscldaq/Unpackers/MesyTecUnpacker.h
View File

@ -22,7 +22,7 @@ namespace Specter {
virtual void UnpackDatum(uint32_t* word) override; virtual void UnpackDatum(uint32_t* word) override;
static constexpr uint32_t s_typeMask = 0xc000000; static constexpr uint32_t s_typeMask = 0xc0000000;
static constexpr uint32_t s_typeHeader = 0x40000000; static constexpr uint32_t s_typeHeader = 0x40000000;
static constexpr uint32_t s_typeBody = 0x00000000; static constexpr uint32_t s_typeBody = 0x00000000;
static constexpr uint32_t s_typeEnd = 0xc0000000; static constexpr uint32_t s_typeEnd = 0xc0000000;