WIP

slsDetectorSoftware/src/CmdProxy.cpp

@@ -1039,7 +1039,8 @@ std::string CmdProxy::Scan(int action) {
         throw sls::RuntimeError("Unknown action");
     }
     return os.str();
-} // namespace sls
+}
+
 /* Network Configuration (Detector<->Receiver) */
 
 std::string CmdProxy::UDPDestinationIP(int action) {

slsDetectorSoftware/src/CmdProxy.h

@@ -738,6 +738,7 @@ class CmdProxy {
         {"startingfnum", &CmdProxy::startingfnum},
         {"trigger", &CmdProxy::trigger},
         {"scan", &CmdProxy::Scan},
+        {"scanerrmsg", &CmdProxy::scanerrmsg},
 
         /* Network Configuration (Detector<->Receiver) */
         {"numinterfaces", &CmdProxy::numinterfaces},
@@ -1554,6 +1555,10 @@ class CmdProxy {
         trigger, sendSoftwareTrigger,
         "\n\t[Eiger] Sends software trigger signal to detector.");
 
+    GET_COMMAND(scanerrmsg, getScanErrorMessage,
+                "\n\tGets Scan error message if scan ended in error for non "
+                "blocking acquisitions.");
+
     /* Network Configuration (Detector<->Receiver) */
 
     INTEGER_COMMAND(

slsDetectorSoftware/src/Detector.cpp

@@ -567,6 +567,10 @@ void Detector::setScan(const defs::scanParameters t) {
     pimpl->Parallel(&Module::setScan, {}, t);
 }
 
+Result<std::string> Detector::getScanErrorMessage(Positions pos) const {
+    return pimpl->Parallel(&Module::getScanErrorMessage, pos);
+}
+
 // Network Configuration (Detector<->Receiver)
 
 Result<int> Detector::getNumberofUDPInterfaces(Positions pos) const {

slsDetectorSoftware/src/Module.cpp

@@ -459,6 +459,12 @@ void Module::setScan(const defs::scanParameters t) {
     setNumberOfFrames(retval);
 }
 
+std::string Module::getScanErrorMessage() {
+    char retval[MAX_STR_LENGTH]{};
+    sendToDetector(F_GET_SCAN_ERROR_MESSAGE, nullptr, retval);
+    return retval;
+}
+
 // Network Configuration (Detector<->Receiver)
 
 int Module::getNumberofUDPInterfacesFromShm() {

slsDetectorSoftware/src/Module.h

@@ -168,6 +168,7 @@ class Module : public virtual slsDetectorDefs {
     void sendSoftwareTrigger();
     defs::scanParameters getScan();
     void setScan(const defs::scanParameters t);
+    std::string getScanErrorMessage();
 
     /**************************************************
      *                                                 *