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

default args

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-12 10:14:24 +01:00
parent a01d68a61f
commit 507a22ac05
8 changed files with 401 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -259,7 +259,7 @@ void multiSlsDetector::freeSharedMemory(int multiId, int detPos) {
// sharedMultiSlsDetector *mdet =
// (sharedMultiSlsDetector *)shm.OpenSharedMemory(
// sizeof(sharedMultiSlsDetector));
shm.OpenSharedMemory(sizeof(sharedMultiSlsDetector));
shm.OpenSharedMemory();
numDetectors = shm()->numberOfDetectors;
shm.UnmapSharedMemory();
shm.RemoveSharedMemory();
@ -328,13 +328,13 @@ void multiSlsDetector::initSharedMemory(bool verify) {
try {
// shared memory object with name
sharedMemory = new SharedMemory<sharedMultiSlsDetector>(detId, -1);
size_t sz = sizeof(sharedMultiSlsDetector);
// size_t sz = sizeof(sharedMultiSlsDetector);
// create
if (!sharedMemory->IsExisting()) {
// thisMultiDetector =
// (sharedMultiSlsDetector *)sharedMemory->CreateSharedMemory(sz);
sharedMemory->CreateSharedMemory(sz);
sharedMemory->CreateSharedMemory();
thisMultiDetector= (*sharedMemory)(); //TODO remove line
initializeDetectorStructure();
}
@ -342,7 +342,7 @@ void multiSlsDetector::initSharedMemory(bool verify) {
else {
// thisMultiDetector =
// (sharedMultiSlsDetector *)sharedMemory->OpenSharedMemory(sz);
sharedMemory->OpenSharedMemory(sz);
sharedMemory->OpenSharedMemory();
thisMultiDetector = (*sharedMemory)();
if (verify && thisMultiDetector->shmversion != MULTI_SHMVERSION) {
FILE_LOG(logERROR) << "Multi shared memory (" << detId << ") version mismatch "