Added rounding when converting caculated pixel values to int

Author: tieneupin

src/murfey/workflows/clem/register_preprocessing_results.py

@@ -130,8 +130,8 @@ def _register_clem_imaging_site(
             thumbnail_height / result.pixels_y, thumbnail_width / result.pixels_x
         )
         clem_img_site.thumbnail_pixel_size = result.pixel_size / scaling_factor
-        clem_img_site.thumbnail_pixels_x = int(result.pixels_x * scaling_factor)
-        clem_img_site.thumbnail_pixels_y = int(result.pixels_y * scaling_factor)
+        clem_img_site.thumbnail_pixels_x = int(round(result.pixels_x * scaling_factor))
+        clem_img_site.thumbnail_pixels_y = int(round(result.pixels_y * scaling_factor))
     murfey_db.add(clem_img_site)
     murfey_db.commit()
     murfey_db.close()
@@ -354,30 +354,39 @@ def _register_grid_square(
                 and clem_img_site.y0 is not None
                 and clem_img_site.y1 is not None
             ):
-                # Find pixel corresponding to image midpoint on atlas
-                x_mid_real = (
-                    0.5 * (clem_img_site.x0 + clem_img_site.x1) - atlas_entry.x0
+                # Find pixel coordinates corresponding to the centre of the image on the atlas
+                cx = 0.5 * (clem_img_site.x0 + clem_img_site.x1)
+                cy = 0.5 * (clem_img_site.y0 + clem_img_site.y1)
+
+                cx_scaled = int(
+                    round(
+                        (cx - atlas_entry.x0)
+                        / atlas_width_real
+                        * atlas_entry.thumbnail_pixels_x
+                    )
                 )
-                x_mid_px = int(
-                    x_mid_real / atlas_width_real * atlas_entry.thumbnail_pixels_x
-                )
-                y_mid_real = (
-                    0.5 * (clem_img_site.y0 + clem_img_site.y1) - atlas_entry.y0
-                )
-                y_mid_px = int(
-                    y_mid_real / atlas_height_real * atlas_entry.thumbnail_pixels_y
+                cy_scaled = int(
+                    round(
+                        (cy - atlas_entry.y0)
+                        / atlas_height_real
+                        * atlas_entry.thumbnail_pixels_y
+                    )
                 )
 
                 # Find the size of the image, in pixels, when overlaid on the atlas
                 width_scaled = int(
-                    (clem_img_site.x1 - clem_img_site.x0)
-                    / atlas_width_real
-                    * atlas_entry.thumbnail_pixels_x
+                    round(
+                        (clem_img_site.x1 - clem_img_site.x0)
+                        / atlas_width_real
+                        * atlas_entry.thumbnail_pixels_x
+                    )
                 )
                 height_scaled = int(
-                    (clem_img_site.y1 - clem_img_site.y0)
-                    / atlas_height_real
-                    * atlas_entry.thumbnail_pixels_y
+                    round(
+                        (clem_img_site.y1 - clem_img_site.y0)
+                        / atlas_height_real
+                        * atlas_entry.thumbnail_pixels_y
+                    )
                 )
             else:
                 logger.warning(
@@ -389,9 +398,9 @@ def _register_grid_square(
             grid_square_params = GridSquareParameters(
                 tag=dcg_name,
                 x_location=clem_img_site.x0,
-                x_location_scaled=x_mid_px,
+                x_location_scaled=cx_scaled,
                 y_location=clem_img_site.y0,
-                y_location_scaled=y_mid_px,
+                y_location_scaled=cy_scaled,
                 readout_area_x=clem_img_site.image_pixels_x,
                 readout_area_y=clem_img_site.image_pixels_y,
                 thumbnail_size_x=clem_img_site.thumbnail_pixels_x,