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

wip, setmaster

Browse Source
This commit is contained in:
maliakal_d
2022-02-23 12:26:37 +01:00
parent ef3df36e55
commit 89edf58f41
7 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -400,6 +400,7 @@ void setVirtualDefaultModuleConfigurations() {
#else
normal = 1;
#endif
#endif
}
int updateModuleConfiguration() {
@ -420,7 +421,7 @@ int getModuleConfiguration(int *m, int *t, int *n) {
#ifdef VIRTUAL
*m = master;
*t = top;
*n = nomal;
*n = normal;
#else
if (Beb_GetModuleConfiguration(&m, &t, &n) == FAIL) {
initError = FAIL;
@ -553,13 +554,13 @@ int readConfigFile() {
line);
break;
}
if (m != 0 && m != 1)) {
sprintf(initErrorMessage,
"Invalid master argument from on-board server "
"config file. Line:[%s].\n",
line);
break;
}
if (m != 0 && m != 1) {
sprintf(initErrorMessage,
"Invalid master argument from on-board server "
"config file. Line:[%s].\n",
line);
break;
}
if (setMaster(m) == FAIL) {
sprintf(initErrorMessage,
"Could not set master from config file. Line:[%s].\n",