From da291d535ed0dc635e38591281e7f2c7cab7820d Mon Sep 17 00:00:00 2001 From: Dhanya Thattil <33750417+thattil@users.noreply.github.com> Date: Wed, 22 Feb 2023 11:09:18 +0100 Subject: [PATCH] fix ctb test, non blocking will not return for 1g (#684) * fix ctb test, non blocking will not return for 1g --- slsDetectorSoftware/src/DetectorImpl.cpp | 2 +- slsDetectorSoftware/tests/test-CmdProxy-rx.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index a64dadd95..12bbb9a45 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1314,7 +1314,7 @@ void DetectorImpl::processData(bool receiver) { } // only update progress else { - LOG(logINFO) << "Type 'q' and hit enter to stop"; + LOG(logINFO) << "Type 'q' and hit enter to stop acquisition"; double progress = 0; printProgress(progress); diff --git a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp index 728035b8b..2cc550812 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp @@ -145,7 +145,8 @@ TEST_CASE("rx_missingpackets", "[.cmd][.rx]") { REQUIRE(oss.str() != "rx_missingpackets [0, 0]\n"); } } - { + auto det_type = det.getDetectorType().squash(); + if (det_type != defs::CHIPTESTBOARD && det_type != defs::MOENCH) { // 0 missing packets (takes into account that acquisition is stopped) det.startReceiver(); det.startDetector();