detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-10 12:00:43 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh
2019-11-25 14:56:24 +01:00
parent 3030c262f1 6b391a34dc
commit 6889741480
3 changed files with 3 additions and 1 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.

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -363,6 +363,8 @@ void setupDetector() {
for (i = 0; i < NCHIP; ++i) {
for (j = 0; j < NCHAN; ++j) {
vetoReference[i][j] = 0;
}
for (j = 0; j < NADC; ++j) {
adcConfiguration[i][j] = 0;
}
}

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APIJUNGFRAU 0x191111
#define APIEIGER 0x191111
#define APICTB 0x191121
#define APIGOTTHARD2 0x191125
#define APIMYTHEN3 0x191125
#define APIGOTTHARD2 0x191125