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

moved detectors and zmqSocket to unique pointers

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-10 11:55:37 +02:00
parent 9ca163dfc9
commit d685cb8ff4
3 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -14,6 +14,7 @@ class SharedMemory;
class ZmqSocket;
class detectorData;
#include <memory>
#include <vector>
#include <string>
#include <semaphore.h>
@ -1685,13 +1686,13 @@ private:
sharedMultiSlsDetector *thisMultiDetector;
/** pointers to the slsDetector structures */
std::vector <slsDetector*> detectors;
std::vector <std::unique_ptr<slsDetector>> detectors;
/** data streaming (down stream) enabled in client (zmq sckets created) */
bool client_downstream;
/** ZMQ Socket - Receiver to Client */
std::vector <ZmqSocket*> zmqSocket;
std::vector <std::unique_ptr<ZmqSocket>> zmqSocket;
/** semaphore to let postprocessing thread continue for next scan/measurement */