From 48e4cec56ff7772793f83927ef7cb677e9b08dab Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Tue, 12 Mar 2019 11:52:13 +0100
Subject: [PATCH] minor

---
 .../multiSlsDetector/multiSlsDetector.h        |  2 --
 .../tests/test-SharedMemory.cpp                | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 21d6b0dd9..0894daa8a 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -1968,8 +1968,6 @@ class multiSlsDetector : public virtual slsDetectorDefs,
     /** Shared Memory object */
     SharedMemory<sharedMultiSlsDetector> sharedMemory{0,-1};
 
-    /** Shared memory structure */
-    sharedMultiSlsDetector *thisMultiDetector {nullptr};
 
     /** pointers to the slsDetector structures */
     std::vector<std::unique_ptr<slsDetector>> detectors;
diff --git a/slsDetectorSoftware/tests/test-SharedMemory.cpp b/slsDetectorSoftware/tests/test-SharedMemory.cpp
index 8231070a9..28c943a81 100644
--- a/slsDetectorSoftware/tests/test-SharedMemory.cpp
+++ b/slsDetectorSoftware/tests/test-SharedMemory.cpp
@@ -25,14 +25,17 @@ TEST_CASE("Create SharedMemory read and write") {
 
     shm.UnmapSharedMemory();
     shm.RemoveSharedMemory();
+
+    CHECK(shm.IsExisting() == false);
 }
 
 TEST_CASE("Open existing SharedMemory and read") {
-
-    SharedMemory<double> shm(0, -1);
-    shm.CreateSharedMemory();
-    *shm() = 5.3;
-    shm.UnmapSharedMemory();
+    
+    {
+        SharedMemory<double> shm(0, -1);
+        shm.CreateSharedMemory();
+        *shm() = 5.3;
+    }
 
     SharedMemory<double> shm2(0, -1);
     shm2.OpenSharedMemory();
@@ -41,7 +44,7 @@ TEST_CASE("Open existing SharedMemory and read") {
     shm2.RemoveSharedMemory();
 }
 
-TEST_CASE("Two shared memories with the same name throws") {
+TEST_CASE("Creating a second shared memory with the same name throws") {
 
     SharedMemory<double> shm0(0, -1);
     SharedMemory<double> shm1(0, -1);
@@ -69,8 +72,7 @@ TEST_CASE("Open two shared memories to the same place") {
     shm2()->x = 7;
     CHECK(shm()->x == 7);
 
-
-    //Remove only needs to be done once since they refer 
+    //Remove only needs to be done once since they refer
     //to the same memory
     shm2.RemoveSharedMemory();
     CHECK(shm.IsExisting() == false);