Skip to content

Commit 8bd08be

Browse files
committed
Moved default processing parameters for align-and-merge CLEM workflow to 'processing_params'
1 parent d43ca95 commit 8bd08be

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

src/murfey/workflows/clem/register_preprocessing_results.py

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import traceback
1313
from ast import literal_eval
1414
from pathlib import Path
15-
from typing import Literal, Optional
1615

1716
from pydantic import BaseModel, validator
1817
from sqlmodel import Session, select
@@ -26,19 +25,15 @@
2625
CLEMTIFFFile,
2726
)
2827
from murfey.util.db import Session as MurfeySession
28+
from murfey.util.processing_params import (
29+
default_clem_align_and_merge_parameters as processing_params,
30+
)
2931
from murfey.workflows.clem import get_db_entry
3032
from murfey.workflows.clem.align_and_merge import submit_cluster_request
3133

3234
logger = logging.getLogger("murfey.workflows.clem.register_preprocessing_results")
3335

3436

35-
# Define align and merge parameters here
36-
crop_to_n_frames: Optional[int] = 50
37-
align_self: Literal["enabled", ""] = "enabled"
38-
flatten: Literal["mean", "min", "max", ""] = "mean"
39-
align_across: Literal["enabled", ""] = "enabled"
40-
41-
4237
class LIFPreprocessingResult(BaseModel):
4338
image_stack: Path
4439
metadata: Path
@@ -195,10 +190,10 @@ def register_lif_preprocessing_result(
195190
series_name=result.series_name,
196191
images=image_stacks,
197192
metadata=result.metadata,
198-
crop_to_n_frames=crop_to_n_frames,
199-
align_self=align_self,
200-
flatten=flatten,
201-
align_across=align_across,
193+
crop_to_n_frames=processing_params.crop_to_n_frames,
194+
align_self=processing_params.align_self,
195+
flatten=processing_params.flatten,
196+
align_across=processing_params.align_across,
202197
messenger=_transport_object,
203198
)
204199
if cluster_response is False:
@@ -378,10 +373,10 @@ def register_tiff_preprocessing_result(
378373
series_name=result.series_name,
379374
images=image_stacks,
380375
metadata=result.metadata,
381-
crop_to_n_frames=crop_to_n_frames,
382-
align_self=align_self,
383-
flatten=flatten,
384-
align_across=align_across,
376+
crop_to_n_frames=processing_params.crop_to_n_frames,
377+
align_self=processing_params.align_self,
378+
flatten=processing_params.flatten,
379+
align_across=processing_params.align_across,
385380
messenger=_transport_object,
386381
)
387382
if cluster_response is False:

0 commit comments

Comments
 (0)