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

H5 one dataset name (#484)

Browse Source 
* rename all datasets in hdf5 files to just 'data'

* removing the global qualifier H5

* update release notes
This commit is contained in:
Dhanya Thattil
2022-06-09 12:35:33 +02:00
committed by GitHub
parent 89aa0760c6
commit 8ca8185d41
12 changed files with 380 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/src/DataProcessor.cpp
View File

@@ -169,7 +169,7 @@ uint32_t DataProcessor::GetFilesInAcquisition() const {
return dataFile_->GetFilesInAcquisition();
}
std::array<std::string, 2> DataProcessor::CreateVirtualFile(
std::string DataProcessor::CreateVirtualFile(
const std::string &filePath, const std::string &fileNamePrefix,
const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode,
const int modulePos, const int numUnitsPerReadout,
@@ -195,7 +195,7 @@ std::array<std::string, 2> DataProcessor::CreateVirtualFile(
// stop acquisition)
return masterFileUtility::CreateVirtualHDF5File(
filePath, fileNamePrefix, fileIndex, overWriteEnable, silentMode,
modulePos, numUnitsPerReadout, framesPerFile, numImages,
modulePos, numUnitsPerReadout, framesPerFile,
generalData_->nPixelsX, generalData_->nPixelsY, dynamicRange,
numFramesCaught_, numModX, numModY, dataFile_->GetPDataType(),
dataFile_->GetParameterNames(), dataFile_->GetParameterDataTypes(),
@@ -204,21 +204,18 @@ std::array<std::string, 2> DataProcessor::CreateVirtualFile(
void DataProcessor::LinkFileInMaster(const std::string &masterFileName,
const std::string &virtualFileName,
const std::string &virtualDatasetName,
const bool silentMode,
std::mutex *hdf5LibMutex) {
if (receiverRoiEnabled_) {
throw std::runtime_error("Should not be here, roi with hdf5 virtual should throw.");
}
std::string fname{virtualFileName}, datasetName{virtualDatasetName}, masterfname{masterFileName};
std::string fname{virtualFileName}, masterfname{masterFileName};
// if no virtual file, link data file
if (virtualFileName.empty()) {
auto res = dataFile_->GetFileAndDatasetName();
fname = res[0];
datasetName = res[1];
fname = dataFile_->GetFileName();
}
masterFileUtility::LinkHDF5FileInMaster(masterfname, fname, datasetName,
masterFileUtility::LinkHDF5FileInMaster(masterfname, fname,
dataFile_->GetParameterNames(),
silentMode, hdf5LibMutex);
}