@@ -33,7 +33,7 @@ def set_up_db(murfey_db_session: Session):
3333 "dcg_id" : dcg_entry .id ,
3434 },
3535 )
36- processing_job_entry : ProcessingJob = get_or_create_db_entry (
36+ aretomo_pj_entry : ProcessingJob = get_or_create_db_entry (
3737 murfey_db_session ,
3838 ProcessingJob ,
3939 lookup_kwargs = {
@@ -42,15 +42,32 @@ def set_up_db(murfey_db_session: Session):
4242 "dc_id" : dc_entry .id ,
4343 },
4444 )
45- auto_proc_entry = get_or_create_db_entry (
45+ imod_pj_entry : ProcessingJob = get_or_create_db_entry (
46+ murfey_db_session ,
47+ ProcessingJob ,
48+ lookup_kwargs = {
49+ "id" : 1 ,
50+ "recipe" : "sxt-imod-patch-wbp" ,
51+ "dc_id" : dc_entry .id ,
52+ },
53+ )
54+ aretomo_autoproc_entry = get_or_create_db_entry (
55+ murfey_db_session ,
56+ AutoProcProgram ,
57+ lookup_kwargs = {
58+ "id" : 0 ,
59+ "pj_id" : aretomo_pj_entry .id ,
60+ },
61+ )
62+ get_or_create_db_entry (
4663 murfey_db_session ,
4764 AutoProcProgram ,
4865 lookup_kwargs = {
4966 "id" : 0 ,
50- "pj_id" : processing_job_entry .id ,
67+ "pj_id" : imod_pj_entry .id ,
5168 },
5269 )
53- return dcg_entry .id , dc_entry .id , processing_job_entry .id , auto_proc_entry .id
70+ return dcg_entry .id , dc_entry .id , imod_pj_entry .id , aretomo_autoproc_entry .id
5471
5572
5673@mock .patch ("murfey.workflows.sxt.process_sxt_tilt_series._transport_object" )
@@ -83,18 +100,36 @@ def test_process_new_sxt_tilt_series(
83100 mock_transport .send .assert_any_call (
84101 "processing_recipe" ,
85102 {
103+ "recipes" : ["sxt-aretomo" ],
86104 "parameters" : {
87105 "txrm_file" : f"{ tmp_path } /cm12345-6/raw/tomogram_tag.txrm" ,
88106 "xrm_reference" : f"{ tmp_path } /cm12345-6/raw/ref.xrm" ,
89107 "dcid" : dc_id ,
90108 "appid" : app_id ,
91- "stack_file" : f"{ tmp_path } /cm12345-6/processed/raw/Tomograms/tomogram_tag_stack.mrc" ,
109+ "stack_file" : f"{ tmp_path } /cm12345-6/processed/tomogram_tag/sxt-aretomo/Tomograms/tomogram_tag_stack.mrc" ,
110+ "tilt_axis" : 0 ,
111+ "pixel_size" : 100 ,
112+ "manual_tilt_offset" : - 1 ,
113+ "node_creator_queue" : "node_creator" ,
114+ },
115+ },
116+ new_connection = True ,
117+ )
118+ mock_transport .send .assert_any_call (
119+ "processing_recipe" ,
120+ {
121+ "recipes" : ["sxt-imod-patch-wbp" ],
122+ "parameters" : {
123+ "txrm_file" : f"{ tmp_path } /cm12345-6/raw/tomogram_tag.txrm" ,
124+ "xrm_reference" : f"{ tmp_path } /cm12345-6/raw/ref.xrm" ,
125+ "dcid" : dc_id ,
126+ "appid" : app_id ,
127+ "stack_file" : f"{ tmp_path } /cm12345-6/processed/tomogram_tag/sxt-imod-patch-wbp/Tomograms/tomogram_tag_stack.mrc" ,
92128 "tilt_axis" : 0 ,
93129 "pixel_size" : 100 ,
94130 "manual_tilt_offset" : - 1 ,
95131 "node_creator_queue" : "node_creator" ,
96132 },
97- "recipes" : ["sxt-aretomo" ],
98133 },
99134 new_connection = True ,
100135 )
0 commit comments