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

22
slsReceiverSoftware/src/MasterFileUtility.h
View File

@ -4,17 +4,13 @@
#include "MasterAttributes.h"
#include <mutex>
namespace sls {
namespace masterFileUtility {
#ifdef HDF5C
#include "H5Cpp.h"
#include <mutex>
#ifndef H5_NO_NAMESPACE
using namespace H5;
#endif
#endif
std::string CreateMasterBinaryFile(const std::string &filePath,
@ -25,10 +21,10 @@ std::string CreateMasterBinaryFile(const std::string &filePath,
MasterAttributes *attr);
#ifdef HDF5C
void LinkHDF5FileInMaster(const std::string &masterFileName,
const std::string &dataFilename,
const std::string &dataSetname,
const std::vector<std::string> parameterNames,
void LinkHDF5FileInMaster(std::string &masterFileName,
std::string &dataFilename,
std::string &dataSetname,
std::vector<std::string> parameterNames,
const bool silentMode, std::mutex *hdf5LibMutex);
std::string CreateMasterHDF5File(const std::string &filePath,
@ -45,9 +41,9 @@ std::array<std::string, 2> CreateVirtualHDF5File(
const uint32_t maxFramesPerFile, const uint64_t numImages,
const uint32_t nPixelsX, const uint32_t nPixelsY,
const uint32_t dynamicRange, const uint64_t numImagesCaught,
const int numModX, const int numModY, const DataType dataType,
const int numModX, const int numModY, const ::H5::DataType dataType,
const std::vector<std::string> parameterNames,
const std::vector<DataType> parameterDataTypes, std::mutex *hdf5LibMutex,
const std::vector<::H5::DataType> parameterDataTypes, std::mutex *hdf5LibMutex,
bool gotthard25um);
#endif
} // namespace masterFileUtility