Allow grid square score to be recorded in ISPyB

Author: d-j-hatton

src/murfey/server/ispyb.py

@@ -184,6 +184,7 @@ def do_insert_grid_square(
             stageLocationX=grid_square_parameters.x_stage_position,
             stageLocationY=grid_square_parameters.y_stage_position,
             pixelSize=grid_square_parameters.pixel_size,
+            qualityIndicator=grid_square_parameters.score,
         )
         try:
             with Session() as db:
@@ -240,6 +241,11 @@ def do_update_grid_square(
                     grid_square.stageLocationY = grid_square_parameters.y_stage_position
                 if grid_square_parameters.pixel_size:
                     grid_square.pixelSize = grid_square_parameters.pixel_size
+                grid_square.qualityIndicator = (
+                    grid_square_parameters.score
+                    if grid_square_parameters.score is not None
+                    else grid_square.qualityIndicator
+                )
                 db.add(grid_square)
                 db.commit()
                 return {"success": True, "return_value": grid_square.gridSquareId}

src/murfey/util/models.py

@@ -262,6 +262,7 @@ class GridSquareParameters(BaseModel):
     pixel_size: Optional[float] = None
     image: str = ""
     angle: Optional[float] = None
+    score: Optional[float] = None
 
 
 class FoilHoleParameters(BaseModel):

src/murfey/workflows/spa/flush_spa_preprocess.py

@@ -71,6 +71,7 @@ def register_grid_square(
         )
         grid_square.pixel_size = grid_square_params.pixel_size or grid_square.pixel_size
         grid_square.image = grid_square_params.image or grid_square.image
+        grid_square.score = grid_square_params.score or grid_square.score
         if _transport_object:
             _transport_object.do_update_grid_square(grid_square.id, grid_square_params)
     except Exception: