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

stop command: Support single (half)module stop

Browse Source
This commit is contained in:
brueckner_m 2021-04-21 15:40:51 +02:00
parent 05ddc5caaf
commit d5c10aa3e7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/sls/Detector.h
View File

@ -498,7 +498,7 @@ class Detector {
/** Non blocking: Abort detector acquisition. Status changes to IDLE or /** Non blocking: Abort detector acquisition. Status changes to IDLE or
* STOPPED. Goes to stop server. */ * STOPPED. Goes to stop server. */
void stopDetector(); void stopDetector(Positions pos = {});
/** IDLE, ERROR, WAITING, RUN_FINISHED, TRANSMITTING, RUNNING, STOPPED \n /** IDLE, ERROR, WAITING, RUN_FINISHED, TRANSMITTING, RUNNING, STOPPED \n
* Goes to stop server */ * Goes to stop server */

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1455,7 +1455,7 @@ class CmdProxy {
"\n\t[Mythen3] Starts detector readout. Status changes to TRANSMITTING " "\n\t[Mythen3] Starts detector readout. Status changes to TRANSMITTING "
"and automatically returns to idle at the end of readout."); "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 " "\n\tAbort detector acquisition. Status changes "
"to IDLE or STOPPED. Goes to stop server."); "to IDLE or STOPPED. Goes to stop server.");

2
slsDetectorSoftware/src/Detector.cpp
View File

@ -697,7 +697,7 @@ void Detector::startDetectorReadout() {
pimpl->Parallel(&Module::startReadout, {}); pimpl->Parallel(&Module::startReadout, {});
} }
void Detector::stopDetector() { pimpl->Parallel(&Module::stopAcquisition, {}); } void Detector::stopDetector(Positions pos) { pimpl->Parallel(&Module::stopAcquisition, pos); }
Result<defs::runStatus> Detector::getDetectorStatus(Positions pos) const { Result<defs::runStatus> Detector::getDetectorStatus(Positions pos) const {
return pimpl->Parallel(&Module::getRunStatus, pos); return pimpl->Parallel(&Module::getRunStatus, pos);