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

This commit is contained in:
maliakal_d 2021-06-15 15:00:25 +02:00
commit b740cb7312
2 changed files with 3 additions and 1 deletions

View File

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

View File

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