detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-01 18:04:57 +01:00
Code Issues Actions Packages Releases Activity

Rxclassmembers (#503)

Browse Source 
* gui message doesnt show if it has a '>' symbol in error msg

* minor refactoring for readability (size_t calc fifo size)

* refactoring listening udp socket code: activated and datastream dont create udp sockets anyway, rc<=- should be discarded in any case

* wip

* refactoring memory structure access

* wip: bugfix write header + data to binary

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* portRoi no roi effecto on progress

* fail at receiver progress, wip

* segfaults for char pointer in struct

* reference to header to get header and data

* refactoring

* use const defined for size of header of fifo

* updated release notes

* remove pointer in callback for sls_receiver_header pointer

* rx same name arguments in constructors

* rx: same name arguments in constructor

* rx: removing the '_' suffix in class data members

* merge fix

* merge fix

* review fix refactoring
This commit is contained in:
Dhanya Thattil
2022-07-25 14:02:11 +02:00
committed by GitHub
parent d132ad8d02
commit 9ac8dab8af
22 changed files with 349 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
slsReceiverSoftware/src/HDF5DataFile.h
View File

@@ -14,6 +14,7 @@ class HDF5DataFile : private virtual slsDetectorDefs, public File {
HDF5DataFile(const int index, std::mutex *hdf5Lib);
~HDF5DataFile();
fileFormat GetFileFormat() const override;
std::string GetFileName() const override;
uint32_t GetFilesInAcquisition() const override;
H5::DataType GetPDataType() const override;
@@ -23,13 +24,13 @@ class HDF5DataFile : private virtual slsDetectorDefs, public File {
void CloseFile() override;
void CreateFirstHDF5DataFile(
const std::string filePath, const std::string fileNamePrefix,
const uint64_t fileIndex, const bool overWriteEnable,
const bool silentMode, const int modulePos,
const int numUnitsPerReadout, const uint32_t udpPortNumber,
const uint32_t maxFramesPerFile, const uint64_t numImages,
const uint32_t nPixelsX, const uint32_t nPixelsY,
const uint32_t dynamicRange) override;
const std::string fPath, const std::string fNamePrefix,
const uint64_t fIndex, const bool owEnable,
const bool sMode, const int modulePos,
const int nUnitsPerReadout, const uint32_t uPortNumber,
const uint32_t mFramesPerFile, const uint64_t nImages,
const uint32_t nX, const uint32_t nY,
const uint32_t dr) override;
void WriteToFile(char *imageData, sls_receiver_header& header, const int imageSize, const uint64_t currentFrameNumber, const uint32_t numPacketsCaught) override;
@@ -41,38 +42,37 @@ class HDF5DataFile : private virtual slsDetectorDefs, public File {
sls_receiver_header rheader);
void ExtendDataset();
int index_;
std::mutex *hdf5Lib_;
H5::H5File *fd_{nullptr};
std::string fileName_;
std::string dataSetName_;
H5::DataSpace *dataSpace_{nullptr};
H5::DataSet *dataSet_{nullptr};
H5::DataType dataType_{H5::PredType::STD_U16LE};
int index;
std::mutex *hdf5Lib;
H5::H5File *fd{nullptr};
std::string fileName;
H5::DataSpace *dataSpace{nullptr};
H5::DataSet *dataSet{nullptr};
H5::DataType dataType{H5::PredType::STD_U16LE};
H5::DataSpace *dataSpacePara_{nullptr};
std::vector<H5::DataSet *> dataSetPara_{nullptr};
std::vector<std::string> parameterNames_;
std::vector<H5::DataType> parameterDataTypes_;
H5::DataSpace *dataSpacePara{nullptr};
std::vector<H5::DataSet *> dataSetPara{nullptr};
std::vector<std::string> parameterNames;
std::vector<H5::DataType> parameterDataTypes;
uint32_t subFileIndex_{0};
uint32_t numFramesInFile_{0};
uint32_t numFilesInAcquisition_{0};
uint32_t maxFramesPerFile_{0};
uint64_t numImages_{0};
uint64_t extNumImages_{0};
uint32_t nPixelsX_{0};
uint32_t nPixelsY_{0};
uint32_t dynamicRange_{0};
uint32_t subFileIndex{0};
uint32_t numFramesInFile{0};
uint32_t numFilesInAcquisition{0};
uint32_t maxFramesPerFile{0};
uint64_t numImages{0};
uint64_t extNumImages{0};
uint32_t nPixelsX{0};
uint32_t nPixelsY{0};
uint32_t dynamicRange{0};
std::string filePath_;
std::string fileNamePrefix_;
uint64_t fileIndex_{0};
bool overWriteEnable_{false};
bool silentMode_{false};
int detIndex_{0};
int numUnitsPerReadout_{0};
uint32_t udpPortNumber_{0};
std::string filePath;
std::string fileNamePrefix;
uint64_t fileIndex{0};
bool overWriteEnable{false};
bool silentMode{false};
int detIndex{0};
int numUnitsPerReadout{0};
uint32_t udpPortNumber{0};
static const int EIGER_NUM_PIXELS{256 * 2 * 256};
static const int EIGER_16_BIT_IMAGE_SIZE{EIGER_NUM_PIXELS * 2};