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

Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception)

Browse Source
This commit is contained in:
maliakal_d
2018-08-09 18:19:47 +02:00
parent a0512a01d5 bdd37fa7c2
commit 823c855ef4
2 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4962,7 +4962,7 @@ void multiSlsDetector::readFrameFromReceiver() {
rapidjson::Document doc;
if (!zmqSocket[isocket]->ReceiveHeader(isocket, doc,
SLS_DETECTOR_JSON_HEADER_VERSION)) {
zmqSocket[isocket]->CloseHeaderMessage();
// zmqSocket[isocket]->CloseHeaderMessage();
// parse error, version error or end of acquisition for socket
runningList[isocket] = false;
--numRunning;
@ -5023,7 +5023,7 @@ void multiSlsDetector::readFrameFromReceiver() {
coordX, coordY,
flippedDataX);
#endif
zmqSocket[isocket]->CloseHeaderMessage();
// zmqSocket[isocket]->CloseHeaderMessage();
}
// DATA