From d3ebb5b9d541a51d1a647be58cb6ff8d90cd6125 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Wed, 27 May 2020 14:19:03 +0200 Subject: [PATCH] Construction initialization --- sf-writer/src/ImageAssembler.cpp | 12 +++++++++--- sf-writer/src/ImageAssembler.hpp | 10 +++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sf-writer/src/ImageAssembler.cpp b/sf-writer/src/ImageAssembler.cpp index f6cc69a..d5d1e9d 100644 --- a/sf-writer/src/ImageAssembler.cpp +++ b/sf-writer/src/ImageAssembler.cpp @@ -1,13 +1,19 @@ #include "ImageAssembler.hpp" -ImageAssembler::ImageAssembler() -{ +using namespace std; +using namespace core_buffer; +ImageAssembler::ImageAssembler(const size_t n_modules) : + n_modules_(n_modules) +{ + image_buffer_ = new char[IA_N_SLOTS * MODULE_N_BYTES * n_modules_]; + metadata_buffer_ = new ImageMetadataBlock[IA_N_SLOTS]; } ImageAssembler::~ImageAssembler() { - + delete[] image_buffer_; + delete[] metadata_buffer_; } void ImageAssembler::process( diff --git a/sf-writer/src/ImageAssembler.hpp b/sf-writer/src/ImageAssembler.hpp index 9834ba7..845bcfb 100644 --- a/sf-writer/src/ImageAssembler.hpp +++ b/sf-writer/src/ImageAssembler.hpp @@ -1,10 +1,18 @@ #ifndef SF_DAQ_BUFFER_IMAGEASSEMBLER_HPP #define SF_DAQ_BUFFER_IMAGEASSEMBLER_HPP +#include "formats.hpp" + +const size_t IA_N_SLOTS = 2; class ImageAssembler { + const size_t n_modules_; + + char* image_buffer_; + ImageMetadataBlock* metadata_buffer_; + public: - ImageAssembler(); + ImageAssembler(const size_t n_modules); ImageMetadataBlock* get_metadata_buffer(const int slot_id); virtual ~ImageAssembler();