diff --git a/slsDetectorSoftware/include/CmdProxy.h b/slsDetectorSoftware/include/CmdProxy.h index f96e08b0f..37ab305e2 100644 --- a/slsDetectorSoftware/include/CmdProxy.h +++ b/slsDetectorSoftware/include/CmdProxy.h @@ -1582,7 +1582,7 @@ class CmdProxy { "\n\tClient IP Address that last communicated with the detector."); 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, "[(optional unit) ns|us|ms|s]\n\t[Jungfrau][CTB] Time from detector start up."); diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index 3b3d46159..9e46a66a9 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -1218,7 +1218,7 @@ class Detector { /** Execute a command on the detector server console */ void executeCommand(const std::string &value, Positions pos = {}); - /** [Gotthard][Jungfrau][CTB] */ + /** [Jungfrau][CTB] */ Result getNumberOfFramesFromStart(Positions pos = {}) const; /** [Jungfrau][CTB] Get time from detector start */ diff --git a/slsDetectorSoftware/tests/test-multiSlsDetectorClient.cpp b/slsDetectorSoftware/tests/test-multiSlsDetectorClient.cpp index 012290195..029bbbefa 100644 --- a/slsDetectorSoftware/tests/test-multiSlsDetectorClient.cpp +++ b/slsDetectorSoftware/tests/test-multiSlsDetectorClient.cpp @@ -1084,7 +1084,7 @@ TEST_CASE("timestamp", "[.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)); } else { REQUIRE_THROWS(multiSlsDetectorClient("nframes", GET)); @@ -3698,6 +3698,7 @@ TEST_CASE("settings", "[.cmd]") { REQUIRE_THROWS(multiSlsDetectorClient("settings mediumgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings standard", PUT)); break; + case slsDetectorDefs::JUNGFRAU: REQUIRE_THROWS(multiSlsDetectorClient("settings standard", 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 forceswitchg1", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings forceswitchg2", PUT)); - break; + break; case slsDetectorDefs::GOTTHARD: REQUIRE_NOTHROW(multiSlsDetectorClient("settings dynamicgain", PUT)); @@ -3714,6 +3715,8 @@ TEST_CASE("settings", "[.cmd]") { REQUIRE_NOTHROW(multiSlsDetectorClient("settings lowgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings mediumgain", PUT)); REQUIRE_NOTHROW(multiSlsDetectorClient("settings veryhighgain", PUT)); + break; + default: REQUIRE_THROWS(multiSlsDetectorClient("settings", GET)); break;