diff --git a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp index 2d7784f07..8f06af256 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp @@ -454,11 +454,11 @@ int main(int argc, char *argv[]) { } #ifdef INTERP else if (fMode==eFlat) { - int nb; + int nb, nby; double emi=0, ema=1; - int *ff=mt->getFlatField(nb, emi, ema); + int *ff=mt->getFlatField(nb, nby, emi, ema); nnx=nb; - nny=nb; + nny=nby; dout= new int32_t[nb*nb]; for (int ix=0; ix=40) { + if (packetNumber>0) { //*((int*)buff)=frameIndex; if (insubframe==0) f0=frameIndex; memcpy(buff,&frameIndex,sizeof(int)); @@ -823,7 +823,7 @@ int main(int argc, char *argv[]) { insubframe++; nsubframes=frameIndex+1-f0; } else { - cprintf(RED, "Incomplete frame: received only %d packet\n", packetNumber); + cprintf(RED, "Empty frame %d\n", frameIndex); //length = zmqsocket->ReceiveData(0, dummybuff, size); } diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 9c1a6a343..adc1b2465 100644 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -41,12 +41,12 @@ include_directories( include ) -#add_library(zmq STATIC IMPORTED GLOBAL) +add_library(zmq STATIC IMPORTED GLOBAL) -#set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a) -#set_target_properties(zmq PROPERTIES -# IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} -#) +set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a) +set_target_properties(zmq PROPERTIES + IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} +) add_library(slsReceiverStatic STATIC ${SOURCES} @@ -88,7 +88,7 @@ set_target_properties(slsReceiver PROPERTIES target_link_libraries(slsReceiver slsReceiverShared pthread -# zmq + zmq rt )