detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
maliakal_d 2020-11-17 11:02:32 +01:00
commit 4385df18b7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -6495,8 +6495,8 @@ int get_veto_photon(int file_des) {
if (ret != FAIL) {
int nch = NCHAN;
sendData(file_des, &nch, sizeof(nch), INT32);
sendData(file_des, gainRetvals, sizeof(gainRetvals), INT32);
sendData(file_des, retvals, sizeof(retvals), INT32);
sendData(file_des, gainRetvals, sizeof(int) * NCHAN, INT32);
sendData(file_des, retvals, sizeof(int) * NCHAN, INT32);
}
if (retvals != NULL) {
free(retvals);

2
slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
View File

@ -132,7 +132,7 @@ TEST_CASE("rx_missingpackets", "[.cmd][.rx]") {
std::ostringstream oss;
proxy.Call("rx_missingpackets", {}, -1, GET, oss);
std::string s = (oss.str()).erase(0, strlen("rx_missingpackets ["));
// REQUIRE(std::stoi(s) == 0);
REQUIRE(std::stoi(s) == 0);
}
}

6
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -1233,7 +1233,7 @@ TEST_CASE("start", "[.cmd]") {
auto prev_period = det.getPeriod().tsquash("inconsistent period in test");
det.setExptime(-1, std::chrono::microseconds(200));
det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(10000);
det.setNumberOfFrames(2000);
{
std::ostringstream oss;
proxy.Call("start", {}, -1, PUT, oss);
@ -1274,7 +1274,7 @@ TEST_CASE("stop", "[.cmd]") {
auto prev_period = det.getPeriod().tsquash("inconsistent period in test");
det.setExptime(-1, std::chrono::microseconds(200));
det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(10000);
det.setNumberOfFrames(2000);
det.startDetector();
{
std::ostringstream oss;
@ -1322,7 +1322,7 @@ TEST_CASE("status", "[.cmd]") {
auto prev_period = det.getPeriod().tsquash("inconsistent period in test");
det.setExptime(-1, std::chrono::microseconds(200));
det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(10000);
det.setNumberOfFrames(2000);
det.startDetector();
{
std::ostringstream oss;