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

merge fixed

Browse Source
This commit is contained in:
maliakal_d
2022-02-23 09:23:00 +01:00
parent daa536077d 2034362eca
commit 543eb7bb60
18 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@@ -67,7 +67,13 @@ int defaultDacValues[NDAC] = DEFAULT_DAC_VALS;
int vLimit = 0;
enum detectorSettings thisSettings = UNINITIALIZED;
int highvoltage = 0;
// getNumberofchannels return 0 for y in --update mode (virtual servers)
#ifdef VIRTUAL
int nSamples = DEFAULT_NUM_SAMPLES;
#else
int nSamples = 1;
#endif
int detPos[2] = {0, 0};
int isInitCheckDone() { return initCheckDone; }