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

Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq

Browse Source
This commit is contained in:
maliakal_d
2021-06-15 15:00:25 +02:00
parent bfdd62253a 22bcac4c0b
commit b740cb7312
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -364,6 +364,8 @@ void initStopServer() {
#ifdef VIRTUAL #ifdef VIRTUAL
sharedMemory_setStop(0); sharedMemory_setStop(0);
#endif #endif
// to get master from file
readConfigFile();
} }
/* set up detector */ /* set up detector */

2
slsDetectorSoftware/include/sls/Detector.h
View File

@ -1310,7 +1310,7 @@ class Detector {
* (internal gating). Gate index: 0-2, -1 for all */ * (internal gating). Gate index: 0-2, -1 for all */
Result<std::array<ns, 3>> getGateDelayForAllGates(Positions pos = {}) const; Result<std::array<ns, 3>> getGateDelayForAllGates(Positions pos = {}) const;
/** [Eiger][Mythen3][Gotthard1] **/ /** [Eiger][Mythen3][Gotthard1] via stop server **/
Result<bool> getMaster(Positions pos = {}) const; Result<bool> getMaster(Positions pos = {}) const;
// TODO! check if we really want to expose this !!!!! // TODO! check if we really want to expose this !!!!!