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

Merge branch 'developer' into eiger

Browse Source
This commit is contained in:
maliakal_d 2020-06-15 10:36:36 +02:00
commit 6794d58db1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -33,10 +33,10 @@ int initError = OK;
int initCheckDone = 0; int initCheckDone = 0;
char initErrorMessage[MAX_STR_LENGTH]; char initErrorMessage[MAX_STR_LENGTH];
const char *dac_names[16] = {"SvP", "Vtr", "Vrf", "Vrs", const char *dac_names[16] = {"VSvP", "Vtrim", "Vrpreamp", "Vrshaper",
"SvN", "Vtgstv", "Vcmp_ll", "Vcmp_lr", "VSvN", "Vtgstv", "Vcmp_ll", "Vcmp_lr",
"cal", "Vcmp_rl", "rxb_rb", "rxb_lb", "Vcal", "Vcmp_rl", "rxb_rb", "rxb_lb",
"Vcmp_rr", "Vcp", "Vcn", "Vis"}; "Vcmp_rr", "Vcp", "Vcn", "Vishaper"};
int default_tau_from_file = -1; int default_tau_from_file = -1;
enum detectorSettings thisSettings; enum detectorSettings thisSettings;
sls_detector_module *detectorModules = NULL; sls_detector_module *detectorModules = NULL;