@@ -1055,7 +1055,7 @@ async def request_spa_preprocessing(
10551055 "mrc_out" : str (mrc_out ),
10561056 "pixel_size" : proc_params ["angpix" ],
10571057 "image_number" : proc_file .image_number ,
1058- "microscope" : get_microscope () ,
1058+ "microscope" : instrument_name ,
10591059 "mc_uuid" : murfey_ids [0 ],
10601060 "foil_hole_id" : foil_hole_id ,
10611061 "ft_bin" : proc_params ["motion_corr_binning" ],
@@ -1163,7 +1163,7 @@ async def request_tomography_preprocessing(
11631163 "pixel_size" : (proc_file .pixel_size ) * 10 ** 10 ,
11641164 "image_number" : proc_file .image_number ,
11651165 "kv" : int (proc_file .voltage ),
1166- "microscope" : get_microscope () ,
1166+ "microscope" : instrument_name ,
11671167 "mc_uuid" : murfey_ids [0 ],
11681168 "ft_bin" : proc_file .mc_binning ,
11691169 "fm_dose" : proc_file .dose_per_frame ,
@@ -1374,7 +1374,7 @@ def start_dc(
13741374 instrument_name
13751375 ]
13761376 log .info (
1377- f"Starting data collection on microscope { get_microscope ( machine_config = machine_config ) } "
1377+ f"Starting data collection on microscope { instrument_name !r } "
13781378 f"with basepath { sanitise (str (machine_config .rsync_basepath ))} and directory { sanitise (dc_params .image_directory )} "
13791379 )
13801380 dc_parameters = {
@@ -1407,7 +1407,7 @@ def start_dc(
14071407 {
14081408 "register" : "data_collection" ,
14091409 ** dc_parameters ,
1410- "microscope" : get_microscope ( machine_config = machine_config ) ,
1410+ "microscope" : instrument_name ,
14111411 "proposal_code" : ispyb_proposal_code ,
14121412 "proposal_number" : ispyb_proposal_number ,
14131413 "visit_number" : ispyb_visit_number ,
0 commit comments