fixed merge

This commit is contained in:
Erik Frojdh
2019-08-09 14:48:01 +02:00
3 changed files with 199 additions and 3 deletions

View File

@ -853,7 +853,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns value of speed set
*/
int setSpeed(speedVariable index, int value = -1, int mode = 0,
int detPos = -1);
int detPos = -1);//
/**
* Set/get dynamic range and updates the number of dataBytes