Skip to content

Commit 9b82d8b

Browse files
committed
Do not pass align-and-merge processing parameters via Murfey; set them directly in the recipe
1 parent d6b2563 commit 9b82d8b

3 files changed

Lines changed: 1 addition & 21 deletions

File tree

src/murfey/util/processing_params.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from datetime import datetime
22
from functools import lru_cache
33
from pathlib import Path
4-
from typing import Literal, Optional
54

65
from pydantic import BaseModel
76
from werkzeug.utils import secure_filename
@@ -60,12 +59,6 @@ class CLEMProcessingParameters(BaseModel):
6059
# Atlas vs GridSquare registration threshold
6160
atlas_threshold: float = 0.0015 # in m
6261

63-
# Image alignment and merging-specific parameters
64-
crop_to_n_frames: Optional[int] = 50
65-
align_self: Literal["enabled", ""] = "enabled"
66-
flatten: Literal["mean", "min", "max", ""] = "mean"
67-
align_across: Literal["enabled", ""] = "enabled"
68-
6962

7063
default_clem_processing_parameters = CLEMProcessingParameters()
7164

src/murfey/workflows/clem/align_and_merge.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from __future__ import annotations
77

88
from pathlib import Path
9-
from typing import Literal, Optional
9+
from typing import Optional
1010

1111
from murfey.util.config import get_machine_config
1212

@@ -24,11 +24,6 @@ def run(
2424
series_name: str,
2525
images: list[Path],
2626
metadata: Path,
27-
# Optional processing parameters
28-
crop_to_n_frames: Optional[int] = None,
29-
align_self: Literal["enabled", ""] = "",
30-
flatten: Literal["mean", "min", "max", ""] = "mean",
31-
align_across: Literal["enabled", ""] = "",
3227
# Optional session parameters
3328
messenger: Optional[TransportManager] = None,
3429
):
@@ -65,10 +60,6 @@ def run(
6560
"series_name": series_name,
6661
"images": [str(file) for file in images],
6762
"metadata": str(metadata),
68-
"crop_to_n_frames": crop_to_n_frames,
69-
"align_self": align_self,
70-
"flatten": flatten,
71-
"align_across": align_across,
7263
# Other recipe parameters
7364
"session_dir": str(session_dir),
7465
"session_id": session_id,

src/murfey/workflows/clem/register_preprocessing_results.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,10 +658,6 @@ def run(message: dict, murfey_db: Session) -> dict[str, bool]:
658658
series_name=result.series_name,
659659
images=image_combo,
660660
metadata=result.metadata,
661-
crop_to_n_frames=processing_params.crop_to_n_frames,
662-
align_self=processing_params.align_self,
663-
flatten=processing_params.flatten,
664-
align_across=processing_params.align_across,
665661
messenger=_transport_object,
666662
)
667663
except Exception:

0 commit comments

Comments
 (0)