From 560a7e664b7749209242fd21437284ff7fcf0bfb Mon Sep 17 00:00:00 2001 From: Dominik Smith <d.smith@gsi.de> Date: Wed, 5 Jun 2024 11:31:00 +0200 Subject: [PATCH] Expanded aux info in cbm::algo::sts::UnpackMS (introduced QaDigi struct). --- algo/detectors/sts/UnpackMS.cxx | 2 +- algo/detectors/sts/UnpackMS.h | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/algo/detectors/sts/UnpackMS.cxx b/algo/detectors/sts/UnpackMS.cxx index 2b085a0c21..46b5ac8dcb 100644 --- a/algo/detectors/sts/UnpackMS.cxx +++ b/algo/detectors/sts/UnpackMS.cxx @@ -162,7 +162,7 @@ namespace cbm::algo::sts digiVec.emplace_back(elinkPar.fAddress, channel, messageTime, charge); if (fParams.fWriteAux) { - aux.fMissedEvent.push_back(message.IsHitMissedEvts()); + aux.fQaDigis.emplace_back(message.IsHitMissedEvts(), elinkPar.fAddress, channel, messageTime, charge); } } // -------------------------------------------------------------------------- diff --git a/algo/detectors/sts/UnpackMS.h b/algo/detectors/sts/UnpackMS.h index e2baaefbc0..3970498ca6 100644 --- a/algo/detectors/sts/UnpackMS.h +++ b/algo/detectors/sts/UnpackMS.h @@ -74,13 +74,36 @@ namespace cbm::algo::sts } }; + /** @struct QaDigi + ** @author Dominik Smith <d.smith@gsi.de> + ** @since 05 Jun 2024 + ** @brief Extended digi which contains auxiliary QA information + **/ + struct QaDigi { + + QaDigi(bool missed, int32_t addr, int32_t chan, uint32_t t, uint16_t c) + : missedEvent(missed) + , address(addr) + , channel(chan) + , time(t) + , charge(c) + { + } + + bool missedEvent; + int32_t address; + int32_t channel; + uint32_t time; + uint16_t charge; + }; + /** @struct UnpackStsAux ** @author Dominik Smith <d.smith@gsi.de> ** @since 24 May 2024 ** @brief Auxiliary data for STS unpacking **/ struct UnpackAuxData { - std::vector<bool> fMissedEvent; ///< Missed event flag for returned digis + std::vector<QaDigi> fQaDigis; }; /** @class UnpackMS -- GitLab