conflict resolution with developer

This commit is contained in:
Dhanya Maliakal
2017-10-03 15:12:49 +02:00
11 changed files with 135 additions and 29 deletions

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 */