Rescale pixel sizes and subimage sizes

Author: d-j-hatton

src/murfey/server/api/__init__.py

@@ -491,18 +491,6 @@ def register_grid_square(
     grid_square_params: GridSquareParameters,
     db=murfey_db,
 ):
-    if _transport_object:
-        dcg = db.exec(
-            select(DataCollectionGroup)
-            .where(DataCollectionGroup.session_id == session_id)
-            .where(DataCollectionGroup.tag == grid_square_params.tag)
-        ).one()
-        gs_ispyb_response = _transport_object.do_insert_grid_square(
-            dcg.atlas_id, gsid, grid_square_params
-        )
-    else:
-        # mock up response so that below still works
-        gs_ispyb_response = {"success": False, "return_value": None}
     try:
         grid_square = db.exec(
             select(GridSquare)
@@ -514,7 +502,20 @@ def register_grid_square(
         grid_square.y_location = grid_square_params.y_location
         grid_square.x_stage_position = grid_square_params.x_stage_position
         grid_square.y_stage_position = grid_square_params.y_stage_position
+        # need to update ISPyB grid square here !!!!
     except Exception:
+        if _transport_object:
+            dcg = db.exec(
+                select(DataCollectionGroup)
+                .where(DataCollectionGroup.session_id == session_id)
+                .where(DataCollectionGroup.tag == grid_square_params.tag)
+            ).one()
+            gs_ispyb_response = _transport_object.do_insert_grid_square(
+                dcg.atlas_id, gsid, grid_square_params
+            )
+        else:
+            # mock up response so that below still works
+            gs_ispyb_response = {"success": False, "return_value": None}
         secured_grid_square_image_path = secure_filename(grid_square_params.image)
         if (
             secured_grid_square_image_path

src/murfey/server/ispyb.py

@@ -135,7 +135,34 @@ def do_insert_grid_square(
         grid_square_id: int,
         grid_square_parameters: GridSquareParameters,
     ):
-        # need to correct height and weight by pixel ratio !!!!!
+        if (
+            grid_square_parameters.height is not None
+            and grid_square_parameters.width is not None
+            and grid_square_parameters.pixel_size is not None
+            and grid_square_parameters.thumbnail_size_x is not None
+            and grid_square_parameters.thumbnail_size_y is not None
+            and grid_square_parameters.readout_area_x is not None
+            and grid_square_parameters.readout_area_y is not None
+            and grid_square_parameters.angle is not None
+        ):
+            grid_square_parameters.height = int(
+                grid_square_parameters.height
+                * (
+                    grid_square_parameters.thumbnail_size_y
+                    / grid_square_parameters.readout_area_y
+                )
+            )
+            grid_square_parameters.width = int(
+                grid_square_parameters.width
+                * (
+                    grid_square_parameters.thumbnail_size_x
+                    / grid_square_parameters.readout_area_x
+                )
+            )
+            grid_square_parameters.angle *= (
+                grid_square_parameters.readout_area_x
+                / grid_square_parameters.thumbnail_size_x
+            )
         record = GridSquare(
             atlasId=atlas_id,
             gridSquareLabel=grid_square_id,
@@ -168,6 +195,23 @@ def do_insert_foil_hole(
         grid_square_id: int,
         foil_hole_parameters: FoilHoleParameters,
     ):
+        if (
+            foil_hole_parameters.diameter is not None
+            and foil_hole_parameters.thumbnail_size_x is not None
+            and foil_hole_parameters.readout_area_x is not None
+            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.pixel_size *= (
+                foil_hole_parameters.readout_area_x
+                / foil_hole_parameters.thumbnail_size_x
+            )
         record = FoilHole(
             gridSquareId=grid_square_id,
             foilHoleLabel=foil_hole_parameters.name,