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

zmq changes for no dummy data end

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-05-01 14:02:13 +02:00
parent 020eaded36
commit 066550d38c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5185,12 +5185,17 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size, 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) { uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename) {
if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename)) bool dummy = false;
if (!zmqSocket[isocket]->ReceiveHeader(isocket, acqIndex, frameIndex, subframeIndex, filename, dummy))
return FAIL; return FAIL;
if (!zmqSocket[isocket]->ReceiveData(isocket, image, size)) //end of acquisition
if(dummy)
return FAIL; return FAIL;
zmqSocket[isocket]->ReceiveData(isocket, image, size);
//jungfrau masking adcval //jungfrau masking adcval
if(masking){ if(masking){
unsigned int snel = size/sizeof(int); unsigned int snel = size/sizeof(int);