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

changes from 4.2.0-rc: eiger check for max trimbits; end of eigerserver: if detector ip, set activate; update both control and stop server for activate

Browse Source
This commit is contained in:
maliakal_d
2020-03-10 16:49:08 +01:00
parent 9467b4c610
commit dea8cba985
7 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -2685,6 +2685,7 @@ int slsDetector::activate(int enable) {
int retval = -1;
FILE_LOG(logDEBUG1) << "Setting activate flag to " << enable;
sendToDetector(F_ACTIVATE, enable, retval);
sendToDetectorStop(F_ACTIVATE, enable, retval);
FILE_LOG(logDEBUG1) << "Activate: " << retval;
shm()->activated = static_cast<bool>(retval);
if (shm()->useReceiverFlag) {