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

getmaster through stop server, allowing stopacq to first go to slave for eiger, eiger stop to first check reg value to send complete frames before calling stop

Browse Source
This commit is contained in:
maliakal_d
2021-06-15 12:59:54 +02:00
parent 709293be68
commit b11f6c56e7
3 changed files with 42 additions and 35 deletions
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) {
auto detector_type = getDetectorType().squash();
/*if (detector_type == defs::EIGER && size() > 1) {
if (detector_type == defs::EIGER && size() > 1) {
auto is_master = getMaster();
int masterPosition = -1;
std::vector<int> slaves;
@ -716,9 +716,9 @@ void Detector::stopDetector(Positions pos) {
if (masterPosition != -1) {
pimpl->Parallel(&Module::stopAcquisition, {masterPosition});
}
} else {*/
pimpl->Parallel(&Module::stopAcquisition, pos);
//}
} else {
pimpl->Parallel(&Module::stopAcquisition, pos);
}
}
Result<defs::runStatus> Detector::getDetectorStatus(Positions pos) const {