detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-01 17:04:55 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into mysocket

Browse Source
This commit is contained in:
Erik Frojdh
2019-05-27 09:12:10 +02:00
parent a11fc31c49 e2ef043e04
commit 0972b803dd
36 changed files with 670 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/slsDetector.cpp
View File

@@ -1437,7 +1437,7 @@ int slsDetector::configureMAC() {
// 2d positions to detector to put into udp header
{
int pos[2] = {0, 0};
int max = shm()->multiSize[1] * (shm()->numUDPInterfaces);
int max = shm()->multiSize[Y] * (shm()->numUDPInterfaces);
// row
pos[0] = (detId % max);
// col for horiz. udp ports