detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 03:22:05 +01:00
Code Issues Actions Packages Releases Activity

gotthard2: vetoref taken as decimal and not hex in server

Browse Source
This commit is contained in:
maliakal_d
2020-07-30 12:03:36 +02:00
parent e9c03c6eaf
commit 6f5635a402
5 changed files with 7 additions and 7 deletions
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)
confadc -1 -1 0x22
#vetoreference gain index value(max 0x3ff)
vetoref 1 0x0
#vetoreference gain index value(max 1023)
vetoref 1 0

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@@ -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];