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

changes for eiger server to return error if error

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-06 13:48:06 +02:00
parent 2aed12dcb9
commit 44bf4c52ed
8 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1911,8 +1911,9 @@ slsDetectorDefs::runStatus multiSlsDetector::getRunStatus() {
s1=detectors[i]->getRunStatus();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (s1==ERROR)
s=ERROR;
if (s1==ERROR) {
return ERROR;
}
if (s1!=IDLE)
s = s1;
// if (s1==IDLE && s!=IDLE)