From 261ac78743190cd67c0b0e007edba3cf303d24ca Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 28 Feb 2022 14:49:02 +0100
Subject: [PATCH] wip

---
 .../eigerDetectorServer/slsDetectorFunctionList.c              | 3 ++-
 .../gotthard2DetectorServer/slsDetectorFunctionList.c          | 1 +
 .../slsDetectorServer/include/slsDetectorFunctionList.h        | 2 +-
 slsDetectorSoftware/src/CmdProxy.h                             | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
index 18a85ef3c..40b55134f 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
@@ -1519,6 +1519,7 @@ int setMaster(enum MASTERINDEX m) {
     // feb variable and hv comms (9m)
     sharedMemory_lockLocalLink();
     if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) {
+        sharedMemory_unlockLocalLink();
         return FAIL;
     }
     sharedMemory_unlockLocalLink();
@@ -1541,7 +1542,7 @@ int isMaster(int *retval) {
     return OK;
 }
 
-int setTop(int t) {
+int setTop(enum TOPINDEX  t) {
     char *top_names[] = {TOP_NAMES};
     LOG(logINFOBLUE, ("Setting up as %s\n", top_names[t]));
 #ifdef VIRTUAL
diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
index cce6330a6..f6e4a4d94 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
@@ -388,6 +388,7 @@ void initStopServer() {
         }
 #ifdef VIRTUAL
         sharedMemory_setStop(0);
+        // not reading config file (nothing of interest to stop server)
         if (checkCommandLineConfiguration() == FAIL) {
             initCheckDone = 1;
             return;
diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
index 7d7ac21f9..9a94888e2 100644
--- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
+++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
@@ -375,7 +375,7 @@ int setHighVoltage(int val);
 // parameters - timing, extsig
 #ifdef EIGERD
 int setMaster(enum MASTERINDEX m);
-int setTop(int t);
+int setTop(enum TOPINDEX  t);
 int isTop(int *retval);
 #endif
 #if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) ||              \
diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h
index b7037092c..6bbd6efd6 100644
--- a/slsDetectorSoftware/src/CmdProxy.h
+++ b/slsDetectorSoftware/src/CmdProxy.h
@@ -1285,7 +1285,7 @@ class CmdProxy {
     INTEGER_COMMAND_VEC_ID_GET(
         master, getMaster, setMaster, StringTo<int>,
         "[0, 1]\n\t[Eiger] Sets half module to master and "
-        "others to slaves.\n\t\t [Gotthard][Mythen3][Eiger] "
+        "others to slaves.\n\t\t [Gotthard][Gotthard2][Mythen3][Eiger] "
         "Gets if the current module/ half module is master.");
 
     /* acquisition parameters */