detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 15: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

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -31,7 +31,7 @@ slsDetector::slsDetector(detectorType type, int multiId, int id, bool verify)
* so sls shared memory will be created */
// ensure shared memory was not created before
auto shm = SharedMemory(multiId, id);
auto shm = SharedMemory<sharedSlsDetector>(multiId, id);
if (shm.IsExisting()) {
FILE_LOG(logWARNING) << "This shared memory should have been "
"deleted before! "
@ -202,7 +202,7 @@ int64_t slsDetector::getId(idMode mode) {
}
void slsDetector::freeSharedMemory(int multiId, int slsId) {
auto shm = SharedMemory(multiId, slsId);
auto shm = SharedMemory<sharedSlsDetector>(multiId, slsId);
shm.RemoveSharedMemory();
}
@ -236,7 +236,7 @@ void slsDetector::initSharedMemory(bool created, detectorType type, int multiId,
int sz = calculateSharedMemorySize(type);
// shared memory object with name
sharedMemory = new SharedMemory(multiId, detId);
sharedMemory = new SharedMemory<sharedSlsDetector>(multiId, detId);
// create
if (created) {
@ -636,7 +636,7 @@ int slsDetector::receiveModule(sls_detector_module *myMod) {
}
slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, bool verify) {
auto shm = SharedMemory(multiId, detId);
auto shm = SharedMemory<sharedSlsDetector>(multiId, detId);
if (!shm.IsExisting()) {
FILE_LOG(logERROR) << "Shared memory " << shm.GetName() << " does not exist.\n"
"Corrupted Multi Shared memory. Please free shared memory.";