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

without getmaster, getmaster needs to go to stop server

Browse Source
This commit is contained in:
maliakal_d 2021-06-15 12:45:58 +02:00
parent 130613f730
commit f111ac733b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/Detector.cpp
View File

@ -698,7 +698,7 @@ void Detector::startDetectorReadout() {
void Detector::stopDetector(Positions pos) { void Detector::stopDetector(Positions pos) {
auto detector_type = getDetectorType().squash(); auto detector_type = getDetectorType().squash();
if (detector_type == defs::EIGER && size() > 1) { /*if (detector_type == defs::EIGER && size() > 1) {
auto is_master = getMaster(); auto is_master = getMaster();
int masterPosition = -1; int masterPosition = -1;
std::vector<int> slaves; std::vector<int> slaves;
@ -716,9 +716,9 @@ void Detector::stopDetector(Positions pos) {
if (masterPosition != -1) { if (masterPosition != -1) {
pimpl->Parallel(&Module::stopAcquisition, {masterPosition}); pimpl->Parallel(&Module::stopAcquisition, {masterPosition});
} }
} else { } else {*/
pimpl->Parallel(&Module::stopAcquisition, pos); pimpl->Parallel(&Module::stopAcquisition, pos);
} //}
} }
Result<defs::runStatus> Detector::getDetectorStatus(Positions pos) const { Result<defs::runStatus> Detector::getDetectorStatus(Positions pos) const {