This commit is contained in:
2019-08-12 14:15:25 +02:00
parent f982a59a7c
commit 95751766cd
5 changed files with 779 additions and 529 deletions

View File

@ -1387,7 +1387,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
void resetCounterBlock(int startACQ = 0, int detPos = -1); //
/**
* Set/get counter bit in detector (Gotthard)
* Set/get counter bit in detector (Eiger)
* @param i is -1 to get, 0 to reset and any other value to set the counter
* bit
* @param detPos -1 for all detectors in list or specific detector position
@ -1395,13 +1395,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
int setCounterBit(int i = -1, int detPos = -1); //
/**
* Ensures that min is less than max in both dimensions (Gotthard)
* @param n number of rois
* @param r array of rois
*/
void verifyMinMaxROI(int n, ROI r[]);
/**
* Set ROI (Gotthard)
* At the moment only one set allowed
@ -1976,7 +1969,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param enable 0 to disable, 1 to enable, -1 to get the value
* @returns data streaming to client enable
*/
int enableDataStreamingToClient(int enable = -1);
bool enableDataStreamingToClient(int enable = -1);
/**
* Enable or disable streaming data from receiver to client
@ -2283,6 +2276,13 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
void addSlsDetector(const std::string &hostname);
/**
* Ensures that min is less than max in both dimensions (Gotthard)
* @param n number of rois
* @param r array of rois
*/
void verifyMinMaxROI(int n, ROI r[]);
/**
* add gap pixels to the image (only for Eiger in 4 bit mode)
* @param image pointer to image without gap pixels