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

Hdf5fix (#483)

Browse Source 
* hdf5 fix for string reference

* fix hdf5 compilation after namespace change
This commit is contained in:
Dhanya Thattil
2022-06-09 11:42:32 +02:00
committed by GitHub
parent 3cee36a3db
commit 89aa0760c6
8 changed files with 376 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsReceiverSoftware/src/HDF5DataFile.h
View File

@@ -16,9 +16,9 @@ class HDF5DataFile : private virtual slsDetectorDefs, public File {
std::array<std::string, 2> GetFileAndDatasetName() const override;
uint32_t GetFilesInAcquisition() const override;
DataType GetPDataType() const override;
::H5::DataType GetPDataType() const override;
std::vector<std::string> GetParameterNames() const override;
std::vector<DataType> GetParameterDataTypes() const override;
std::vector<::H5::DataType> GetParameterDataTypes() const override;
void CloseFile() override;
@@ -45,17 +45,17 @@ class HDF5DataFile : private virtual slsDetectorDefs, public File {
int index_;
std::mutex *hdf5Lib_;
H5File *fd_{nullptr};
::H5::H5File *fd_{nullptr};
std::string fileName_;
std::string dataSetName_;
DataSpace *dataSpace_{nullptr};
DataSet *dataSet_{nullptr};
DataType dataType_{PredType::STD_U16LE};
::H5::DataSpace *dataSpace_{nullptr};
::H5::DataSet *dataSet_{nullptr};
::H5::DataType dataType_{::H5::PredType::STD_U16LE};
DataSpace *dataSpacePara_{nullptr};
std::vector<DataSet *> dataSetPara_{nullptr};
::H5::DataSpace *dataSpacePara_{nullptr};
std::vector<::H5::DataSet *> dataSetPara_{nullptr};
std::vector<std::string> parameterNames_;
std::vector<DataType> parameterDataTypes_;
std::vector<::H5::DataType> parameterDataTypes_;
uint32_t subFileIndex_{0};
uint32_t numFramesInFile_{0};