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

merge conflict fix

Browse Source
This commit is contained in:
maliakal_d
2021-07-22 13:52:55 +02:00
parent 05b7e0ef42 97ff58c978
commit 5b05a30287
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/Detector.cpp
View File

@@ -2166,7 +2166,8 @@ std::vector<int> Detector::getPortNumbers(int start_port) {
num_sockets_per_detector *= 2;
break;
case defs::JUNGFRAU:
if (getNumberofUDPInterfaces().squash() == 2) {
case defs::GOTTHARD2:
if (getNumberofUDPInterfaces_({}).squash() == 2) {
num_sockets_per_detector *= 2;
}
break;