detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17: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/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

15
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -388,14 +388,15 @@ void initStopServer() {
return;
}
#ifdef VIRTUAL
sharedMemory_setStop(0);
#endif
// to get master from file
setupDetector();
#else
// ismaster from variable in stop server
if (readConfigFile() == FAIL ||
checkCommandLineConfiguration() == FAIL) {
initCheckDone = 1;
return;
}
#endif
}
initCheckDone = 1;
}
@ -406,8 +407,12 @@ void setupDetector() {
LOG(logINFO, ("This Server is for 1 Gotthard module (1280 channels)\n"));
#ifdef VIRTUAL
sharedMemory_setStatus(IDLE);
setupUDPCommParameters();
if (isControlServer) {
sharedMemory_setStatus(IDLE);
setupUDPCommParameters();
} else {
sharedMemory_setStop(0);
}
#endif
// Initialization

4
slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h
View File

@ -12,7 +12,11 @@
#define LINKED_SERVER_NAME "gotthardDetectorServer"
#ifdef VIRTUAL
#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)
#else
#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
#endif
/* Enums */
enum ADCINDEX { TEMP_FPGA, TEMP_ADC };