Fixes for SPA flushing (#441)

Use the recipes from Murfey configuration rather than hardcoding them. Also, add foil hole ID to preprocessing message during flush.

Author: d-j-hatton

src/murfey/server/__init__.py

@@ -1947,6 +1947,7 @@ def _flush_spa_preprocessing(message: dict):
     machine_config = get_machine_config(instrument_name=instrument_name)[
         instrument_name
     ]
+    recipe_name = machine_config.recipes.get("em-spa-preprocess", "em-spa-preprocess")
     collected_ids = murfey_db.exec(
         select(
             db.DataCollectionGroup,
@@ -1959,7 +1960,7 @@ def _flush_spa_preprocessing(message: dict):
         .where(db.DataCollection.dcg_id == db.DataCollectionGroup.id)
         .where(db.ProcessingJob.dc_id == db.DataCollection.id)
         .where(db.AutoProcProgram.pj_id == db.ProcessingJob.id)
-        .where(db.ProcessingJob.recipe == "em-spa-preprocess")
+        .where(db.ProcessingJob.recipe == recipe_name)
     ).one()
     params = murfey_db.exec(
         select(db.SPARelionParameters, db.SPAFeedbackParameters)
@@ -1973,7 +1974,7 @@ def _flush_spa_preprocessing(message: dict):
             f"No SPA processing parameters found for client processing job ID {collected_ids[2].id}"
         )
         raise ValueError(
-            "No processing parameters were foudn in the database when flushing SPA preprocessing"
+            "No processing parameters were found in the database when flushing SPA preprocessing"
         )
 
     murfey_ids = _murfey_id(
@@ -2000,7 +2001,7 @@ def _flush_spa_preprocessing(message: dict):
         )
         murfey_db.add(movie)
         zocalo_message: dict = {
-            "recipes": ["em-spa-preprocess"],
+            "recipes": [recipe_name],
             "parameters": {
                 "node_creator_queue": machine_config.node_creator_queue,
                 "dcid": collected_ids[1].id,
@@ -2020,6 +2021,7 @@ def _flush_spa_preprocessing(message: dict):
                 "particle_diameter": proc_params.particle_diameter or 0,
                 "fm_int_file": f.eer_fractionation_file,
                 "do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
+                "foil_hole_id": f.foil_hole_id,
             },
         }
         if _transport_object:
@@ -2075,6 +2077,8 @@ def _flush_tomography_preprocessing(message: dict):
         )
         return
 
+    recipe_name = machine_config.get("em-tomo-preprocess", "em-tomo-preprocess")
+
     for f in stashed_files:
         collected_ids = murfey_db.exec(
             select(
@@ -2089,7 +2093,7 @@ def _flush_tomography_preprocessing(message: dict):
             .where(db.DataCollection.tag == f.tag)
             .where(db.ProcessingJob.dc_id == db.DataCollection.id)
             .where(db.AutoProcProgram.pj_id == db.ProcessingJob.id)
-            .where(db.ProcessingJob.recipe == "em-tomo-preprocess")
+            .where(db.ProcessingJob.recipe == recipe_name)
         ).one()
         detached_ids = [c.id for c in collected_ids]
 
@@ -2105,7 +2109,7 @@ def _flush_tomography_preprocessing(message: dict):
         )
         murfey_db.add(movie)
         zocalo_message: dict = {
-            "recipes": ["em-tomo-preprocess"],
+            "recipes": [recipe_name],
             "parameters": {
                 "node_creator_queue": machine_config.node_creator_queue,
                 "dcid": detached_ids[1],