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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-06-25 15:29:37 +02:00
parent 637b0ea9e1
commit 746cb6b49d
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsReceiverSoftware/src/BinaryFile.cpp
View File

@ -36,7 +36,6 @@ void BinaryFile::PrintMembers(TLogLevel level) {
void BinaryFile::CreateFile() {
numFramesInFile = 0;
numActualPacketsInFile = 0;
std::ostringstream os;
os << *filePath << "/" << *fileNamePrefix << "_d"
@ -100,7 +99,6 @@ void BinaryFile::WriteToFile(char *buffer, int buffersize,
CreateFile();
}
numFramesInFile++;
numActualPacketsInFile += numPacketsCaught;
// write to file
int ret = 0;
@ -172,7 +170,4 @@ void BinaryFile::CreateMasterFile(MasterAttributes *attr) {
}
}
void BinaryFile::StartofAcquisition() {
numFramesInFile = 0;
numActualPacketsInFile = 0;
}
void BinaryFile::StartofAcquisition() { numFramesInFile = 0; }

1
slsReceiverSoftware/src/BinaryFile.h
View File

@ -55,5 +55,4 @@ class BinaryFile : private virtual slsDetectorDefs, public File {
FILE *filefd = nullptr;
static FILE *masterfd;
uint32_t numFramesInFile = 0;
uint64_t numActualPacketsInFile = 0;
};

7
slsReceiverSoftware/src/HDF5File.cpp
View File

@ -25,8 +25,8 @@ HDF5File::HDF5File(int ind, uint32_t *maxf, int *nd, std::string *fname,
nf, dr, portno, smode),
masterfd(nullptr), virtualfd(0), filefd(nullptr), dataspace(nullptr),
dataset(nullptr), datatype(PredType::STD_U16LE), nPixelsX(nx),
nPixelsY(ny), numFramesInFile(0), numActualPacketsInFile(0),
numFilesinAcquisition(0), dataspace_para(nullptr), extNumImages(0) {
nPixelsY(ny), numFramesInFile(0), numFilesinAcquisition(0),
dataspace_para(nullptr), extNumImages(0) {
PrintMembers();
dataset_para.clear();
parameterNames.clear();
@ -67,7 +67,6 @@ void HDF5File::SetNumberofPixels(uint32_t nx, uint32_t ny) {
void HDF5File::CreateFile() {
numFilesinAcquisition++;
numFramesInFile = 0;
numActualPacketsInFile = 0;
// first time
if (subFileIndex == 0u) {
@ -135,7 +134,6 @@ void HDF5File::WriteToFile(char *buffer, int bufferSize,
CreateFile();
}
numFramesInFile++;
numActualPacketsInFile += numPacketsCaught;
// extend dataset (when receiver start followed by many status starts
// (jungfrau)))
@ -157,7 +155,6 @@ void HDF5File::CreateMasterFile(MasterAttributes *attr) {
void HDF5File::StartofAcquisition() {
numFilesinAcquisition = 0;
numFramesInFile = 0;
numActualPacketsInFile = 0;
extNumImages = *numImages;
}

1
slsReceiverSoftware/src/HDF5File.h
View File

@ -81,7 +81,6 @@ class HDF5File : private virtual slsDetectorDefs, public File {
uint32_t nPixelsX;
uint32_t nPixelsY;
uint32_t numFramesInFile;
uint64_t numActualPacketsInFile;
int numFilesinAcquisition;
std::vector<std::string> parameterNames;