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

removing sem_wait in acquire (#182)

Browse Source
This commit is contained in:
Dhanya Thattil
2020-09-17 13:55:20 +02:00
committed by GitHub
parent bf69951456
commit b0dd82c667
2 changed files with 16 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/src/DetectorImpl.h
View File

@ -276,7 +276,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
* Combines data from all readouts and gives it to the gui
* or just gives progress of acquisition by polling receivers
*/
void processData();
void processData(bool receiver);
/**
* Convert raw file
@ -352,7 +352,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
void printProgress(double progress);
void startProcessingThread();
void startProcessingThread(bool receiver);
/**
* Check if processing thread is ready to join main thread
@ -387,14 +387,6 @@ class DetectorImpl : public virtual slsDetectorDefs {
/** ZMQ Socket - Receiver to Client */
std::vector<std::unique_ptr<ZmqSocket>> zmqSocket;
/** semaphore to let postprocessing thread continue for next
* scan/measurement */
sem_t sem_newRTAcquisition;
/** semaphore to let main thread know it got all the dummy packets (also
* from ext. process) */
sem_t sem_endRTAcquisition;
/** mutex to synchronize main and data processing threads */
mutable std::mutex mp;