detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 10:04:39 +01: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

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -7,7 +7,8 @@
* @author Anna Bergamaschi
*/
#include "slsDetectorBase.h"
#include "sls_detector_defs.h"
#include "error_defs.h"
class slsDetector;
class SharedMemory;
@@ -24,7 +25,7 @@ class detectorData;
#define SHORT_STRING_LENGTH 50
#define DATE_LENGTH 30
class multiSlsDetector : public slsDetectorBase {
class multiSlsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
private:
@@ -294,7 +295,7 @@ public:
void addMultipleDetectors(const char* name);
using slsDetectorBase::getDetectorType;
using slsDetectorDefs::getDetectorType;
/**
* Get Detector type for a particular sls detector or get the first one
* @param detPos -1 for all detectors in list or specific detector position