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

det id const and ini shm in constructor

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-15 10:15:42 +01:00
parent 7522a655df
commit 4943983d10
5 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -120,7 +120,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
* one
* @param update true to update last user pid, date etc
*/
explicit multiSlsDetector(int id = 0, bool verify = true, bool update = true);
explicit multiSlsDetector(int multi_id = 0, bool verify = true, bool update = true);
/**
* Destructor
@ -1956,7 +1956,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
int kbhit();
/** Multi detector Id */
int detId;
const int multiId;
/** Shared Memory object */
sls::SharedMemory<sharedMultiSlsDetector> multi_shm{0, -1};