detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 14:38:14 +02:00
Code Issues Actions 1 Packages Releases Activity

Merge branch 'm3' into eiger

Browse Source
This commit is contained in:
maliakal_d 2020-07-30 12:04:34 +02:00
commit b47f751d66
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt
View File

@ -25,5 +25,5 @@ vcom_adc2 704
#configure adc chip index adc index value(max 0x7F) #configure adc chip index adc index value(max 0x7F)
confadc -1 -1 0x22 confadc -1 -1 0x22
#vetoreference gain index value(max 0x3ff) #vetoreference gain index value(max 1023)
vetoref 1 0x0 vetoref 1 0

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -552,7 +552,7 @@ int readConfigFile() {
int value = 0; int value = 0;
// cannot scan values // 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, sprintf(initErrorMessage,
"Could not scan vetoref commands from on-board server " "Could not scan vetoref commands from on-board server "
"config file. Line:[%s].\n", "config file. Line:[%s].\n",
@ -1776,7 +1776,7 @@ void getInjectedChannels(int *offset, int *increment) {
} }
int setVetoReference(int gainIndex, int value) { 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)); gainIndex, value));
int values[NCHAN]; int values[NCHAN];
int gainIndices[NCHAN]; int gainIndices[NCHAN];

4
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -6455,7 +6455,7 @@ int set_veto_reference(int file_des) {
if (receiveData(file_des, args, sizeof(args), INT32) < 0) if (receiveData(file_des, args, sizeof(args), INT32) < 0)
return printSocketReadError(); return printSocketReadError();
LOG(logINFO, 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 #ifndef GOTTHARD2D
functionNotImplemented(); functionNotImplemented();
@ -6473,7 +6473,7 @@ int set_veto_reference(int file_des) {
} else if (value > ADU_MAX_VAL) { } else if (value > ADU_MAX_VAL) {
ret = FAIL; ret = FAIL;
sprintf(mess, 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", "must be 12 bit.\n",
value); value);
LOG(logERROR, (mess)); LOG(logERROR, (mess));

2
slsSupportLib/include/versionAPI.h
View File

@ -6,7 +6,7 @@
#define APIEIGER 0x200729 #define APIEIGER 0x200729
#define APICTB 0x200729 #define APICTB 0x200729
#define APIGOTTHARD 0x200729 #define APIGOTTHARD 0x200729
#define APIGOTTHARD2 0x200729
#define APIJUNGFRAU 0x200729 #define APIJUNGFRAU 0x200729
#define APIMYTHEN3 0x200729 #define APIMYTHEN3 0x200729
#define APIMOENCH 0x200729 #define APIMOENCH 0x200729
#define APIGOTTHARD2 0x200730