From 6f5635a4027e3a5ca4c68c65bcc186dd9309bb84 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 30 Jul 2020 12:03:36 +0200 Subject: [PATCH] gotthard2: vetoref taken as decimal and not hex in server --- .../bin/gotthard2DetectorServer_developer | Bin 211324 -> 211324 bytes .../config_gotthard2.txt | 4 ++-- .../slsDetectorFunctionList.c | 4 ++-- .../src/slsDetectorServer_funcs.c | 4 ++-- slsSupportLib/include/versionAPI.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index a137905e768930233405caf601b1fa73fbe25563..43d181b50e7d4f29341aa5f1c9425daf95f1e881 100755 GIT binary patch delta 12939 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 f%5W{mXi)OhP diff --git a/slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt b/slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt index 47f4ea11e..610c5cdf2 100755 --- a/slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt +++ b/slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt @@ -25,5 +25,5 @@ vcom_adc2 704 #configure adc chip index adc index value(max 0x7F) confadc -1 -1 0x22 -#vetoreference gain index value(max 0x3ff) -vetoref 1 0x0 +#vetoreference gain index value(max 1023) +vetoref 1 0 diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 847793600..4c1003eab 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -552,7 +552,7 @@ int readConfigFile() { int value = 0; // cannot scan values - if (sscanf(line, "%s %d 0x%x", command, &igain, &value) != 3) { + if (sscanf(line, "%s %d %d", command, &igain, &value) != 3) { sprintf(initErrorMessage, "Could not scan vetoref commands from on-board server " "config file. Line:[%s].\n", @@ -1776,7 +1776,7 @@ void getInjectedChannels(int *offset, int *increment) { } int setVetoReference(int gainIndex, int value) { - LOG(logINFO, ("Setting veto reference [chip:-1, G%d, value:0x%x]\n", + LOG(logINFO, ("Setting veto reference [chip:-1, G%d, value:%d]\n", gainIndex, value)); int values[NCHAN]; int gainIndices[NCHAN]; diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 69e647f2a..9a001c9a9 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -6455,7 +6455,7 @@ int set_veto_reference(int file_des) { if (receiveData(file_des, args, sizeof(args), INT32) < 0) return printSocketReadError(); LOG(logINFO, - ("Setting Veto Reference: [G%d, value:0x%x]\n", args[0], args[1])); + ("Setting Veto Reference: [G%d, value:%d]\n", args[0], args[1])); #ifndef GOTTHARD2D functionNotImplemented(); @@ -6473,7 +6473,7 @@ int set_veto_reference(int file_des) { } else if (value > ADU_MAX_VAL) { ret = FAIL; sprintf(mess, - "Could not set veto reference. Invalid ADU value 0x%x, " + "Could not set veto reference. Invalid ADU value %d, " "must be 12 bit.\n", value); LOG(logERROR, (mess)); diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index dba8d9df5..3e77510cb 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -6,7 +6,7 @@ #define APIEIGER 0x200729 #define APICTB 0x200729 #define APIGOTTHARD 0x200729 -#define APIGOTTHARD2 0x200729 #define APIJUNGFRAU 0x200729 #define APIMYTHEN3 0x200729 #define APIMOENCH 0x200729 +#define APIGOTTHARD2 0x200730