merge fix

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -1503,7 +1503,7 @@ int set_module(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
 
-#if !(defined(MYTHEN3D) && defined(EIGERD))
+#if !(defined(MYTHEN3D) || defined(EIGERD))
     functionNotImplemented();
 #else
 

slsDetectorSoftware/src/DetectorImpl.cpp

@@ -75,8 +75,8 @@ void DetectorImpl::freeSharedMemory(int detectorIndex, int detPos) {
 
 void DetectorImpl::freeSharedMemory() {
     zmqSocket.clear();
-    for (auto &d : modules) {
+    for (auto &module : modules) {
-        d->freeSharedMemory();
+        module->freeSharedMemory();
     }
     modules.clear();
 
@@ -92,8 +92,9 @@ std::string DetectorImpl::getUserDetails() {
 
     std::ostringstream sstream;
     sstream << "\nHostname: ";
-    for (auto &d : modules) {
+    for (auto &module : modules) {
-        sstream << (d->isFixedPatternSharedMemoryCompatible() ? d->getHostname()
+        sstream << (module->isFixedPatternSharedMemoryCompatible()
+                        ? module->getHostname()
                         : "Unknown")
                 << "+";
     }
@@ -104,9 +105,9 @@ std::string DetectorImpl::getUserDetails() {
     }
     // get type from module shm
     else {
-        for (auto &d : modules) {
+        for (auto &module : modules) {
-            sstream << (d->isFixedPatternSharedMemoryCompatible()
+            sstream << (module->isFixedPatternSharedMemoryCompatible()
-                            ? ToString(d->getDetectorType())
+                            ? ToString(module->getDetectorType())
                             : "Unknown")
                     << "+";
         }
@@ -255,8 +256,8 @@ void DetectorImpl::addModule(const std::string &hostname) {
     }
 
     if (host != "localhost") {
-        for (auto &d : modules) {
+        for (auto &module : modules) {
-            if (d->getHostname() == host) {
+            if (module->getHostname() == host) {
                 LOG(logWARNING)
                     << "Module " << host << "already part of the Detector!"
                     << std::endl
@@ -331,8 +332,8 @@ void DetectorImpl::updateDetectorSize() {
                   << "\n\tNumber of Channels in Y direction:"
                   << shm()->numberOfChannels.y;
 
-    for (auto &d : modules) {
+    for (auto &module : modules) {
-        d->updateNumberOfModule(shm()->numberOfModule);
+        module->updateNumberOfModule(shm()->numberOfModule);
     }
 }
 

slsDetectorSoftware/tests/test-Module.cpp

@@ -29,7 +29,7 @@ TEST_CASE("Is shm fixed pattern shm compatible") {
     REQUIRE(m.isFixedPatternSharedMemoryCompatible() == true);
 
     // Set shm version to 0
-    sls::SharedMemory<sls::sharedSlsDetector> shm(0, 0);
+    sls::SharedMemory<sls::sharedModule> shm(0, 0);
     REQUIRE(shm.IsExisting() == true);
     shm.OpenSharedMemory();
     shm()->shmversion = 0;

slsSupportLib/include/sls/versionAPI.h

@@ -3,11 +3,11 @@
 #define APILIB 0x210831
 #define APIRECEIVER 0x210831
 #define APIGUI 0x210819
-
+#define APICTB 0x210917
-#define APIEIGER 0x210916
+#define APIGOTTHARD 0x210917
-#define APICTB 0x210916
+#define APIGOTTHARD2 0x210917
-#define APIGOTTHARD 0x210916
+#define APIMYTHEN3 0x210917
-#define APIGOTTHARD2 0x210916
-#define APIMYTHEN3 0x210916
 #define APIMOENCH 0x210916
+#define APIEIGER 0x210917
+
 #define APIJUNGFRAU 0x210917