detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-01 09:01:19 +01:00
Code Issues Actions Packages Releases Activity

removing warnings, hdfmutexlib moved from class member in dataprocessor to just arguments when required in dataprocessor (setupfilewriter and createvirtualfile)

Browse Source
This commit is contained in:
maliakal_d
2022-01-05 15:20:06 +01:00
parent 4fce0dcd9c
commit ae9691e848
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsReceiverSoftware/src/Implementation.cpp
View File

@@ -174,7 +174,7 @@ void Implementation::setDetectorType(const detectorType d) {
i, detType, fifo_ptr, &activated, &dataStreamEnable,
&streamingFrequency, &streamingTimerInMs, &streamingStartFnum,
&framePadding, &ctbDbitList, &ctbDbitOffset,
&ctbAnalogDataBytes, &hdf5Lib));
&ctbAnalogDataBytes));
} catch (...) {
listener.clear();
dataProcessor.clear();
@@ -237,7 +237,7 @@ void Implementation::setModulePositionId(const int id) {
for (const auto &it : dataProcessor)
it->SetupFileWriter(fileWriteEnable, masterFileWriteEnable,
fileFormatType, modulePos);
fileFormatType, modulePos, &hdf5Lib);
assert(numMods[1] != 0);
for (unsigned int i = 0; i < listener.size(); ++i) {
uint16_t row = 0, col = 0;
@@ -345,7 +345,7 @@ void Implementation::setFileFormat(const fileFormat f) {
}
for (const auto &it : dataProcessor)
it->SetupFileWriter(fileWriteEnable, masterFileWriteEnable,
fileFormatType, modulePos);
fileFormatType, modulePos, &hdf5Lib);
}
LOG(logINFO) << "File Format: " << sls::ToString(fileFormatType);
@@ -382,7 +382,7 @@ void Implementation::setFileWriteEnable(const bool b) {
fileWriteEnable = b;
for (const auto &it : dataProcessor)
it->SetupFileWriter(fileWriteEnable, masterFileWriteEnable,
fileFormatType, modulePos);
fileFormatType, modulePos, &hdf5Lib);
}
LOG(logINFO) << "File Write Enable: "
<< (fileWriteEnable ? "enabled" : "disabled");
@@ -397,7 +397,7 @@ void Implementation::setMasterFileWriteEnable(const bool b) {
masterFileWriteEnable = b;
for (const auto &it : dataProcessor)
it->SetupFileWriter(fileWriteEnable, masterFileWriteEnable,
fileFormatType, modulePos);
fileFormatType, modulePos, &hdf5Lib);
}
LOG(logINFO) << "Master File Write Enable: "
<< (masterFileWriteEnable ? "enabled" : "disabled");
@@ -566,7 +566,7 @@ void Implementation::stopReceiver() {
dataProcessor[0]->CreateVirtualFile(
filePath, fileName, fileIndex, overwriteEnable, silentMode,
modulePos, numThreads, framesPerFile, numberOfTotalFrames,
dynamicRange, numMods[X], numMods[Y]);
dynamicRange, numMods[X], numMods[Y], &hdf5Lib);
}
// link file in master
dataProcessor[0]->LinkDataInMasterFile(silentMode);
@@ -895,7 +895,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
i, detType, fifo_ptr, &activated, &dataStreamEnable,
&streamingFrequency, &streamingTimerInMs,
&streamingStartFnum, &framePadding, &ctbDbitList,
&ctbDbitOffset, &ctbAnalogDataBytes, &hdf5Lib));
&ctbDbitOffset, &ctbAnalogDataBytes));
dataProcessor[i]->SetGeneralData(generalData);
} catch (...) {
listener.clear();