merge resolved

This commit is contained in:
2019-06-11 15:56:13 +02:00
27 changed files with 5419 additions and 4660 deletions

View File

@ -796,6 +796,10 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
int getDataBytes(int detPos = -1);
/**
* Returns the number of detectors in the multi structure*/
size_t size() const{ return detectors.size();}
/**
* Set/get dacs value
* @param val value (in V)