detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-07-11 10:21:50 +02:00
Code Issues Actions Packages Releases Activity

wip: to map roi to virutal
All checks were successful
Build on RHEL9 / build (push) Successful in 3m9s
Details
Build on RHEL8 / build (push) Successful in 4m49s
Details

Browse Source
This commit is contained in:
maliakal_d
2025-06-24 17:30:59 +02:00
parent 24fcfb3f9d
commit 8f0c946393
1 changed files with 131 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
slsReceiverSoftware/src/MasterFileUtility.cpp
View File

@ -208,7 +208,7 @@ std::string CreateVirtualHDF5File(
attribute.write(H5::PredType::NATIVE_DOUBLE, &dValue); attribute.write(H5::PredType::NATIVE_DOUBLE, &dValue);
// complete detector in roi // complete detector in roi
/*if (multiRoi.empty()) { if (multiRoi.size() == 1 && multiRoi[0].isComplete()) {
int ny = nPixelsY * numModY; int ny = nPixelsY * numModY;
int nx = nPixelsX * numModX; int nx = nPixelsX * numModX;
if (nPixelsY == 1) { if (nPixelsY == 1) {
@ -216,9 +216,9 @@ std::string CreateVirtualHDF5File(
} else { } else {
multiRoi.push_back(defs::ROI{0, nx - 1, 0, ny - 1}); multiRoi.push_back(defs::ROI{0, nx - 1, 0, ny - 1});
} }
}*/ }
// for (size_t iRoi = 0; iRoi != multiRoi.size(); ++iRoi) { for (size_t iRoi = 0; iRoi != multiRoi.size(); ++iRoi) {
// dataspace // dataspace
hsize_t vdsDims[DATA_RANK] = {numImagesCaught, numModY * nDimy, hsize_t vdsDims[DATA_RANK] = {numImagesCaught, numModY * nDimy,
@ -273,9 +273,9 @@ std::string CreateVirtualHDF5File(
startLocation[2] = iReadout; startLocation[2] = iReadout;
} }
vdsDataSpace.selectHyperslab(H5S_SELECT_SET, numBlocks, vdsDataSpace.selectHyperslab(
startLocation, strideBetweenBlocks, H5S_SELECT_SET, numBlocks, startLocation,
blockSize); strideBetweenBlocks, blockSize);
vdsDataSpacePara.selectHyperslab( vdsDataSpacePara.selectHyperslab(
H5S_SELECT_SET, numBlocksPara, startLocationPara, H5S_SELECT_SET, numBlocksPara, startLocationPara,
@ -300,7 +300,8 @@ std::string CreateVirtualHDF5File(
// source dataspace // source dataspace
hsize_t srcDims[DATA_RANK] = {nDimx, nDimy, nDimz}; hsize_t srcDims[DATA_RANK] = {nDimx, nDimy, nDimz};
hsize_t srcDimsMax[DATA_RANK] = {H5S_UNLIMITED, nDimy, nDimz}; hsize_t srcDimsMax[DATA_RANK] = {H5S_UNLIMITED, nDimy,
nDimz};
H5::DataSpace srcDataSpace(DATA_RANK, srcDims, srcDimsMax); H5::DataSpace srcDataSpace(DATA_RANK, srcDims, srcDimsMax);
hsize_t srcDimsPara[PARA_RANK] = {nDimx}; hsize_t srcDimsPara[PARA_RANK] = {nDimx};
hsize_t srcDimsMaxPara[PARA_RANK] = {H5S_UNLIMITED}; hsize_t srcDimsMaxPara[PARA_RANK] = {H5S_UNLIMITED};
@ -310,13 +311,14 @@ std::string CreateVirtualHDF5File(
// (framescaught not multiple of framesperfile, // (framescaught not multiple of framesperfile,
// virtual parameter datasets error loading (bad scalar // virtual parameter datasets error loading (bad scalar
// value)) // value))
if (nDimx != maxFramesPerFile) { // TODO WHY????
/*if (nDimx != maxFramesPerFile) {
hsize_t count[1] = {nDimx}; hsize_t count[1] = {nDimx};
hsize_t start[1] = {0}; hsize_t start[1] = {0};
srcDataSpacePara.selectHyperslab( srcDataSpacePara.selectHyperslab(
H5S_SELECT_SET, count, start, strideBetweenBlocksPara, H5S_SELECT_SET, count, start,
blockSizePara); strideBetweenBlocksPara, blockSizePara);
} }*/
// mapping of property list // mapping of property list
plist.setVirtual(vdsDataSpace, relative_srcFileName.c_str(), plist.setVirtual(vdsDataSpace, relative_srcFileName.c_str(),
@ -350,7 +352,7 @@ std::string CreateVirtualHDF5File(
parameterNames[p].c_str(), parameterDataTypes[p], parameterNames[p].c_str(), parameterDataTypes[p],
vdsDataSpacePara, plistPara[p])); vdsDataSpacePara, plistPara[p]));
} }
//} }
fd->close(); fd->close();
} catch (const H5::Exception &error) { } catch (const H5::Exception &error) {