detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-01 19:54:56 +01: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

10
slsDetectorSoftware/src/slsDetector.cpp
View File

@@ -1707,15 +1707,13 @@ slsDetector::setExternalCommunicationMode(externalCommunicationMode pol) {
}
slsDetectorDefs::externalSignalFlag
slsDetector::setExternalSignalFlags(externalSignalFlag pol, int signalindex) {
slsDetector::setExternalSignalFlags(externalSignalFlag pol) {
int fnum = F_SET_EXTERNAL_SIGNAL_FLAG;
int args[]{signalindex, pol};
auto retval = GET_EXTERNAL_SIGNAL_FLAG;
FILE_LOG(logDEBUG1) << "Setting signal " << signalindex << " to flag "
<< pol;
FILE_LOG(logDEBUG1) << "Setting signal flag to " << pol;
if (shm()->onlineFlag == ONLINE_FLAG) {
sendToDetector(fnum, args, retval);
FILE_LOG(logDEBUG1) << "Ext Signal (" << signalindex << "): " << retval;
sendToDetector(fnum, pol, retval);
FILE_LOG(logDEBUG1) << "Ext Signal: " << retval;
}
return retval;
}