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

formatting and versioning

Browse Source
This commit is contained in:
maliakal_d
2023-11-08 11:43:09 +01:00
parent af3dc1e7f4
commit 14e11e8b5b
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1243,17 +1243,17 @@ int DetectorImpl::acquire() {
// handle jf sync issue (master idle, slaves stopped)
if (statusList.contains_only(IDLE, STOPPED)) {
status = STOPPED;
}
else
} else
status = statusList.squash(RUNNING);
}
// progress
auto a = Parallel(&Module::getReceiverProgress, {});
double progress = (*std::max_element(a.begin(), a.end()));
// callback
acquisition_finished(progress, static_cast<int>(status), acqFinished_p);
acquisition_finished(progress, static_cast<int>(status),
acqFinished_p);
}
clock_gettime(CLOCK_REALTIME, &end);