detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

virtual hdf file mapping fnum-1 images, fixed

Browse Source
This commit is contained in:
maliakal_d 2018-04-25 16:52:14 +02:00
parent b5909044f6
commit 1c49fbb090
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/HDF5FileStatic.h
View File

@ -511,8 +511,8 @@ public:
} }
//hyperslab //hyperslab
int numMajorHyperslab = numf/maxFramesPerFile; int numMajorHyperslab = (numf-1)/maxFramesPerFile;
if (numf%maxFramesPerFile) numMajorHyperslab++; if ((numf-1)%maxFramesPerFile) numMajorHyperslab++;
bool error = false; bool error = false;
uint64_t framesSaved = 0; uint64_t framesSaved = 0;
for (int j = 0; j < numMajorHyperslab; j++) { for (int j = 0; j < numMajorHyperslab; j++) {

7
slsReceiverSoftware/src/HDF5File.cpp
View File

@ -22,13 +22,12 @@ hid_t HDF5File::virtualfd = 0;
HDF5File::HDF5File(int ind, uint32_t maxf, HDF5File::HDF5File(int ind, uint32_t maxf,
int* nd, char* fname, char* fpath, uint64_t* findex, int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
bool* frindexenable, bool* owenable,
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
uint32_t nx, uint32_t ny, uint32_t nx, uint32_t ny,
bool* smode): bool* smode):
File(ind, maxf, nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, portno, smode), File(ind, maxf, nd, fname, fpath, findex, owenable, dindex, nunits, nf, dr, portno, smode),
filefd(0), filefd(0),
dataspace(0), dataspace(0),
dataset(0), dataset(0),
@ -217,7 +216,7 @@ int HDF5File::CreateVirtualFile(uint64_t numf) {
virtualfd, masterFileName, virtualfd, masterFileName,
filePath, fileNamePrefix, *fileIndex, (*numImages > 1), filePath, fileNamePrefix, *fileIndex, (*numImages > 1),
*detIndex, *numUnitsPerDetector, *detIndex, *numUnitsPerDetector,
maxFramesPerFile, numf, maxFramesPerFile, numf+1,
"data", datatype, "data", datatype,
numDetY, numDetX, nPixelsY, ((*dynamicRange==4) ? (nPixelsX/2) : nPixelsX), numDetY, numDetX, nPixelsY, ((*dynamicRange==4) ? (nPixelsX/2) : nPixelsX),
HDF5_WRITER_VERSION); HDF5_WRITER_VERSION);