Couple of fixes

Author: d-j-hatton

src/murfey/server/api/__init__.py

@@ -570,18 +570,14 @@ def register_foil_hole(
     foil_hole_params: FoilHoleParameters,
     db=murfey_db,
 ):
-    # need to sort out foil hole update in ISPyB !!!
     try:
-        gsid = (
-            db.exec(
-                select(GridSquare)
-                .where(GridSquare.tag == foil_hole_params.tag)
-                .where(GridSquare.session_id == session_id)
-                .where(GridSquare.name == gs_name)
-            )
-            .one()
-            .id
-        )
+        gs = db.exec(
+            select(GridSquare)
+            .where(GridSquare.tag == foil_hole_params.tag)
+            .where(GridSquare.session_id == session_id)
+            .where(GridSquare.name == gs_name)
+        ).one()
+        gsid = gs.id
     except NoResultFound:
         log.debug(
             f"Foil hole {sanitise(str(foil_hole_params.name))} could not be registered as grid square {sanitise(str(gs_name))} was not found"
@@ -609,11 +605,13 @@ def register_foil_hole(
         foil_hole.thumbnail_size_y = foil_hole_params.thumbnail_size_y or jpeg_size[1]
         foil_hole.pixel_size = foil_hole_params.pixel_size
         if _transport_object:
-            _transport_object.do_update_foil_hole(foil_hole.id, foil_hole_params)
+            _transport_object.do_update_foil_hole(
+                foil_hole.id, gs.thumbnail_size_x / gs.readout_area_x, foil_hole_params
+            )
     except Exception:
         if _transport_object:
             fh_ispyb_response = _transport_object.do_insert_foil_hole(
-                gsid.id, foil_hole_params
+                gsid.id, gs.thumbnail_size_x / gs.readout_area_x, foil_hole_params
             )
         else:
             fh_ispyb_response = {"success": False, "return_value": None}

src/murfey/server/ispyb.py

@@ -160,7 +160,7 @@ def do_insert_grid_square(
                     / grid_square_parameters.readout_area_x
                 )
             )
-            grid_square_parameters.angle *= (
+            grid_square_parameters.pixel_size *= (
                 grid_square_parameters.readout_area_x
                 / grid_square_parameters.thumbnail_size_x
             )
@@ -224,6 +224,7 @@ def do_update_grid_square(
     def do_insert_foil_hole(
         self,
         grid_square_id: int,
+        scale_factor: float,
         foil_hole_parameters: FoilHoleParameters,
     ):
         if (
@@ -233,11 +234,7 @@ def do_insert_foil_hole(
             and foil_hole_parameters.pixel_size is not None
         ):
             foil_hole_parameters.diameter = int(
-                foil_hole_parameters.diameter
-                * (
-                    foil_hole_parameters.thumbnail_size_x
-                    / foil_hole_parameters.readout_area_x
-                )
+                foil_hole_parameters.diameter * scale_factor
             )
             foil_hole_parameters.pixel_size *= (
                 foil_hole_parameters.readout_area_x
@@ -269,7 +266,10 @@ def do_insert_foil_hole(
         return {"success": False, "return_value": None}
 
     def do_update_foil_hole(
-        self, foil_hole_id: int, foil_hole_parameters: FoilHoleParameters
+        self,
+        foil_hole_id: int,
+        scale_factor: float,
+        foil_hole_parameters: FoilHoleParameters,
     ):
         try:
             with Session() as db:
@@ -279,10 +279,22 @@ def do_update_foil_hole(
                 foil_hole.foilHoleImage = foil_hole_parameters.image
                 foil_hole.pixelLocationX = foil_hole_parameters.x_location
                 foil_hole.pixelLocationY = foil_hole_parameters.y_location
-                foil_hole.diameter = foil_hole_parameters.diameter
+                foil_hole.diameter = (
+                    foil_hole_parameters.diameter * scale_factor
+                    if foil_hole_parameters.diameter is not None
+                    else None
+                )
                 foil_hole.stageLocationX = foil_hole_parameters.x_stage_position
                 foil_hole.stageLocationY = foil_hole_parameters.y_stage_position
-                foil_hole.pixelSize = foil_hole_parameters.pixel_size
+                if (
+                    foil_hole_parameters.readout_area_x is not None
+                    and foil_hole_parameters.thumbnail_size_x is not None
+                    and foil_hole_parameters.pixel_size is not None
+                ):
+                    foil_hole.pixelSize = foil_hole_parameters.pixel_size * (
+                        foil_hole_parameters.readout_area_x
+                        / foil_hole_parameters.thumbnail_size_x
+                    )
                 db.add(foil_hole)
                 db.commit()
                 return {"success": True, "return_value": foil_hole.foilHoleId}