@@ -1167,40 +1167,40 @@ def _register_incomplete_2d_batch(message: dict, _db=murfey_db, demo: bool = Fal
11671167 _murfey_class2ds (
11681168 murfey_ids , class2d_message ["particles_file" ], message ["program_id" ], _db
11691169 )
1170- zocalo_message : dict = {
1171- "parameters" : {
1172- "particles_file" : class2d_message ["particles_file" ],
1173- "class2d_dir" : f"{ class2d_message ['class2d_dir' ]} { other_options ['next_job' ]:03} " ,
1174- "batch_is_complete" : False ,
1175- "particle_diameter" : relion_options ["particle_diameter" ],
1176- "combine_star_job_number" : - 1 ,
1177- "picker_id" : other_options ["picker_ispyb_id" ],
1178- "nr_iter" : default_spa_parameters .nr_iter_2d ,
1179- "batch_size" : default_spa_parameters .batch_size_2d ,
1180- "nr_classes" : default_spa_parameters .nr_classes_2d ,
1181- "do_icebreaker_jobs" : default_spa_parameters .do_icebreaker_jobs ,
1182- "class2d_fraction_of_classes_to_remove" : default_spa_parameters .fraction_of_classes_to_remove_2d ,
1183- "mask_diameter" : 0 ,
1184- "class_uuids" : _2d_class_murfey_ids (
1185- class2d_message ["particles_file" ], _app_id (pj_id , _db ), _db
1186- ),
1187- "class2d_grp_uuid" : _db .exec (
1188- select (db .Class2DParameters ).where (
1189- db .Class2DParameters .particles_file
1190- == class2d_message ["particles_file" ]
1191- and db .Class2DParameters .pj_id == pj_id
1192- )
1170+ zocalo_message : dict = {
1171+ "parameters" : {
1172+ "particles_file" : class2d_message ["particles_file" ],
1173+ "class2d_dir" : f"{ class2d_message ['class2d_dir' ]} { other_options ['next_job' ]:03} " ,
1174+ "batch_is_complete" : False ,
1175+ "particle_diameter" : relion_options ["particle_diameter" ],
1176+ "combine_star_job_number" : - 1 ,
1177+ "picker_id" : other_options ["picker_ispyb_id" ],
1178+ "nr_iter" : default_spa_parameters .nr_iter_2d ,
1179+ "batch_size" : default_spa_parameters .batch_size_2d ,
1180+ "nr_classes" : default_spa_parameters .nr_classes_2d ,
1181+ "do_icebreaker_jobs" : default_spa_parameters .do_icebreaker_jobs ,
1182+ "class2d_fraction_of_classes_to_remove" : default_spa_parameters .fraction_of_classes_to_remove_2d ,
1183+ "mask_diameter" : 0 ,
1184+ "class_uuids" : _2d_class_murfey_ids (
1185+ class2d_message ["particles_file" ], _app_id (pj_id , _db ), _db
1186+ ),
1187+ "class2d_grp_uuid" : _db .exec (
1188+ select (db .Class2DParameters ).where (
1189+ db .Class2DParameters .particles_file
1190+ == class2d_message ["particles_file" ]
1191+ and db .Class2DParameters .pj_id == pj_id
11931192 )
1194- .one ()
1195- .murfey_id ,
1196- "session_id" : message ["session_id" ],
1197- "autoproc_program_id" : _app_id (
1198- _pj_id (message ["program_id" ], _db , recipe = "em-spa-class2d" ), _db
1199- ),
1200- "node_creator_queue" : machine_config .node_creator_queue ,
1201- },
1202- "recipes" : ["em-spa-class2d" ],
1203- }
1193+ )
1194+ .one ()
1195+ .murfey_id ,
1196+ "session_id" : message ["session_id" ],
1197+ "autoproc_program_id" : _app_id (
1198+ _pj_id (message ["program_id" ], _db , recipe = "em-spa-class2d" ), _db
1199+ ),
1200+ "node_creator_queue" : machine_config .node_creator_queue ,
1201+ },
1202+ "recipes" : ["em-spa-class2d" ],
1203+ }
12041204 if _transport_object :
12051205 zocalo_message ["parameters" ][
12061206 "feedback_queue"
0 commit comments