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

formatting

Browse Source
This commit is contained in:
maliakal_d
2022-12-08 09:00:23 +01:00
parent 4ff0ef47eb
commit 9154478702
9 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -289,8 +289,8 @@ std::string CmdProxy::Versions(int action) {
<< OutString(
det->getDetectorServerVersion(std::vector<int>{det_id}));
if (!eiger)
os << "\nHardware : "
<< OutString(det->getHardwareVersion(std::vector<int>{det_id}));
os << "\nHardware : "
<< OutString(det->getHardwareVersion(std::vector<int>{det_id}));
os << "\nKernel : "
<< OutString(det->getKernelVersion({std::vector<int>{det_id}}));
if (det->getUseReceiverFlag().squash(true)) {

5
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -488,7 +488,8 @@ void DetectorImpl::setTransmissionDelay(int step) {
"Transmission delay is not implemented for the this detector.");
}
//using a asyc+future directly (instead of Parallel) to pass different values
// using a asyc+future directly (instead of Parallel) to pass different
// values
std::vector<std::future<void>> futures;
for (int i = 0; i != size(); ++i) {
if (eiger) {
@ -509,7 +510,7 @@ void DetectorImpl::setTransmissionDelay(int step) {
}
}
//wait for calls to complete
// wait for calls to complete
for (auto &f : futures)
f.get();
}