detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 06:50:02 +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:
Erik Frojdh 2020-01-13 16:13:52 +01:00
commit a1abd7587c
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -674,7 +674,7 @@ int setSubExpTime(int64_t val) {
int64_t subdeadtime = eiger_virtual_subperiod * 10 - int64_t subdeadtime = eiger_virtual_subperiod * 10 -
eiger_virtual_subexptime * 10; eiger_virtual_subexptime * 10;
eiger_virtual_subexptime = (val / (10)); eiger_virtual_subexptime = (val / (10));
eiger_virtual_subperiod = (val + subdeadtime/10); eiger_virtual_subperiod = (val + subdeadtime) /10;
#endif #endif
return OK; return OK;
} }

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

@ -24,15 +24,15 @@ TEST_CASE("Eiger transmission delay", "[.cmd]") {
SECTION("txndelay_frame") { SECTION("txndelay_frame") {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("txndelay_frame", {"5000"}, -1, PUT, oss1); proxy.Call("txndelay_frame", {"5000"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "txndealy_frame 5000\n"); REQUIRE(oss1.str() == "txndelay_frame 5000\n");
proxy.Call("txndelay_frame", {}, -1, GET, oss2); proxy.Call("txndelay_frame", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "txndealy_frame 5000\n"); REQUIRE(oss2.str() == "txndelay_frame 5000\n");
} }
SECTION("txndelay_left") { SECTION("txndelay_left") {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("txndelay_left", {"5000"}, -1, PUT, oss1); proxy.Call("txndelay_left", {"5000"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "txndelay_left 5000\n"); REQUIRE(oss1.str() == "txndelay_left 5000\n");
proxy.Call("txndelay_frame", {}, -1, GET, oss2); proxy.Call("txndelay_left", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "txndelay_left 5000\n"); REQUIRE(oss2.str() == "txndelay_left 5000\n");
} }
SECTION("txndelay_right") { SECTION("txndelay_right") {
@ -269,7 +269,7 @@ TEST_CASE("quad", "[.cmd]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type == defs::EIGER && det.size() == 1) { if (det_type == defs::EIGER) {
// Quad only works with a single half module EIGER // Quad only works with a single half module EIGER
std::ostringstream oss; std::ostringstream oss;
proxy.Call("quad", {}, -1, GET, oss); proxy.Call("quad", {}, -1, GET, oss);

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

@ -250,12 +250,12 @@ TEST_CASE("rx_udpsocksize", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("rx_udpsocksize", {"4857600"}, -1, PUT, oss); proxy.Call("rx_udpsocksize", {"4857600"}, -1, PUT, oss);
REQUIRE(oss.str() == "rx_udpsocksize 4857600\n"); REQUIRE(oss.str() >= "rx_udpsocksize 4857600\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("rx_udpsocksize", {}, -1, GET, oss); proxy.Call("rx_udpsocksize", {}, -1, GET, oss);
REQUIRE(oss.str() == "rx_udpsocksize 4857600\n"); REQUIRE(oss.str() >= "rx_udpsocksize 4857600\n");
} }
} }
@ -275,7 +275,7 @@ TEST_CASE("rx_realudpsocksize", "[.cmd]") {
proxy.Call("rx_realudpsocksize", {}, -1, GET, oss); proxy.Call("rx_realudpsocksize", {}, -1, GET, oss);
std::string s = (oss.str()).erase(0, strlen("rx_realudpsocksize ")); std::string s = (oss.str()).erase(0, strlen("rx_realudpsocksize "));
uint64_t rval = std::stol(s); uint64_t rval = std::stol(s);
REQUIRE(rval == val * 2); REQUIRE(rval >= val * 2);
} }
} }

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

@ -3020,7 +3020,7 @@ TEST_CASE("zmqport", "[.cmd]") {
int socketsperdetector = 1; int socketsperdetector = 1;
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
int prev; int prev = 1;
if (det_type == slsDetectorDefs::EIGER) { if (det_type == slsDetectorDefs::EIGER) {
socketsperdetector *= 2; socketsperdetector *= 2;
} else if (det_type == slsDetectorDefs::JUNGFRAU) { } else if (det_type == slsDetectorDefs::JUNGFRAU) {

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APIGOTTHARD 0x191127 #define APIGOTTHARD 0x191127
#define APIJUNGFRAU 0x191127 #define APIJUNGFRAU 0x191127
#define APICTB 0x191210 #define APICTB 0x191210
#define APIEIGER 0x191210
#define APIMYTHEN3 0x191210 #define APIMYTHEN3 0x191210
#define APIEIGER 0x200110