detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-23 22:04:30 +01:00
Code Issues Actions Packages Releases Activity

void signature of processData

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-17 16:58:09 +02:00
parent 1d65063088
commit 1d14dc6ff4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -3809,9 +3809,9 @@ void multiSlsDetector::startProcessingThread() {
// } // }
void* multiSlsDetector::processData() { void multiSlsDetector::processData() {
if(setReceiverOnline()==OFFLINE_FLAG){ if(setReceiverOnline()==OFFLINE_FLAG){
return 0; return;
} }
else{ else{
if(dataReady) { if(dataReady) {
@@ -3857,7 +3857,7 @@ void* multiSlsDetector::processData() {
} }
} }
} }
return 0; return;
} }

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -1588,7 +1588,7 @@ public:
* Combines data from all readouts and gives it to the gui * Combines data from all readouts and gives it to the gui
* or just gives progress of acquisition by polling receivers * or just gives progress of acquisition by polling receivers
*/ */
void* processData(); void processData();
private: private:
/** /**