detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 05:47:14 +02:00
Code Issues Actions Packages Releases Activity

slsReciever, slsDetector: configurable number of images per file, removed all the receiver threads from using generalData->maxframesperfile, yet to do: infinite images, bug fix, virtual hdf5 has -1 for all pixels in last image

Browse Source
This commit is contained in:
maliakal_d
2018-05-18 13:47:10 +02:00
parent dcce66ee9f
commit 8b39443197
24 changed files with 269 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/src/BinaryFile.cpp
View File

@ -14,7 +14,7 @@ using namespace std;
FILE* BinaryFile::masterfd = 0;
BinaryFile::BinaryFile(int ind, uint32_t maxf,
BinaryFile::BinaryFile(int ind, uint32_t* maxf,
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
bool* smode):
@ -34,7 +34,7 @@ BinaryFile::~BinaryFile() {
void BinaryFile::PrintMembers() {
File::PrintMembers();
FILE_LOG(logINFO) << "Max Frames Per File: " << maxFramesPerFile;
FILE_LOG(logINFO) << "Max Frames Per File: " << *maxFramesPerFile;
FILE_LOG(logINFO) << "Number of Frames in File: " << numFramesInFile;
}
@ -70,7 +70,7 @@ void BinaryFile::CloseAllFiles() {
}
int BinaryFile::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_t nump) {
if (numFramesInFile >= maxFramesPerFile) {
if (numFramesInFile >= (*maxFramesPerFile)) {
CloseCurrentFile();
CreateFile(fnum);
}