diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index b4c38bea7..f15523473 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -367,6 +367,9 @@ void initStopServer() { if (!isControlServer) { ComVirtual_setStop(virtual_stop); } + // temp threshold and reset event (read by stop server) + setThresholdTemperature(DEFAULT_TMP_THRSHLD); + setTemperatureEvent(0); #endif } diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 3972d121c..794232b1a 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -815,7 +815,7 @@ void Module::setPartialFramesPadding(bool padding) { } int64_t Module::getReceiverUDPSocketBufferSize() const { - int arg = -1; + int64_t arg = -1; return sendToReceiver(F_RECEIVER_UDP_SOCK_BUF_SIZE, arg); } diff --git a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp index f9975b2f5..e41bea6b4 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp @@ -523,27 +523,6 @@ TEST_CASE("overflow", "[.cmd][.new]") { } } -TEST_CASE("storeinram", "[.cmd][.new]") { - Detector det; - CmdProxy proxy(&det); - auto det_type = det.getDetectorType().squash(); - if (det_type == defs::EIGER) { - auto previous = det.getStoreInRamMode(); - std::ostringstream oss1, oss2, oss3; - proxy.Call("storeinram", {"1"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "storeinram 1\n"); - proxy.Call("storeinram", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "storeinram 1\n"); - proxy.Call("storeinram", {"0"}, -1, PUT, oss3); - REQUIRE(oss3.str() == "storeinram 0\n"); - for (int i = 0; i != det.size(); ++i) { - det.setStoreInRamMode(previous[i], {i}); - } - } else { - REQUIRE_THROWS(proxy.Call("storeinram", {}, -1, GET)); - } -} - TEST_CASE("flippeddatax", "[.cmd][.new]") { Detector det; CmdProxy proxy(&det);