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

rxr done WIP

Browse Source
This commit is contained in:
maliakal_d
2020-04-24 15:13:37 +02:00
parent 085cbbf0d6
commit bb32b2f653
14 changed files with 314 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -736,8 +736,8 @@ void DetectorImpl::readFrameFromReceiver() {
nPixelsX = zHeader.npixelsx;
nPixelsY = zHeader.npixelsy;
// detector shape
nX = zHeader.ndetx;
nY = zHeader.ndety;
nX = zHeader.nSocketX;
nY = zHeader.nSocketY;
nY *= numInterfaces;
nDetPixelsX = nX * nPixelsX;
nDetPixelsY = nY * nPixelsY;

4
slsDetectorSoftware/src/Receiver.cpp
View File

@ -140,6 +140,10 @@ sls::MacAddr Receiver::configure(slsDetectorDefs::rxParameters arg) {
memcpy(&arg.zmq_ip, &ip, sizeof(ip));
}
if (arg.detType == EIGER) {
arg.udpInterfaces = 2;
}
LOG(logDEBUG1)
<< "detType:" << arg.detType << std::endl
<< "detectorSize.x:" << arg.detectorSize.x << std::endl