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

fix

Browse Source
This commit is contained in:
maliakal_d
2020-06-18 14:48:20 +02:00
parent 8adddfb083
commit e7da4ae862
3 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -367,6 +367,9 @@ void initStopServer() {
if (!isControlServer) { if (!isControlServer) {
ComVirtual_setStop(virtual_stop); ComVirtual_setStop(virtual_stop);
} }
// temp threshold and reset event (read by stop server)
setThresholdTemperature(DEFAULT_TMP_THRSHLD);
setTemperatureEvent(0);
#endif #endif
} }

2
slsDetectorSoftware/src/Module.cpp
View File

@ -815,7 +815,7 @@ void Module::setPartialFramesPadding(bool padding) {
} }
int64_t Module::getReceiverUDPSocketBufferSize() const { int64_t Module::getReceiverUDPSocketBufferSize() const {
int arg = -1; int64_t arg = -1;
return sendToReceiver<int64_t>(F_RECEIVER_UDP_SOCK_BUF_SIZE, arg); return sendToReceiver<int64_t>(F_RECEIVER_UDP_SOCK_BUF_SIZE, arg);
} }

21
slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
View File

@ -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]") { TEST_CASE("flippeddatax", "[.cmd][.new]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);