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

fixing merge conflict in error_Defs

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-03 14:32:30 +02:00
parent 986826cbe9 2aed12dcb9
commit 03a2f979a9
11 changed files with 136 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -6233,6 +6233,20 @@ int multiSlsDetector::setReceiverFifoDepth(int i){
}
int multiSlsDetector::setReceiverSilentMode(int i){
int ret=-100,ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
if (detectors[idet]){
ret1=detectors[idet]->setReceiverSilentMode(i);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if(ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
return ret;
}