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

refactor receiver client interface, moved defs into one sls_detector_defs.h

Browse Source
This commit is contained in:
maliakal_d
2018-10-11 12:25:18 +02:00
parent d0950ba001
commit 5a356534e6
56 changed files with 1155 additions and 2386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -9,12 +9,14 @@
* @author Anna Bergamaschi
*/
#include "slsDetectorBase.h"
#include "MySocketTCP.h"
#include "sls_detector_defs.h"
#include "error_defs.h"
#include "math.h"
class multiSlsDetector;
class SharedMemory;
class ClientInterface;
class MySocketTCP;
#define SLS_SHMVERSION 0x181005
#define NCHIPSMAX 10
@ -38,7 +40,7 @@ typedef struct detParameterList {
} detParameterList;
class slsDetector : public slsDetectorBase {
class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
private:
/**
@ -388,7 +390,7 @@ public:
*/
void disconnectStop();
using slsDetectorBase::getDetectorType;
using slsDetectorDefs::getDetectorType;
/**
* Get detector type by connecting to the detector without creating an object