detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 10:44:39 +01:00
Code Issues Actions Packages Releases Activity

jungfrau storage cell bug fix

Browse Source
This commit is contained in:
maliakal_d
2019-10-22 13:38:17 +02:00
parent f2fc187f13
commit 8c6da7da1b
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/CmdProxy.h
View File

@@ -1096,7 +1096,7 @@ class CmdProxy {
"[0-15]\n\t[Jungfrau] Storage cell that stores the first acquisition of the series. Default is 15. For advanced users only.");
TIME_COMMAND(storagecell_delay, getStorageCellDelay, setStorageCellDelay,
"[duration (0-1638375 ns)] [(optional unit) ns|us|ms|s]\n\t[Jungfrau] Additional time delay between 2 storage cells. For advanced users only. Resolution is 25 ns.");
"[duration (0-1638375 ns)] [(optional unit) ns|us|ms|s]\n\t[Jungfrau] Additional time delay between 2 consecutive exposures in burst mode (total time gap = (ET + 1 + 86) * 25ns). For advanced users only.");
/* Gotthard Specific */

10
slsDetectorSoftware/tests/test-multiSlsDetectorClient.cpp
View File

@@ -645,7 +645,7 @@ TEST_CASE("exptimel", "[.cmd][.gotthard]") {
TEST_CASE("periodl", "[.cmd][.gotthard]") {
if (test::type == slsDetectorDefs::GOTTHARD) {
if (test::type == slsDetectorDefs::GOTTHARD || test::type == slsDetectorDefs::JUNGFRAU) {
REQUIRE_NOTHROW(multiSlsDetectorClient("frames 2", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("period 5", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("start", PUT));
@@ -693,20 +693,20 @@ TEST_CASE("storagecell_delay", "[.cmd][.jungfrau]") {
if (test::type == slsDetectorDefs::JUNGFRAU) {
{
std::ostringstream oss;
multiSlsDetectorClient("storagecell_delay 2.25 ms", PUT, nullptr, oss);
REQUIRE(oss.str() == "storagecell_delay 2.25 ms\n");
multiSlsDetectorClient("storagecell_delay 1.62ms", PUT, nullptr, oss);
REQUIRE(oss.str() == "storagecell_delay 1.62ms\n");
}
{
std::ostringstream oss;
multiSlsDetectorClient("storagecell_delay", GET, nullptr, oss);
REQUIRE(oss.str() == "storagecell_delay 2.25s\n");
REQUIRE(oss.str() == "storagecell_delay 1.62ms\n");
}
{
std::ostringstream oss;
multiSlsDetectorClient("storagecell_delay 0", PUT, nullptr, oss);
REQUIRE(oss.str() == "storagecell_delay 0\n");
}
REQUIRE_THROWS(multiSlsDetectorClient("storagecell_delay 1638400 ns", PUT));
REQUIRE_THROWS(multiSlsDetectorClient("storagecell_delay 1638376ns", PUT));
} else {
REQUIRE_THROWS(multiSlsDetectorClient("storagecell_delay", GET));
}