diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h index 105d95dee..f46ae3993 100644 --- a/slsDetectorSoftware/include/sls/Detector.h +++ b/slsDetectorSoftware/include/sls/Detector.h @@ -498,7 +498,7 @@ class Detector { /** Non blocking: Abort detector acquisition. Status changes to IDLE or * STOPPED. Goes to stop server. */ - void stopDetector(); + void stopDetector(Positions pos = {}); /** IDLE, ERROR, WAITING, RUN_FINISHED, TRANSMITTING, RUNNING, STOPPED \n * Goes to stop server */ @@ -1729,4 +1729,4 @@ class Detector { void updateRxRateCorrections(); }; -} // namespace sls \ No newline at end of file +} // namespace sls diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index 90bf8dd15..28e3c74a1 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -1455,7 +1455,7 @@ class CmdProxy { "\n\t[Mythen3] Starts detector readout. Status changes to TRANSMITTING " "and automatically returns to idle at the end of readout."); - EXECUTE_SET_COMMAND_NOID(stop, stopDetector, + EXECUTE_SET_COMMAND(stop, stopDetector, "\n\tAbort detector acquisition. Status changes " "to IDLE or STOPPED. Goes to stop server."); diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index b0892c2a2..aa69601d9 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -697,7 +697,7 @@ void Detector::startDetectorReadout() { pimpl->Parallel(&Module::startReadout, {}); } -void Detector::stopDetector() { pimpl->Parallel(&Module::stopAcquisition, {}); } +void Detector::stopDetector(Positions pos) { pimpl->Parallel(&Module::stopAcquisition, pos); } Result Detector::getDetectorStatus(Positions pos) const { return pimpl->Parallel(&Module::getRunStatus, pos); @@ -2092,4 +2092,4 @@ std::vector Detector::getPortNumbers(int start_port) { return res; } -} // namespace sls \ No newline at end of file +} // namespace sls