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

Merge branch 'developer' into gui

Browse Source
This commit is contained in:
maliakal_d
2019-06-04 12:18:20 +02:00
parent d076be8887 3aea917175
commit ffbc0a0fc3
14 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -1366,14 +1366,14 @@ multiSlsDetector::setExternalCommunicationMode(externalCommunicationMode pol, in
}
slsDetectorDefs::externalSignalFlag
multiSlsDetector::setExternalSignalFlags(externalSignalFlag pol, int signalindex, int detPos) {
multiSlsDetector::setExternalSignalFlags(externalSignalFlag pol, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->setExternalSignalFlags(pol, signalindex);
return detectors[detPos]->setExternalSignalFlags(pol);
}
// multi
auto r = parallelCall(&slsDetector::setExternalSignalFlags, pol, signalindex);
auto r = parallelCall(&slsDetector::setExternalSignalFlags, pol);
return sls::minusOneIfDifferent(r);
}