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

changing zmq process to allow for partial readout and fixing interpolation

Browse Source
This commit is contained in:
bergamaschi
2020-07-16 12:27:40 +02:00
parent 2afa620a97
commit f99c431722
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
View File

@ -454,11 +454,11 @@ int main(int argc, char *argv[]) {
} }
#ifdef INTERP #ifdef INTERP
else if (fMode==eFlat) { else if (fMode==eFlat) {
int nb; int nb, nby;
double emi=0, ema=1; double emi=0, ema=1;
int *ff=mt->getFlatField(nb, emi, ema); int *ff=mt->getFlatField(nb, nby, emi, ema);
nnx=nb; nnx=nb;
nny=nb; nny=nby;
dout= new int32_t[nb*nb]; dout= new int32_t[nb*nb];
for (int ix=0; ix<nb*nb; ix++) { for (int ix=0; ix<nb*nb; ix++) {
dout[ix]=ff[ix]; dout[ix]=ff[ix];
@ -811,7 +811,7 @@ int main(int argc, char *argv[]) {
// timestamp=doc["timestamp"].GetUint(); // timestamp=doc["timestamp"].GetUint();
packetNumber=doc["packetNumber"].GetUint(); packetNumber=doc["packetNumber"].GetUint();
// cout << acqIndex << " " << frameIndex << " " << subFrameIndex << " "<< bunchId << " " << timestamp << " " << packetNumber << endl; // cout << acqIndex << " " << frameIndex << " " << subFrameIndex << " "<< bunchId << " " << timestamp << " " << packetNumber << endl;
if (packetNumber>=40) { if (packetNumber>0) {
//*((int*)buff)=frameIndex; //*((int*)buff)=frameIndex;
if (insubframe==0) f0=frameIndex; if (insubframe==0) f0=frameIndex;
memcpy(buff,&frameIndex,sizeof(int)); memcpy(buff,&frameIndex,sizeof(int));
@ -823,7 +823,7 @@ int main(int argc, char *argv[]) {
insubframe++; insubframe++;
nsubframes=frameIndex+1-f0; nsubframes=frameIndex+1-f0;
} else { } else {
cprintf(RED, "Incomplete frame: received only %d packet\n", packetNumber); cprintf(RED, "Empty frame %d\n", frameIndex);
//length = //length =
zmqsocket->ReceiveData(0, dummybuff, size); zmqsocket->ReceiveData(0, dummybuff, size);
} }

12
slsReceiverSoftware/CMakeLists.txt
View File

@ -41,12 +41,12 @@ include_directories(
include 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(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a)
#set_target_properties(zmq PROPERTIES set_target_properties(zmq PROPERTIES
# IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
#) )
add_library(slsReceiverStatic STATIC add_library(slsReceiverStatic STATIC
${SOURCES} ${SOURCES}
@ -88,7 +88,7 @@ set_target_properties(slsReceiver PROPERTIES
target_link_libraries(slsReceiver target_link_libraries(slsReceiver
slsReceiverShared slsReceiverShared
pthread pthread
# zmq zmq
rt rt
) )