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

fedora cant compile as make_unique in Implementation points to std and not sls namespace, but it compiles for DetectorImpl (#463)

Browse Source
This commit is contained in:
Dhanya Thattil 2022-05-20 12:00:24 +02:00 committed by GitHub
parent f3edd4dc56
commit 70aed474dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsReceiverSoftware/src/Implementation.cpp
View File

@ -75,7 +75,7 @@ void Implementation::SetupFifoStructure() {
// create fifo structure // create fifo structure
try { try {
fifo.push_back(make_unique<Fifo>( fifo.push_back(sls::make_unique<Fifo>(
i, datasize + (generalData->fifoBufferHeaderSize), fifoDepth)); i, datasize + (generalData->fifoBufferHeaderSize), fifoDepth));
} catch (...) { } catch (...) {
fifo.clear(); fifo.clear();
@ -178,7 +178,7 @@ void Implementation::setDetectorType(const detectorType d) {
try { try {
auto fifo_ptr = fifo[i].get(); auto fifo_ptr = fifo[i].get();
listener.push_back(make_unique<Listener>( listener.push_back(sls::make_unique<Listener>(
i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i], i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i],
&udpSocketBufferSize, &actualUDPSocketBufferSize, &udpSocketBufferSize, &actualUDPSocketBufferSize,
&framesPerFile, &frameDiscardMode, &detectorDataStream[i], &framesPerFile, &frameDiscardMode, &detectorDataStream[i],
@ -187,7 +187,7 @@ void Implementation::setDetectorType(const detectorType d) {
if (detType == CHIPTESTBOARD) { if (detType == CHIPTESTBOARD) {
ctbAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes(); ctbAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes();
} }
dataProcessor.push_back(make_unique<DataProcessor>( dataProcessor.push_back(sls::make_unique<DataProcessor>(
i, detType, fifo_ptr, &dataStreamEnable, &streamingFrequency, i, detType, fifo_ptr, &dataStreamEnable, &streamingFrequency,
&streamingTimerInMs, &streamingStartFnum, &framePadding, &streamingTimerInMs, &streamingStartFnum, &framePadding,
&ctbDbitList, &ctbDbitOffset, &ctbAnalogDataBytes)); &ctbDbitList, &ctbDbitOffset, &ctbAnalogDataBytes));
@ -996,7 +996,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
// listener and dataprocessor threads // listener and dataprocessor threads
try { try {
auto fifo_ptr = fifo[i].get(); auto fifo_ptr = fifo[i].get();
listener.push_back(make_unique<Listener>( listener.push_back(sls::make_unique<Listener>(
i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i], i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i],
&udpSocketBufferSize, &actualUDPSocketBufferSize, &udpSocketBufferSize, &actualUDPSocketBufferSize,
&framesPerFile, &frameDiscardMode, &detectorDataStream[i], &framesPerFile, &frameDiscardMode, &detectorDataStream[i],
@ -1009,7 +1009,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
ctbAnalogDataBytes = ctbAnalogDataBytes =
generalData->GetNumberOfAnalogDatabytes(); generalData->GetNumberOfAnalogDatabytes();
} }
dataProcessor.push_back(make_unique<DataProcessor>( dataProcessor.push_back(sls::make_unique<DataProcessor>(
i, detType, fifo_ptr, &dataStreamEnable, i, detType, fifo_ptr, &dataStreamEnable,
&streamingFrequency, &streamingTimerInMs, &streamingFrequency, &streamingTimerInMs,
&streamingStartFnum, &framePadding, &ctbDbitList, &streamingStartFnum, &framePadding, &ctbDbitList,
@ -1031,7 +1031,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
if (quadEnable) { if (quadEnable) {
flip = (i == 1 ? true : false); flip = (i == 1 ? true : false);
} }
dataStreamer.push_back(make_unique<DataStreamer>( dataStreamer.push_back(sls::make_unique<DataStreamer>(
i, fifo[i].get(), &dynamicRange, &detectorRoi, i, fifo[i].get(), &dynamicRange, &detectorRoi,
&fileIndex, flip, numPorts, &quadEnable, &fileIndex, flip, numPorts, &quadEnable,
&numberOfTotalFrames)); &numberOfTotalFrames));
@ -1158,7 +1158,7 @@ void Implementation::setDataStreamEnable(const bool enable) {
if (quadEnable) { if (quadEnable) {
flip = (i == 1 ? true : false); flip = (i == 1 ? true : false);
} }
dataStreamer.push_back(make_unique<DataStreamer>( dataStreamer.push_back(sls::make_unique<DataStreamer>(
i, fifo[i].get(), &dynamicRange, &detectorRoi, i, fifo[i].get(), &dynamicRange, &detectorRoi,
&fileIndex, flip, numPorts, &quadEnable, &fileIndex, flip, numPorts, &quadEnable,
&numberOfTotalFrames)); &numberOfTotalFrames));