From c004aa2feb56ed9b9ae4d88bb296d9e31593efd2 Mon Sep 17 00:00:00 2001 From: yxd92326 Date: Thu, 30 Apr 2026 15:39:35 +0100 Subject: [PATCH 1/2] Add sxt router and rename recipe --- src/murfey/client/contexts/sxt.py | 2 +- src/murfey/server/main.py | 1 + src/murfey/workflows/sxt/process_sxt_tilt_series.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/murfey/client/contexts/sxt.py b/src/murfey/client/contexts/sxt.py index 959643501..60edf5228 100644 --- a/src/murfey/client/contexts/sxt.py +++ b/src/murfey/client/contexts/sxt.py @@ -85,7 +85,7 @@ def register_sxt_data_collection( ) recipes_to_assign_pjids = [ - "sxt-tomo-align", + "sxt-aretomo", ] for recipe in recipes_to_assign_pjids: capture_post( diff --git a/src/murfey/server/main.py b/src/murfey/server/main.py index f91109e15..b90dea780 100644 --- a/src/murfey/server/main.py +++ b/src/murfey/server/main.py @@ -96,6 +96,7 @@ class Settings(BaseSettings): app.include_router(murfey.server.api.workflow.router) app.include_router(murfey.server.api.workflow.correlative_router) app.include_router(murfey.server.api.workflow.spa_router) +app.include_router(murfey.server.api.workflow.sxt_router) app.include_router(murfey.server.api.workflow.tomo_router) app.include_router(murfey.server.api.clem.router) app.include_router(murfey.server.api.workflow_fib.router) diff --git a/src/murfey/workflows/sxt/process_sxt_tilt_series.py b/src/murfey/workflows/sxt/process_sxt_tilt_series.py index 53cf7e9c4..04674822c 100644 --- a/src/murfey/workflows/sxt/process_sxt_tilt_series.py +++ b/src/murfey/workflows/sxt/process_sxt_tilt_series.py @@ -64,7 +64,7 @@ def process_sxt_tilt_series_workflow( .where(DataCollection.dcg_id == DataCollectionGroup.id) .where(ProcessingJob.dc_id == DataCollection.id) .where(AutoProcProgram.pj_id == ProcessingJob.id) - .where(ProcessingJob.recipe == "sxt-tomo-align") + .where(ProcessingJob.recipe == "sxt-aretomo") ).one() instrument_name = ( murfey_db.exec(select(Session).where(Session.id == session_id)) @@ -93,7 +93,7 @@ def process_sxt_tilt_series_workflow( ) stack_file.parent.mkdir(parents=True, exist_ok=True) zocalo_message = { - "recipes": ["sxt-tomo-align"], + "recipes": ["sxt-aretomo"], "parameters": { "txrm_file": tilt_series_info.txrm, "dcid": collected_ids[1].id, From cd5a03b8e96161329ea26c37194276a8aa05d221 Mon Sep 17 00:00:00 2001 From: yxd92326 Date: Thu, 30 Apr 2026 15:46:10 +0100 Subject: [PATCH 2/2] Update tests --- tests/client/contexts/test_sxt.py | 2 +- tests/workflows/sxt/test_process_sxt_tilt_series.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/client/contexts/test_sxt.py b/tests/client/contexts/test_sxt.py index c50e18abf..c1de8f1ec 100644 --- a/tests/client/contexts/test_sxt.py +++ b/tests/client/contexts/test_sxt.py @@ -107,7 +107,7 @@ def test_sxt_context_txrm( json={ "tag": "example", "source": str(tmp_path), - "recipe": "sxt-tomo-align", + "recipe": "sxt-aretomo", "experiment_type": "sxt", }, headers={"Authorization": "Bearer "}, diff --git a/tests/workflows/sxt/test_process_sxt_tilt_series.py b/tests/workflows/sxt/test_process_sxt_tilt_series.py index c14a62200..f45c4be0d 100644 --- a/tests/workflows/sxt/test_process_sxt_tilt_series.py +++ b/tests/workflows/sxt/test_process_sxt_tilt_series.py @@ -38,7 +38,7 @@ def set_up_db(murfey_db_session: Session): ProcessingJob, lookup_kwargs={ "id": 1, - "recipe": "sxt-tomo-align", + "recipe": "sxt-aretomo", "dc_id": dc_entry.id, }, ) @@ -92,7 +92,7 @@ def test_process_new_sxt_tilt_series( "manual_tilt_offset": -1, "node_creator_queue": "node_creator", }, - "recipes": ["sxt-tomo-align"], + "recipes": ["sxt-aretomo"], }, new_connection=True, )