DAQ: trying to tidy up aaredb error communication in raster scans

2026-04-22 16:06:41 +02:00
parent 1df0ada163
commit 405806518c
1 changed files with 15 additions and 1 deletions
@@ -1038,10 +1038,24 @@ class AareDAQ:
                 # Let JFJochCommunicationError propagate
                 result = self.__jfjoch.wait_till_done(60)

-        except JFJochCommunicationError:
+        except JFJochCommunicationError as e:
+            self._handle_operation_error(
+                operation=DAQOperation.ROTATION,
+                sample=self.sample,
+                error=e,
+                event_type=SampleEventType.COLLECTIONFAILED,
+                additional_comment="JFJoch Communication Error",
+            )
            raise
        except Exception as e:
            logger.error(f"Exception during rotation scan: {e}")
+            self._handle_operation_error(
+                operation=DAQOperation.ROTATION,
+                sample=self.sample,
+                error=e,
+                event_type=SampleEventType.COLLECTIONFAILED,
+                additional_comment=None,
+            )
            raise

        return result