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

fixed stop server not starting up with setup variables (#949)

Browse Source 
* m3: fixed stop server not starting up with setup variables

* all servers except eiger fixed for virtual stop server to start up with setupDetector function called

* virtual tests work

* eiger: versions print neednt be in stop server

* jungfrau: stop server (not virtual) also needs to read config file

* ensuring master is setup for virtual and real servers
This commit is contained in:
maliakal_d
2024-09-10 15:24:51 +02:00
committed by GitHub
parent 38d7fb0c38
commit c6477e0ed6
22 changed files with 173 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

14
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -396,11 +396,7 @@ void initStopServer() {
return;
}
#ifdef VIRTUAL
sharedMemory_setStop(0);
if (checkCommandLineConfiguration() == FAIL) {
initCheckDone = 1;
return;
}
setupDetector();
#endif
}
initCheckDone = 1;
@ -466,8 +462,12 @@ void setupDetector() {
clkPhase[i] = 0;
}
#ifdef VIRTUAL
sharedMemory_setStatus(IDLE);
setupUDPCommParameters();
if (isControlServer) {
sharedMemory_setStatus(IDLE);
setupUDPCommParameters();
} else {
sharedMemory_setStop(0);
}
#endif
// pll defines