From aeb3e222c6628843944ef2be68188c9e2b47c073 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 30 Aug 2022 15:31:38 +0200
Subject: [PATCH] format

---
 .../src/slsDetectorServer_funcs.c             | 74 +++++++++----------
 slsSupportLib/include/sls/ZmqSocket.h         |  6 +-
 slsSupportLib/include/sls/versionAPI.h        |  6 +-
 3 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
index 5dd6fd637..06bfcec36 100644
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
@@ -1882,57 +1882,55 @@ int acquire(int blocking, int file_des) {
 #ifdef EIGERD
             // check for hardware mac and hardware ip
             if (udpDetails[0].srcmac != getDetectorMAC()) {
-                ret = FAIL;
-                uint64_t sourcemac = getDetectorMAC();
-                char src_mac[MAC_ADDRESS_SIZE];
-                getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
-                sprintf(
-                    mess,
+            ret = FAIL;
+            uint64_t sourcemac = getDetectorMAC();
+            char src_mac[MAC_ADDRESS_SIZE];
+            getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
+            sprintf(mess,
                     "Invalid udp source mac address for this detector. Must be "
                     "same as hardware detector mac address %s\n",
                     src_mac);
-                LOG(logERROR, (mess));
-            } else if (!enableTenGigabitEthernet(GET_FLAG) &&
-                       (udpDetails[0].srcip != getDetectorIP())) {
-                ret = FAIL;
-                uint32_t sourceip = getDetectorIP();
-                char src_ip[INET_ADDRSTRLEN];
-                getIpAddressinString(src_ip, sourceip);
-                sprintf(
-                    mess,
+            LOG(logERROR, (mess));
+        } else if (!enableTenGigabitEthernet(GET_FLAG) &&
+                   (udpDetails[0].srcip != getDetectorIP())) {
+            ret = FAIL;
+            uint32_t sourceip = getDetectorIP();
+            char src_ip[INET_ADDRSTRLEN];
+            getIpAddressinString(src_ip, sourceip);
+            sprintf(mess,
                     "Invalid udp source ip address for this detector. Must be "
                     "same "
                     "as hardware detector ip address %s in 1G readout mode \n",
                     src_ip);
-                LOG(logERROR, (mess));
-            } else
+            LOG(logERROR, (mess));
+        } else
 #endif
-                if (configured == FAIL) {
+            if (configured == FAIL) {
+            ret = FAIL;
+            strcpy(mess, "Could not start acquisition because ");
+            strcat(mess, configureMessage);
+            LOG(logERROR, (mess));
+        } else if (sharedMemory_getScanStatus() == RUNNING) {
+            ret = FAIL;
+            strcpy(mess, "Could not start acquisition because a scan is "
+                         "already running!\n");
+            LOG(logERROR, (mess));
+        } else {
+            memset(scanErrMessage, 0, MAX_STR_LENGTH);
+            sharedMemory_setScanStop(0);
+            sharedMemory_setScanStatus(IDLE); // if it was error
+            if (pthread_create(&pthread_tid, NULL, &start_state_machine,
+                               &blocking)) {
                 ret = FAIL;
-                strcpy(mess, "Could not start acquisition because ");
-                strcat(mess, configureMessage);
-                LOG(logERROR, (mess));
-            } else if (sharedMemory_getScanStatus() == RUNNING) {
-                ret = FAIL;
-                strcpy(mess, "Could not start acquisition because a scan is "
-                             "already running!\n");
+                strcpy(mess, "Could not start acquisition thread!\n");
                 LOG(logERROR, (mess));
             } else {
-                memset(scanErrMessage, 0, MAX_STR_LENGTH);
-                sharedMemory_setScanStop(0);
-                sharedMemory_setScanStatus(IDLE); // if it was error
-                if (pthread_create(&pthread_tid, NULL, &start_state_machine,
-                                   &blocking)) {
-                    ret = FAIL;
-                    strcpy(mess, "Could not start acquisition thread!\n");
-                    LOG(logERROR, (mess));
-                } else {
-                    // only does not wait for non blocking and scan
-                    if (blocking || !scan) {
-                        pthread_join(pthread_tid, NULL);
-                    }
+                // only does not wait for non blocking and scan
+                if (blocking || !scan) {
+                    pthread_join(pthread_tid, NULL);
                 }
             }
+        }
     }
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
diff --git a/slsSupportLib/include/sls/ZmqSocket.h b/slsSupportLib/include/sls/ZmqSocket.h
index 30ef1e89c..9bf3afdbf 100644
--- a/slsSupportLib/include/sls/ZmqSocket.h
+++ b/slsSupportLib/include/sls/ZmqSocket.h
@@ -15,10 +15,10 @@
 #include <map>
 #include <memory>
 
-// Selective suppression of  warning in gcc, 
+// Selective suppression of  warning in gcc,
 // showed up in gcc 12 and at the moment
-// no upgrade is available to rapidjson 
-#pragma GCC diagnostic push 
+// no upgrade is available to rapidjson
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidjson/document.h> //json header in zmq stream
 #pragma GCC diagnostic pop
diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
index 371f75b14..4d90571c5 100644
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -9,6 +9,6 @@
 #define APIEIGER     0x220816
 #define APIJUNGFRAU  0x220816
 #define APIGOTTHARD2 0x220818
-#define APIMYTHEN3 0x220822
-#define APICTB 0x220825
-#define APIMOENCH 0x220825
+#define APIMYTHEN3   0x220822
+#define APICTB       0x220825
+#define APIMOENCH    0x220825