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

removed prepare acq

Browse Source
This commit is contained in:
Erik Frojdh 2019-08-14 09:31:42 +02:00
parent 7b1cb517c0
commit 97192c5342
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/include/Detector.h
View File

@ -1021,9 +1021,6 @@ class Detector {
Result<defs::runStatus> getRunStatus(Positions pos = {}); Result<defs::runStatus> getRunStatus(Positions pos = {});
/** [Eiger] */
void prepareAcquisition();
/** Start detector acquisition (Non blocking) */ /** Start detector acquisition (Non blocking) */
void startAcquisition(); void startAcquisition();

9
slsDetectorSoftware/src/Detector.cpp
View File

@ -1532,15 +1532,8 @@ Result<defs::runStatus> Detector::getRunStatus(Positions pos) {
return pimpl->Parallel(&slsDetector::getRunStatus, pos); return pimpl->Parallel(&slsDetector::getRunStatus, pos);
} }
void Detector::prepareAcquisition() {
pimpl->Parallel(&slsDetector::prepareAcquisition, {});
}
void Detector::startAcquisition() { void Detector::startAcquisition() {
if (getDetectorType() == defs::EIGER) { pimpl->startAcquisition();
prepareAcquisition();
}
pimpl->Parallel(&slsDetector::startAcquisition, {});
} }
void Detector::stopAcquisition() { pimpl->stopAcquisition(); } void Detector::stopAcquisition() { pimpl->stopAcquisition(); }