detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 09:37:59 +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-08 15:58:14 +02:00
parent ddfb66e999 7721787748
commit ca4618d8f4
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorSoftware/include/Detector.h
View File

@ -515,6 +515,27 @@ class Detector {
// void exitReceiver(int detPos = -1);
Result<std::string> getReceiverLastClientIP(Positions pos = {}) const;
void setReceiverLock(bool value, Positions pos = {});
Result<bool> getReceiverLock(Positions pos = {});
/** true when receiver is used otherwise false */
Result<bool> getUseReceiverFlag(Positions pos = {}) const;
void printReceiverConfiguration(Positions pos = {}) const;
/** [Eiger]
* @returns deadtime in ns, 0 = disabled
*/
Result<int64_t> getRateCorrection(Positions pos = {}) const;
/**
* [Eiger] Set Rate correction
* 0 disable correction, <0 set to default, >0 deadtime in ns
*/
void setRateCorrection(int64_t dead_time_ns, Positions pos = {});
};
} // namespace sls

8
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -1752,14 +1752,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param level print level
* @param detPos -1 for all detectors in list or specific detector position
*/
void printReceiverConfiguration(TLogLevel level = logINFO, int detPos = -1);
void printReceiverConfiguration(TLogLevel level = logINFO, int detPos = -1); //
/**
* Get receiver online status
* @param detPos -1 for all detectors in list or specific detector position
* @returns use receiver flag
*/
bool getUseReceiverFlag(int detPos = -1);
bool getUseReceiverFlag(int detPos = -1); //
/**
* Checks if the receiver is really online
@ -1767,7 +1767,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns empty string if all online, else concatenates hostnames of all
* detectors that are offline
*/
std::string checkReceiverOnline(int detPos = -1);
std::string checkReceiverOnline(int detPos = -1); //not needed
/**
* Locks/Unlocks the connection to the receiver
@ -1775,7 +1775,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns lock status of the receiver
*/
int lockReceiver(int lock = -1, int detPos = -1);
int lockReceiver(int lock = -1, int detPos = -1); //
/**
* Returns the IP of the last client connecting to the receiver