Skip to content

Commit 356cd94

Browse files
committed
Restore default values
1 parent 5a46af1 commit 356cd94

3 files changed

Lines changed: 5 additions & 12 deletions

File tree

src/murfey/util/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class MachineConfig(BaseModel): # type: ignore
7676
processing_enabled: bool = True
7777
process_by_default: bool = True
7878
gain_directory_name: str = "processing"
79-
process_multiple_datasets: bool = False
79+
process_multiple_datasets: bool = True
8080
processed_directory_name: str = "processed"
8181
processed_extra_directory: str = ""
8282
recipes: dict[str, str] = {

src/murfey/util/processing_params.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ class SPAParameters(BaseModel):
126126
nr_iter_2d: int = 25
127127
nr_iter_3d: int = 25
128128
nr_iter_ini_model: int = 100
129-
batch_size_2d: int = 1000 # just for fun
130-
nr_classes_2d: int = 10
129+
batch_size_2d: int = 50000
130+
nr_classes_2d: int = 50
131131
nr_classes_3d: int = 4
132132
downscale: bool = True
133133
do_icebreaker_jobs: bool = True
134-
fraction_of_classes_to_remove_2d: float = 0.3
135-
nr_picks_before_diameter: int = 2000 # just for fun
134+
fraction_of_classes_to_remove_2d: float = 0.7
135+
nr_picks_before_diameter: int = 10000
136136
bfactor_min_particles: int = 2000
137137

138138

src/murfey/workflows/spa/picking.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ def _check_notifications(message: dict, murfey_db: Session) -> None:
376376

377377

378378
def particles_picked(message: dict, murfey_db: Session) -> dict[str, bool]:
379-
logger.debug("New picked particle!")
380379
movie = murfey_db.exec(
381380
select(Movie).where(Movie.murfey_id == message["motion_correction_id"])
382381
).one()
@@ -415,15 +414,9 @@ def particles_picked(message: dict, murfey_db: Session) -> dict[str, bool]:
415414
== _pj_id(message["program_id"], murfey_db)
416415
)
417416
).one()
418-
logger.debug(f"{feedback_params}")
419-
print(feedback_params)
420417
if feedback_params.estimate_particle_diameter:
421-
logger.debug("use diameter")
422-
print("use diameter")
423418
_register_picked_particles_use_diameter(message, murfey_db)
424419
else:
425-
logger.debug("use box size")
426-
print("use box size")
427420
_register_picked_particles_use_boxsize(message, murfey_db)
428421
prom.preprocessed_movies.labels(
429422
processing_job=_pj_id(message["program_id"], murfey_db)

0 commit comments

Comments
 (0)