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

multidet to multi shm

Browse Source
This commit is contained in:
maliakal_d
2019-08-07 16:32:12 +02:00
parent eec7b22582
commit 21046bcae0
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -15,7 +15,8 @@ class detectorData;
#include <thread>
#include <vector>
#define MULTI_SHMVERSION 0x190726
#define MULTI_SHMAPIVERSION 0x190807
#define MULTI_SHMVERSION 0x190807
#define SHORT_STRING_LENGTH 50
#define DATE_LENGTH 30
@ -46,9 +47,12 @@ struct sharedMultiSlsDetector {
/** number of sls detectors in shared memory */
int numberOfDetectors;
/** multi detector type */
slsDetectorDefs::detectorType multiDetectorType;
/** END OF FIXED PATTERN
* -----------------------------------------------*/
/** Number of detectors operated at once */
int numberOfDetector[2];
@ -2347,9 +2351,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
/** Multi detector Id */
const int multiId{0};
/** multi detector type */
detectorType multiDetType;
/** Shared Memory object */
sls::SharedMemory<sharedMultiSlsDetector> multi_shm{0, -1};