Skip to content

Commit 26f5bbb

Browse files
committed
Fix recipe lookup in SPA flush
1 parent 1c5667d commit 26f5bbb

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/murfey/server/__init__.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,7 +1959,10 @@ def _flush_spa_preprocessing(message: dict):
19591959
.where(db.DataCollection.dcg_id == db.DataCollectionGroup.id)
19601960
.where(db.ProcessingJob.dc_id == db.DataCollection.id)
19611961
.where(db.AutoProcProgram.pj_id == db.ProcessingJob.id)
1962-
.where(db.ProcessingJob.recipe == "em-spa-preprocess")
1962+
.where(
1963+
db.ProcessingJob.recipe
1964+
== machine_config.recipes.get("em-spa-preprocess", "em-spa-preprocess")
1965+
)
19631966
).one()
19641967
params = murfey_db.exec(
19651968
select(db.SPARelionParameters, db.SPAFeedbackParameters)
@@ -2089,7 +2092,10 @@ def _flush_tomography_preprocessing(message: dict):
20892092
.where(db.DataCollection.tag == f.tag)
20902093
.where(db.ProcessingJob.dc_id == db.DataCollection.id)
20912094
.where(db.AutoProcProgram.pj_id == db.ProcessingJob.id)
2092-
.where(db.ProcessingJob.recipe == "em-tomo-preprocess")
2095+
.where(
2096+
db.ProcessingJob.recipe
2097+
== machine_config.get("em-tomo-preprocess", "em-tomo-preprocess")
2098+
)
20932099
).one()
20942100
detached_ids = [c.id for c in collected_ids]
20952101

0 commit comments

Comments
 (0)