Optimised '_register_picked_particles_use_diameter' function

Author: tieneupin

src/murfey/server/__init__.py

@@ -620,8 +620,6 @@ def _register_picked_particles_use_diameter(
             )
         ).one()
 
-        particle_diameter = relion_params.particle_diameter
-
         if feedback_params.picker_ispyb_id is None:
             if demo or not _transport_object:
                 feedback_params.picker_ispyb_id = 1000
@@ -649,15 +647,15 @@ def _register_picked_particles_use_diameter(
                 _db.delete(s)
                 _db.commit()
 
-        if not particle_diameter:
+        # Calculate diameter if it wasn't provided
+        if not relion_params.particle_diameter:
             # If the diameter has not been calculated then find it
             picking_db = _db.exec(
                 select(db.ParticleSizes.particle_size).where(
                     db.ParticleSizes.pj_id == pj_id
                 )
             ).all()
-            particle_diameter = np.quantile(list(picking_db), 0.75)
-            relion_params.particle_diameter = particle_diameter
+            relion_params.particle_diameter = np.quantile(list(picking_db), 0.75)
             _db.add(relion_params)
             _db.commit()
 
@@ -682,7 +680,7 @@ def _register_picked_particles_use_diameter(
                         "defocus_u": saved_message.defocus_u,
                         "defocus_v": saved_message.defocus_v,
                         "defocus_angle": saved_message.defocus_angle,
-                        "particle_diameter": particle_diameter,
+                        "particle_diameter": relion_params.particle_diameter,
                         "downscale": relion_options["downscale"],
                         "kv": relion_options["voltage"],
                         "node_creator_queue": machine_config.node_creator_queue,
@@ -702,9 +700,9 @@ def _register_picked_particles_use_diameter(
                     _transport_object.send(
                         "processing_recipe", zocalo_message, new_connection=True
                     )
+        # Use provided diameter for next step
         else:
             # If the diameter is known then just send the new message
-            particle_diameter = relion_params.particle_diameter
             zocalo_message = {
                 "parameters": {
                     "micrographs_file": params_to_forward["micrographs_file"],
@@ -723,7 +721,7 @@ def _register_picked_particles_use_diameter(
                     "defocus_u": params_to_forward["ctf_values"]["DefocusU"],
                     "defocus_v": params_to_forward["ctf_values"]["DefocusV"],
                     "defocus_angle": params_to_forward["ctf_values"]["DefocusAngle"],
-                    "particle_diameter": particle_diameter,
+                    "particle_diameter": relion_params.particle_diameter,
                     "downscale": relion_options["downscale"],
                     "kv": relion_options["voltage"],
                     "node_creator_queue": machine_config.node_creator_queue,