Skip to content

Commit debc366

Browse files
committed
add random seed to classification and refinement workflow zocalo messages so that seeds can be consistently set for the purposes of version comparison
1 parent 14aab9f commit debc366

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

src/murfey/server/feedback.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ def _release_2d_hold(message: dict, _db):
355355
"nr_classes": default_spa_parameters.nr_classes_2d,
356356
"do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
357357
"class2d_fraction_of_classes_to_remove": default_spa_parameters.fraction_of_classes_to_remove_2d,
358+
"seed": int(np.random.randint(1, 100)),
358359
"class_uuids": _2d_class_murfey_ids(
359360
first_class2d.particles_file, message["program_id"], _db
360361
),
@@ -445,6 +446,7 @@ def _release_3d_hold(message: dict, _db):
445446
)
446447
.one()
447448
.murfey_id,
449+
"seed": int(np.random.randint(1, 100)),
448450
"nr_iter": default_spa_parameters.nr_iter_3d,
449451
"initial_model_iterations": default_spa_parameters.nr_iter_ini_model,
450452
"nr_classes": default_spa_parameters.nr_classes_3d,
@@ -517,6 +519,7 @@ def _release_refine_hold(message: dict, _db):
517519
"symmetry": relion_params.symmetry,
518520
"node_creator_queue": machine_config.node_creator_queue,
519521
"nr_iter": default_spa_parameters.nr_iter_3d,
522+
"seed": int(np.random.randint(1, 100)),
520523
"refined_class_uuid": _refine_murfey_id(
521524
refine_dir=refine_params.refine_dir,
522525
tag=refine_params.tag,
@@ -627,6 +630,7 @@ def _register_incomplete_2d_batch(message: dict, _db):
627630
"do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
628631
"class2d_fraction_of_classes_to_remove": default_spa_parameters.fraction_of_classes_to_remove_2d,
629632
"mask_diameter": 0,
633+
"seed": int(np.random.randint(1, 100)),
630634
"class_uuids": _2d_class_murfey_ids(
631635
class2d_message["particles_file"], _app_id(pj_id, _db), _db
632636
),
@@ -785,6 +789,7 @@ def _register_complete_2d_batch(message: dict, _db):
785789
"class_uuids": class_uuids,
786790
"class2d_grp_uuid": class2d_grp_uuid,
787791
"nr_iter": default_spa_parameters.nr_iter_2d,
792+
"seed": int(np.random.randint(1, 100)),
788793
"batch_size": default_spa_parameters.batch_size_2d,
789794
"nr_classes": default_spa_parameters.nr_classes_2d,
790795
"do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
@@ -859,6 +864,7 @@ def _register_complete_2d_batch(message: dict, _db):
859864
"class_uuids": class_uuids,
860865
"class2d_grp_uuid": class2d_grp_uuid,
861866
"nr_iter": default_spa_parameters.nr_iter_2d,
867+
"seed": int(np.random.randint(1, 100)),
862868
"batch_size": default_spa_parameters.batch_size_2d,
863869
"nr_classes": default_spa_parameters.nr_classes_2d,
864870
"do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
@@ -951,6 +957,7 @@ def _flush_class2d(
951957
),
952958
"class2d_grp_uuid": saved_message.murfey_id,
953959
"nr_iter": default_spa_parameters.nr_iter_2d,
960+
"seed": int(np.random.randint(1, 100)),
954961
"nr_classes": default_spa_parameters.nr_classes_2d,
955962
"do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
956963
"class2d_fraction_of_classes_to_remove": default_spa_parameters.fraction_of_classes_to_remove_2d,
@@ -1265,6 +1272,7 @@ def _register_3d_batch(message: dict, _db):
12651272
"class_uuids": {i + 1: m for i, m in enumerate(class_uuids)},
12661273
"class3d_grp_uuid": class3d_grp_uuid,
12671274
"nr_iter": default_spa_parameters.nr_iter_3d,
1275+
"seed": int(np.random.randint(1, 100)),
12681276
"initial_model_iterations": default_spa_parameters.nr_iter_ini_model,
12691277
"nr_classes": default_spa_parameters.nr_classes_3d,
12701278
"do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
@@ -1307,6 +1315,7 @@ def _register_3d_batch(message: dict, _db):
13071315
),
13081316
"class3d_grp_uuid": class3d_params.murfey_id,
13091317
"nr_iter": default_spa_parameters.nr_iter_3d,
1318+
"seed": int(np.random.randint(1, 100)),
13101319
"initial_model_iterations": default_spa_parameters.nr_iter_ini_model,
13111320
"nr_classes": default_spa_parameters.nr_classes_3d,
13121321
"do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs,
@@ -1602,6 +1611,7 @@ def _register_refinement(message: dict, _db):
16021611
"symmetry": relion_options["symmetry"],
16031612
"node_creator_queue": machine_config.node_creator_queue,
16041613
"nr_iter": default_spa_parameters.nr_iter_3d,
1614+
"seed": int(np.random.randint(1, 100)),
16051615
"refined_class_uuid": _refine_murfey_id(
16061616
refine_dir=refine_params.refine_dir,
16071617
tag=refine_params.tag,

0 commit comments

Comments
 (0)