From 753cbbd18c0e5c5ebbdcdc5161c3b561129c4c4a Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 18 Jan 2022 17:10:12 +0100 Subject: [PATCH] gui doesnt need to multply to get port geometry for number of interfaces, previously worked as bool was used instead of int for numInterfaces in DetectorImpl:readframefromreceiver --- slsDetectorSoftware/src/DetectorImpl.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index 58de5ffc8..15454ab23 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -466,16 +466,6 @@ void DetectorImpl::readFrameFromReceiver() { // to flip image bool eiger = false; - // cannot pick up udp interfaces from zmq - int numInterfaces = - Parallel(&Module::getNumberofUDPInterfacesFromShm, {}).squash(1); - int module_ports[2] = {1, 1}; - // gotthard2 second interface is veto debugging - if (shm()->detType == EIGER) - module_ports[1] = numInterfaces; // horz - else if (shm()->detType == JUNGFRAU) - module_ports[0] = numInterfaces; // vert - std::vector runningList(zmqSocket.size()); std::vector connectList(zmqSocket.size()); numZmqRunning = 0; @@ -551,11 +541,9 @@ void DetectorImpl::readFrameFromReceiver() { // shape nPixelsX = zHeader.npixelsx; nPixelsY = zHeader.npixelsy; - // module shape - nX = - zHeader.ndetx; // not multiplied by module_ports[1], - // already done in receiver - nY = zHeader.ndety * module_ports[0]; + // module shape (port) + nX = zHeader.ndetx; + nY = zHeader.ndety; nDetPixelsX = nX * nPixelsX; nDetPixelsY = nY * nPixelsY; // det type