DAQ/GUI: Add relative omega movement - to be tested

daq/src/aaredaq/daq.py

@@ -198,9 +198,7 @@ class AareDAQ:
     def omega(self) -> float:
         return self.__devs.aerotech.omega
 
-    @omega.setter
-    def omega(self, val: float):
-        self.__cfg.set_busy(BeamlineStateEnum.SampleAlignment)
+    def __omega(self, val: float):
         self.__saved_box = None
         if -2000 < val < 2000:
             try:
@@ -215,6 +213,16 @@ class AareDAQ:
             logger.error("Omega has to be between -2000 and 2000 degrees")
             raise ValueError("Omega has to be between -2000 and 2000 degrees (for now)")
 
+    @omega.setter
+    def omega(self, val: float):
+        self.__cfg.set_busy(BeamlineStateEnum.SampleAlignment)
+        self.__omega(val)
+
+    def omega_rel(self, val: float):
+        self.__cfg.set_busy(BeamlineStateEnum.SampleAlignment)
+        curr_omega = self.__devs.aerotech.omega
+        self.__omega(curr_omega + val)
+
     @property
     def zoom(self) -> float:
         return self.__devs.zoom

daq/src/aaredaq/server.py

@@ -96,6 +96,12 @@ async def omega(val: float, token: str = Depends(oauth2_scheme)):
     daq.omega = val
     return "OK"
 
+@app.put("/beamline/omega_rel")
+async def omega(val: float, token: str = Depends(oauth2_scheme)):
+    logger.debug(f"Moving omega by {val}")
+    auth.check_jwt_rw(cfg, auth.parse_token(token))
+    daq.omega_rel(val)
+    return "OK"
 
 @app.put("/beamline/light")
 async def light(val: float, token: str = Depends(oauth2_scheme)):