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

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
maliakal_d
2018-10-10 12:24:20 +02:00
parent b981fe78ef 6147383677
commit 6d9530ee1d
3 changed files with 64 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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>
@ -162,7 +163,7 @@ public:
* @param pos positin of detector in array (-1 is for all)
* @returns result for detector at that position or concatenated string of all detectors
*/
std::string concatResultOrPos(std::string (slsDetector::*somefunc)(int), int pos);
// std::string concatResultOrPos(std::string (slsDetector::*somefunc)(int), int pos);
/**
* Decodes which detector and the corresponding channel numbers for it
@ -1694,13 +1695,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 */