Merged recent changes from 'main' branch

tieneupin · tieneupin · commit 12b77ccf87d3 · 2025-01-16T11:30:48.000Z
diff --git a/src/murfey/server/__init__.py b/src/murfey/server/__init__.py
@@ -2077,7 +2077,7 @@ def _flush_tomography_preprocessing(message: dict):
         )
         return
 
-    recipe_name = machine_config.get("em-tomo-preprocess", "em-tomo-preprocess")
+    recipe_name = machine_config.recipes.get("em-tomo-preprocess", "em-tomo-preprocess")
 
     for f in stashed_files:
         collected_ids = murfey_db.exec(

Original file line number	Diff line number	Diff line change
`@@ -2077,7 +2077,7 @@ def _flush_tomography_preprocessing(message: dict):`
`2077`	`2077`	`)`
`2078`	`2078`	`return`
`2079`	`2079`
`2080`		`- recipe_name = machine_config.get("em-tomo-preprocess", "em-tomo-preprocess")`
	`2080`	`+ recipe_name = machine_config.recipes.get("em-tomo-preprocess", "em-tomo-preprocess")`
`2081`	`2081`
`2082`	`2082`	`for f in stashed_files:`
`2083`	`2083`	`collected_ids = murfey_db.exec(`