detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 21:37: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:
maliakal_d
2019-08-09 14:28:42 +02:00
parent 2ac421365d a084ea2d0f
commit 6691680091
3 changed files with 133 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -1293,7 +1293,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
std::string setAdditionalJsonParameter(const std::string &key,
const std::string &value,
int detPos = -1);
int detPos = -1); //
/**
* Returns the additional json header parameter value
@ -1303,7 +1303,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* empty if no parameter found in additional json header
*/
std::string getAdditionalJsonParameter(const std::string &key,
int detPos = -1);
int detPos = -1); //
/**
* Sets the detector minimum/maximum energy threshold in processor (for
@ -1314,7 +1314,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* error in computing json parameter value)
*/
int setDetectorMinMaxEnergyThreshold(const int index, int value,
int detPos = -1);
int detPos = -1); //
/**
* Sets the frame mode in processor (Moench only)
@ -1341,21 +1341,21 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns receiver udp socket buffer size
*/
int64_t setReceiverUDPSocketBufferSize(int64_t udpsockbufsize = -1,
int detPos = -1);
int detPos = -1); //
/**
* Returns the receiver UDP socket buffer size
* @param detPos -1 for all detectors in list or specific detector position
* @returns the receiver UDP socket buffer size
*/
int64_t getReceiverUDPSocketBufferSize(int detPos = -1);
int64_t getReceiverUDPSocketBufferSize(int detPos = -1); //
/**
* Returns the receiver real UDP socket buffer size
* @param detPos -1 for all detectors in list or specific detector position
* @returns the receiver real UDP socket buffer size
*/
int64_t getReceiverRealUDPSocketBufferSize(int detPos = -1);
int64_t getReceiverRealUDPSocketBufferSize(int detPos = -1); //
/** (users only)
* Set 10GbE Flow Control (Eiger)
@ -1363,7 +1363,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns 10GbE flow Control
*/
int setFlowControl10G(int enable = -1, int detPos = -1);
int setFlowControl10G(int enable = -1, int detPos = -1); //
/**
* Execute a digital test (Gotthard)
@ -1381,7 +1381,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
*/
void loadImageToDetector(imageType index, const std::string &fname,
int detPos = -1);
int detPos = -1); //
/**
* Writes the counter memory block from the detector (Gotthard)
@ -1397,7 +1397,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param startACQ is 1 to start acquisition after resetting counter
* @param detPos -1 for all detectors in list or specific detector position
*/
void resetCounterBlock(int startACQ = 0, int detPos = -1);
void resetCounterBlock(int startACQ = 0, int detPos = -1); //
/**
* Set/get counter bit in detector (Gotthard)
@ -1406,7 +1406,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns the counter bit in detector
*/
int setCounterBit(int i = -1, int detPos = -1);
int setCounterBit(int i = -1, int detPos = -1); //
/**
* Ensures that min is less than max in both dimensions (Gotthard)