From 22bcac4c0ba01afd325e9200410317a34efb468a Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 15 Jun 2021 14:59:50 +0200 Subject: [PATCH] gotthard stop server should also know if there is a master for ismaster() to work --- .../gotthardDetectorServer/slsDetectorFunctionList.c | 2 ++ slsDetectorSoftware/include/sls/Detector.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index fe3d7cf8e..db55c29e1 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -364,6 +364,8 @@ void initStopServer() { #ifdef VIRTUAL sharedMemory_setStop(0); #endif + // to get master from file + readConfigFile(); } /* set up detector */ diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h index bd9211881..1a1b5852d 100644 --- a/slsDetectorSoftware/include/sls/Detector.h +++ b/slsDetectorSoftware/include/sls/Detector.h @@ -1310,7 +1310,7 @@ class Detector { * (internal gating). Gate index: 0-2, -1 for all */ Result> getGateDelayForAllGates(Positions pos = {}) const; - /** [Eiger][Mythen3][Gotthard1] **/ + /** [Eiger][Mythen3][Gotthard1] via stop server **/ Result getMaster(Positions pos = {}) const; // TODO! check if we really want to expose this !!!!!