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

wip

Browse Source
This commit is contained in:
maliakal_d 2022-02-28 14:49:02 +01:00
parent 0437bd0584
commit 261ac78743
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1519,6 +1519,7 @@ int setMaster(enum MASTERINDEX m) {
// feb variable and hv comms (9m) // feb variable and hv comms (9m)
sharedMemory_lockLocalLink(); sharedMemory_lockLocalLink();
if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) { if (Feb_Control_SetMasterEffects(master, isControlServer) == FAIL) {
sharedMemory_unlockLocalLink();
return FAIL; return FAIL;
} }
sharedMemory_unlockLocalLink(); sharedMemory_unlockLocalLink();
@ -1541,7 +1542,7 @@ int isMaster(int *retval) {
return OK; return OK;
} }
int setTop(int t) { int setTop(enum TOPINDEX t) {
char *top_names[] = {TOP_NAMES}; char *top_names[] = {TOP_NAMES};
LOG(logINFOBLUE, ("Setting up as %s\n", top_names[t])); LOG(logINFOBLUE, ("Setting up as %s\n", top_names[t]));
#ifdef VIRTUAL #ifdef VIRTUAL

1
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -388,6 +388,7 @@ void initStopServer() {
} }
#ifdef VIRTUAL #ifdef VIRTUAL
sharedMemory_setStop(0); sharedMemory_setStop(0);
// not reading config file (nothing of interest to stop server)
if (checkCommandLineConfiguration() == FAIL) { if (checkCommandLineConfiguration() == FAIL) {
initCheckDone = 1; initCheckDone = 1;
return; return;

2
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -375,7 +375,7 @@ int setHighVoltage(int val);
// parameters - timing, extsig // parameters - timing, extsig
#ifdef EIGERD #ifdef EIGERD
int setMaster(enum MASTERINDEX m); int setMaster(enum MASTERINDEX m);
int setTop(int t); int setTop(enum TOPINDEX t);
int isTop(int *retval); int isTop(int *retval);
#endif #endif
#if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) || \ #if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) || \

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1285,7 +1285,7 @@ class CmdProxy {
INTEGER_COMMAND_VEC_ID_GET( INTEGER_COMMAND_VEC_ID_GET(
master, getMaster, setMaster, StringTo<int>, master, getMaster, setMaster, StringTo<int>,
"[0, 1]\n\t[Eiger] Sets half module to master and " "[0, 1]\n\t[Eiger] Sets half module to master and "
"others to slaves.\n\t\t [Gotthard][Mythen3][Eiger] " "others to slaves.\n\t\t [Gotthard][Gotthard2][Mythen3][Eiger] "
"Gets if the current module/ half module is master."); "Gets if the current module/ half module is master.");
/* acquisition parameters */ /* acquisition parameters */