DAQ: attempted fix to save raw data in /raw/data and chjange start omega in automation

2025-11-11 11:42:43 +01:00
parent e5db4a7419
commit 209b0a279b
1 changed files with 6 additions and 2 deletions
@@ -1334,9 +1334,13 @@ class AareDAQ:
                self.__cfg.zoom_mode = ZoomModeEnum.User
                self.__devs.samcam_settings = self.__cfg.zoom_settings.get_camera_settings(self.zoom)
                self.__devs.dtz.move(params.dtz, wait=True)
-                self.__rotation( RotationScanRequest(start_omega_deg=params.start_omega_deg,
+                if self.omega + 180 < 720:
+                    start_omega = self.omega
+                else:
+                    start_omega = params.start_omega_deg
+                self.__rotation( RotationScanRequest(start_omega_deg=start_omega,
                                                     dtz=params.dtz,
-                                                     file_prefix=sample_prefix + f"_{hex_string}",
+                                                     file_prefix="data/" + sample_prefix + f"_{hex_string}",
                                                     exp_time_s=params.exp_time_s,
                                                     incr_omega_deg=params.incr_omega_deg,
                                                     steps=params.steps,