detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 08:17:13 +02: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

15
slsReceiverSoftware/src/File.h
View File

@ -7,15 +7,12 @@
#include <array>
namespace sls {
#ifdef HDF5C
#include "H5Cpp.h"
#ifndef H5_NO_NAMESPACE
using namespace H5;
#endif
#endif
namespace sls {
struct MasterAttributes;
class File : private virtual slsDetectorDefs {
@ -42,10 +39,10 @@ class File : private virtual slsDetectorDefs {
return 0;
};
virtual DataType GetPDataType() const {
virtual H5::DataType GetPDataType() const {
LOG(logERROR) << "This is a generic function GetPDataType that "
"should be overloaded by a derived class";
return PredType::STD_U16LE;
return H5::PredType::STD_U16LE;
}
virtual std::vector<std::string> GetParameterNames() const {
@ -55,11 +52,11 @@ class File : private virtual slsDetectorDefs {
return std::vector<std::string>{};
};
virtual std::vector<DataType> GetParameterDataTypes() const {
virtual std::vector<H5::DataType> GetParameterDataTypes() const {
LOG(logERROR)
<< "This is a generic function GetFilesInAcquisition that "
"should be overloaded by a derived class";
return std::vector<DataType>{};
return std::vector<H5::DataType>{};
};
virtual void CreateFirstHDF5DataFile(