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

removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-09-22 11:55:43 +02:00
parent c5ff578d10
commit e8bb186ff8
17 changed files with 507 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsReceiverSoftware/src/BinaryFile.cpp
View File

@ -15,11 +15,10 @@ using namespace std;
FILE* BinaryFile::masterfd = 0;
BinaryFile::BinaryFile(int ind, uint32_t maxf, const uint32_t* ppf,
int* nd, char* fname, char* fpath, uint64_t* findex,
bool* frindexenable, bool* owenable,
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno):
File(ind, maxf, ppf, nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, portno),
File(ind, maxf, ppf, nd, fname, fpath, findex, owenable, dindex, nunits, nf, dr, portno),
filefd(0),
numFramesInFile(0),
numActualPacketsInFile(0)
@ -49,7 +48,7 @@ int BinaryFile::CreateFile(uint64_t fnum) {
numActualPacketsInFile = 0;
currentFileName = BinaryFileStatic::CreateFileName(filePath, fileNamePrefix, *fileIndex,
*frameIndexEnable, fnum, *detIndex, *numUnitsPerDetector, index);
(*numImages > 1), fnum, *detIndex, *numUnitsPerDetector, index);
if (BinaryFileStatic::CreateDataFile(filefd, *overWriteEnable, currentFileName, FILE_BUFFER_SIZE) == FAIL)
return FAIL;