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

removed minor commented lines

Browse Source
This commit is contained in:
maliakal_d
2019-03-13 15:19:32 +01:00
parent 2dcef909ca
commit f8aa0e3d6d
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -244,7 +244,7 @@ void multiSlsDetector::freeSharedMemory(int multiId, int detPos) {
return; return;
} }
// multi // multi - get number of detectors from shm
SharedMemory<sharedMultiSlsDetector> multiShm(multiId, -1); SharedMemory<sharedMultiSlsDetector> multiShm(multiId, -1);
int numDetectors = 0; int numDetectors = 0;
@ -276,7 +276,7 @@ void multiSlsDetector::freeSharedMemory(int detPos) {
detectors.clear(); detectors.clear();
// clear multi detector shm // clear multi detector shm
sharedMemory.RemoveSharedMemory(); //TODO verify use sharedMemory.RemoveSharedMemory();
client_downstream = false; client_downstream = false;
} }

1
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -12,7 +12,6 @@
#include "logger.h" #include "logger.h"
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
class slsDetector; class slsDetector;
// class SharedMemory;
class ZmqSocket; class ZmqSocket;
class detectorData; class detectorData;

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -240,13 +240,11 @@ void slsDetector::initSharedMemory(bool created, detectorType type, int multiId,
// create // create
if (created) { if (created) {
// thisDetector = (sharedSlsDetector *)sharedMemory->CreateSharedMemory(sz);
sharedMemory->CreateSharedMemory(sz); sharedMemory->CreateSharedMemory(sz);
thisDetector = (*sharedMemory)(); thisDetector = (*sharedMemory)();
} }
// open and verify version // open and verify version
else { else {
// thisDetector = (sharedSlsDetector *)sharedMemory->OpenSharedMemory(sz);
sharedMemory->OpenSharedMemory(sz); sharedMemory->OpenSharedMemory(sz);
thisDetector = (*sharedMemory)(); thisDetector = (*sharedMemory)();
if (verify && thisDetector->shmversion != SLS_SHMVERSION) { if (verify && thisDetector->shmversion != SLS_SHMVERSION) {
@ -648,7 +646,6 @@ slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, b
} }
// open, map, verify version // open, map, verify version
// auto sdet = (sharedSlsDetector *)shm.OpenSharedMemory(sz);
shm.OpenSharedMemory(); shm.OpenSharedMemory();
auto sdet = shm(); auto sdet = shm();
if (verify && sdet->shmversion != SLS_SHMVERSION) { if (verify && sdet->shmversion != SLS_SHMVERSION) {

1
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -19,7 +19,6 @@ class ClientInterface;
#include <cmath> #include <cmath>
class multiSlsDetector; class multiSlsDetector;
// class SharedMemory;
class ServerInterface; class ServerInterface;
class MySocketTCP; class MySocketTCP;