diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index a137905e7..43d181b50 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ 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 31db3a568..2b5d2c1f4 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