From 14c63810d65d59a4e42055fc9bf1cff7c2f5de76 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 16 Mar 2022 13:23:23 +0100 Subject: [PATCH] minor --- .../eigerDetectorServer/slsDetectorFunctionList.c | 5 ++--- .../eigerDetectorServer/slsDetectorServer_defs.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index ed1980ee7..08577cccf 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -432,7 +432,6 @@ void checkVirtual9MFlag() { #else normal = 1; #endif - LOG(logINFOBLUE, ("%s\n", (normal ? "NORMAL" : "9M"))); #endif } @@ -1490,7 +1489,7 @@ int setHighVoltage(int val) { int setMaster(enum MASTERINDEX m) { char *master_names[] = {MASTER_NAMES}; - LOG(logINFOBLUE, ("Setting up as %s\n", master_names[m])); + LOG(logINFOBLUE, ("Setting up Master flag as %s\n", master_names[m])); #ifdef VIRTUAL switch (m) { case OW_MASTER: @@ -1552,7 +1551,7 @@ int isMaster(int *retval) { int setTop(enum TOPINDEX t) { char *top_names[] = {TOP_NAMES}; - LOG(logINFOBLUE, ("Setting up as %s\n", top_names[t])); + LOG(logINFOBLUE, ("Setting up Top flag as %s\n", top_names[t])); #ifdef VIRTUAL switch (t) { case OW_TOP: diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h index 22a93f731..95a1590b1 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h @@ -81,9 +81,9 @@ enum NETWORKINDEX { TXN_LEFT, TXN_RIGHT, TXN_FRAME, FLOWCTRL_10G }; enum ROINDEX { E_PARALLEL, E_NON_PARALLEL }; enum CLKINDEX { RUN_CLK, NUM_CLOCKS }; enum TOPINDEX { TOP_HARDWARE, OW_TOP, OW_BOTTOM }; -#define TOP_NAMES "hardware_top_bottom", "top", "bottom" +#define TOP_NAMES "hardware", "top", "bottom" enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE }; -#define MASTER_NAMES "hardware_master_slave", "master", "slave" +#define MASTER_NAMES "hardware", "master", "slave" #define CLK_NAMES "run"