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

conflict resolution with developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-03 15:12:49 +02:00
parent bb817733ff 34f10b382e
commit 812606a7b4
11 changed files with 135 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -6292,6 +6292,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;
}

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1399,6 +1399,12 @@ class multiSlsDetector : public slsDetectorUtils {
*/
int setReceiverFifoDepth(int i = -1);
/** set/get receiver silent mode
* @param i is -1 to get, 0 unsets silent mode, 1 sets silent mode
/returns the receiver silent mode enable
*/
int setReceiverSilentMode(int i = -1);
/******** CTB funcs */