zmqip fix to restart reciever streaming form command line, fix to not have sls_receiver_defs in zmqSocket.h incldue

This commit is contained in:
Dhanya Maliakal
2017-11-28 16:31:43 +01:00
parent 6a41b5ce3a
commit 7c1423d654
2 changed files with 5 additions and 2 deletions

View File

@ -5968,7 +5968,7 @@ void multiSlsDetector::readFrameFromReceiver(){
else {
thisData = new detectorData(NULL,NULL,NULL,getCurrentProgress(),currentFileName.c_str(),maxX,maxY,multiframe, multidatabytes, dr, currentFileIndex);
}
dataReady(thisData, currentFrameIndex, currentSubFrameIndex, pCallbackArg);
dataReady(thisData, currentFrameIndex, (((dr == 32) && (eiger)) ? currentSubFrameIndex : -1), pCallbackArg);
delete thisData;
//cout<<"Send frame #"<< currentFrameIndex << " to gui"<<endl;