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

fix for corrupt merge

Browse Source
This commit is contained in:
maliakal_d
2019-04-29 11:30:19 +02:00
parent 06d4c7ce37
commit 668cff1c65
3 changed files with 162 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
slsDetectorSoftware/include/slsDetector.h
View File

@ -295,6 +295,20 @@ class slsDetector : public virtual slsDetectorDefs{
*/
int64_t getId(idMode mode);
/**
* Get Receiver Software version
*/
int64_t getReceiverSoftwareVersion();
/**
* Send function parameters to detector (control server)
* @param fnum function enum
* @param args argument pointer
* @param args_size size of argument
* @param retval return pointers
* @param retval_size size of return value
* @returns success or failure
*/
int sendToDetector(int fnum, const void *args, size_t args_size,
void *retval, size_t retval_size);
@ -306,7 +320,15 @@ class slsDetector : public virtual slsDetectorDefs{
int sendToDetector(int fnum, std::nullptr_t, Ret & retval);
int sendToDetector(int fnum);
/**
* Send function parameters to detector (stop server)
* @param fnum function enum
* @param args argument pointer
* @param args_size size of argument
* @param retval return pointers
* @param retval_size size of return value
* @returns success or failure
*/
int sendToDetectorStop(int fnum, const void *args, size_t args_size,
void *retval, size_t retval_size);
@ -319,6 +341,15 @@ class slsDetector : public virtual slsDetectorDefs{
int sendToDetectorStop(int fnum);
/**
* Send function parameters to receiver
* @param fnum function enum
* @param args argument pointer
* @param args_size size of argument
* @param retval return pointers
* @param retval_size size of return value
* @returns success or failure
*/
int sendToReceiver(int fnum, const void *args, size_t args_size,
void *retval, size_t retval_size);
template<typename Arg, typename Ret>
@ -330,9 +361,6 @@ class slsDetector : public virtual slsDetectorDefs{
int sendToReceiver(int fnum);
int64_t getReceiverSoftwareVersion();
/**
* Free shared memory without creating objects
* If this is called, must take care to update
@ -1867,6 +1895,10 @@ class slsDetector : public virtual slsDetectorDefs{
*/
int writeSettingsFile(const std::string &fname, sls_detector_module& mod);
/**
* Get Names of dacs in settings file
* @returns vector dac names expected in settings file
*/
std::vector<std::string> getSettingsFileDacNames();
/** slsDetector Id or position in the detectors list */