detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-07 13:20:02 +02:00
Code Issues Actions Packages Releases Activity

fix ctb test, non blocking will not return for 1g (#684)

Browse Source 
* fix ctb test, non blocking will not return for 1g
This commit is contained in:
Dhanya Thattil 2023-02-22 11:09:18 +01:00 committed by GitHub
parent adcde9fd49
commit da291d535e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1314,7 +1314,7 @@ void DetectorImpl::processData(bool receiver) {
} }
// only update progress // only update progress
else { else {
LOG(logINFO) << "Type 'q' and hit enter to stop"; LOG(logINFO) << "Type 'q' and hit enter to stop acquisition";
double progress = 0; double progress = 0;
printProgress(progress); printProgress(progress);

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

@ -145,7 +145,8 @@ TEST_CASE("rx_missingpackets", "[.cmd][.rx]") {
REQUIRE(oss.str() != "rx_missingpackets [0, 0]\n"); 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) // 0 missing packets (takes into account that acquisition is stopped)
det.startReceiver(); det.startReceiver();
det.startDetector(); det.startDetector();