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

Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya

Browse Source
This commit is contained in:
Erik Frojdh
2019-08-09 14:08:29 +02:00
parent 2f61764fd7 1a60b59a48
commit a084ea2d0f
13 changed files with 221 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -381,7 +381,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* Returns the number of detectors in the multidetector structure
* @returns number of detectors
*/
int getNumberOfDetectors() const;//
int size() const;//
/**
* Returns number of detectors in dimension d
@ -819,7 +819,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns sub frame dead time in ns, or s if specified
*/
double getMeasuredPeriod(bool inseconds = false, int detPos = -1);
double getMeasuredPeriod(bool inseconds = false, int detPos = -1);//
/**
* Get sub period between previous two sub frames in 32 bit mode (EIGER)
@ -828,7 +828,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns sub frame dead time in ns, or s if specified
*/
double getMeasuredSubFramePeriod(bool inseconds = false, int detPos = -1);
double getMeasuredSubFramePeriod(bool inseconds = false, int detPos = -1);//
/**
* Set/get timer value left in acquisition (not all implemented for all
@ -839,7 +839,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns timer set value in ns or number of...(e.g. frames,
* probes)
*/
int64_t getTimeLeft(timerIndex index, int detPos = -1);
int64_t getTimeLeft(timerIndex index, int detPos = -1);//
/**
* Set speed
@ -872,10 +872,6 @@ 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)