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

initial changes

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-12 08:22:07 +01:00
parent 6765fd0dc8
commit a01d68a61f
6 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -10,9 +10,9 @@
#include "error_defs.h"
#include "logger.h"
#include "sls_detector_defs.h"
#include "SharedMemory.h"
class slsDetector;
class SharedMemory;
// class SharedMemory;
class ZmqSocket;
class detectorData;
@ -27,10 +27,7 @@ class detectorData;
#define SHORT_STRING_LENGTH 50
#define DATE_LENGTH 30
class multiSlsDetector : public virtual slsDetectorDefs,
public virtual errorDefs {
private:
/**
* @short structure allocated in shared memory to store detector settings
* for IPC and cache
@ -99,7 +96,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
int maxNumberOfChannelsPerDetector[2];
/** timer values */
int64_t timerValue[MAX_TIMERS];
int64_t timerValue[slsDetectorDefs::timerIndex::MAX_TIMERS];
/** flag for acquiring */
bool acquiringFlag;
@ -113,6 +110,12 @@ class multiSlsDetector : public virtual slsDetectorDefs,
} sharedMultiSlsDetector;
class multiSlsDetector : public virtual slsDetectorDefs,
public virtual errorDefs {
// private:
public:
/**
* Constructor
@ -1963,7 +1966,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
int detId;
/** Shared Memory object */
SharedMemory *sharedMemory {nullptr};
SharedMemory<sharedMultiSlsDetector> *sharedMemory {nullptr};
/** Shared memory structure */
sharedMultiSlsDetector *thisMultiDetector {nullptr};