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

changes including warnings and zmq

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-05-04 17:52:47 +02:00
parent 066550d38c
commit 0722ef3125
3 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5185,17 +5185,13 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size,
uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename) {
bool dummy = false;
if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename, dummy))
return FAIL;
//end of acquisition
if(dummy)
//fail is on parse error or end of acquisition
if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename))
return FAIL;
//receiving incorrect size is replaced by 0xFF
zmqSocket[isocket]->ReceiveData(isocket, image, size);
//jungfrau masking adcval
if(masking){
unsigned int snel = size/sizeof(int);