@@ -59,23 +59,23 @@ def set_up_db(murfey_db_session: Session):
5959 "pj_id" : aretomo_pj_entry .id ,
6060 },
6161 )
62- get_or_create_db_entry (
62+ imod_autoproc_entry = get_or_create_db_entry (
6363 murfey_db_session ,
6464 AutoProcProgram ,
6565 lookup_kwargs = {
6666 "id" : 1 ,
6767 "pj_id" : imod_pj_entry .id ,
6868 },
6969 )
70- return dcg_entry .id , dc_entry .id , imod_pj_entry .id , aretomo_autoproc_entry .id
70+ return dcg_entry .id , dc_entry .id , aretomo_autoproc_entry .id , imod_autoproc_entry .id
7171
7272
7373@mock .patch ("murfey.workflows.sxt.process_sxt_tilt_series._transport_object" )
7474def test_process_new_sxt_tilt_series (
7575 mock_transport , murfey_db_session : Session , tmp_path
7676):
7777 """Run the picker feedback with less particles than needed for classification"""
78- dcg_id , dc_id , pj_id , app_id = set_up_db (murfey_db_session )
78+ dcg_id , dc_id , app_id_aretomo , app_id_imod = set_up_db (murfey_db_session )
7979
8080 new_parameters = process_sxt_tilt_series .SXTTiltSeriesInfo (
8181 session_id = ExampleVisit .murfey_session_id ,
@@ -105,7 +105,7 @@ def test_process_new_sxt_tilt_series(
105105 "txrm_file" : f"{ tmp_path } /cm12345-6/raw/tomogram_tag.txrm" ,
106106 "xrm_reference" : f"{ tmp_path } /cm12345-6/raw/ref.xrm" ,
107107 "dcid" : dc_id ,
108- "appid" : app_id ,
108+ "appid" : app_id_aretomo ,
109109 "stack_file" : f"{ tmp_path } /cm12345-6/processed/tomogram_tag/sxt-aretomo/Tomograms/tomogram_tag_stack.mrc" ,
110110 "tilt_axis" : 0 ,
111111 "pixel_size" : 100 ,
@@ -123,7 +123,7 @@ def test_process_new_sxt_tilt_series(
123123 "txrm_file" : f"{ tmp_path } /cm12345-6/raw/tomogram_tag.txrm" ,
124124 "xrm_reference" : f"{ tmp_path } /cm12345-6/raw/ref.xrm" ,
125125 "dcid" : dc_id ,
126- "appid" : app_id ,
126+ "appid" : app_id_imod ,
127127 "stack_file" : f"{ tmp_path } /cm12345-6/processed/tomogram_tag/sxt-imod-patch-wbp/Tomograms/tomogram_tag_stack.mrc" ,
128128 "tilt_axis" : 0 ,
129129 "pixel_size" : 100 ,
0 commit comments