detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d 2019-10-29 10:44:10 +01:00
parent 9b7ef84515
commit 828859838b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/CmdProxy.h
View File

@ -1582,7 +1582,7 @@ class CmdProxy {
"\n\tClient IP Address that last communicated with the detector."); "\n\tClient IP Address that last communicated with the detector.");
GET_COMMAND(nframes, getNumberOfFramesFromStart, GET_COMMAND(nframes, getNumberOfFramesFromStart,
"\n\t[Gotthard][Jungfrau][CTB] Number of frames from start run control."); "\n\t[Jungfrau][CTB] Number of frames from start run control.");
TIME_GET_COMMAND(now, getActualTime, TIME_GET_COMMAND(now, getActualTime,
"[(optional unit) ns|us|ms|s]\n\t[Jungfrau][CTB] Time from detector start up."); "[(optional unit) ns|us|ms|s]\n\t[Jungfrau][CTB] Time from detector start up.");

2
slsDetectorSoftware/include/Detector.h
View File

@ -1218,7 +1218,7 @@ class Detector {
/** Execute a command on the detector server console */ /** Execute a command on the detector server console */
void executeCommand(const std::string &value, Positions pos = {}); void executeCommand(const std::string &value, Positions pos = {});
/** [Gotthard][Jungfrau][CTB] */ /** [Jungfrau][CTB] */
Result<int64_t> getNumberOfFramesFromStart(Positions pos = {}) const; Result<int64_t> getNumberOfFramesFromStart(Positions pos = {}) const;
/** [Jungfrau][CTB] Get time from detector start */ /** [Jungfrau][CTB] Get time from detector start */

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

@ -1084,7 +1084,7 @@ TEST_CASE("timestamp", "[.cmd]") {
} }
TEST_CASE("nframes", "[.cmd]") { TEST_CASE("nframes", "[.cmd]") {
if (test::type == slsDetectorDefs::JUNGFRAU || test::type == slsDetectorDefs::CHIPTESTBOARD || test::type == slsDetectorDefs::GOTTHARD) { if (test::type == slsDetectorDefs::JUNGFRAU || test::type == slsDetectorDefs::CHIPTESTBOARD) {
REQUIRE_NOTHROW(multiSlsDetectorClient("nframes", GET)); REQUIRE_NOTHROW(multiSlsDetectorClient("nframes", GET));
} else { } else {
REQUIRE_THROWS(multiSlsDetectorClient("nframes", GET)); REQUIRE_THROWS(multiSlsDetectorClient("nframes", GET));
@ -3698,6 +3698,7 @@ TEST_CASE("settings", "[.cmd]") {
REQUIRE_THROWS(multiSlsDetectorClient("settings mediumgain", PUT)); REQUIRE_THROWS(multiSlsDetectorClient("settings mediumgain", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("settings standard", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings standard", PUT));
break; break;
case slsDetectorDefs::JUNGFRAU: case slsDetectorDefs::JUNGFRAU:
REQUIRE_THROWS(multiSlsDetectorClient("settings standard", PUT)); REQUIRE_THROWS(multiSlsDetectorClient("settings standard", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("settings dynamicgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings dynamicgain", PUT));
@ -3706,7 +3707,7 @@ TEST_CASE("settings", "[.cmd]") {
REQUIRE_NOTHROW(multiSlsDetectorClient("settings fixgain2", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings fixgain2", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("settings forceswitchg1", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings forceswitchg1", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("settings forceswitchg2", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings forceswitchg2", PUT));
break; break;
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
REQUIRE_NOTHROW(multiSlsDetectorClient("settings dynamicgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings dynamicgain", PUT));
@ -3714,6 +3715,8 @@ TEST_CASE("settings", "[.cmd]") {
REQUIRE_NOTHROW(multiSlsDetectorClient("settings lowgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings lowgain", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("settings mediumgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings mediumgain", PUT));
REQUIRE_NOTHROW(multiSlsDetectorClient("settings veryhighgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings veryhighgain", PUT));
break;
default: default:
REQUIRE_THROWS(multiSlsDetectorClient("settings", GET)); REQUIRE_THROWS(multiSlsDetectorClient("settings", GET));
break; break;