|
12 | 12 | import traceback |
13 | 13 | from ast import literal_eval |
14 | 14 | from pathlib import Path |
15 | | -from typing import Literal, Optional |
16 | 15 |
|
17 | 16 | from pydantic import BaseModel, validator |
18 | 17 | from sqlmodel import Session, select |
|
26 | 25 | CLEMTIFFFile, |
27 | 26 | ) |
28 | 27 | 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 | +) |
29 | 31 | from murfey.workflows.clem import get_db_entry |
30 | 32 | from murfey.workflows.clem.align_and_merge import submit_cluster_request |
31 | 33 |
|
32 | 34 | logger = logging.getLogger("murfey.workflows.clem.register_preprocessing_results") |
33 | 35 |
|
34 | 36 |
|
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 | | - |
42 | 37 | class LIFPreprocessingResult(BaseModel): |
43 | 38 | image_stack: Path |
44 | 39 | metadata: Path |
@@ -195,10 +190,10 @@ def register_lif_preprocessing_result( |
195 | 190 | series_name=result.series_name, |
196 | 191 | images=image_stacks, |
197 | 192 | 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, |
202 | 197 | messenger=_transport_object, |
203 | 198 | ) |
204 | 199 | if cluster_response is False: |
@@ -378,10 +373,10 @@ def register_tiff_preprocessing_result( |
378 | 373 | series_name=result.series_name, |
379 | 374 | images=image_stacks, |
380 | 375 | 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, |
385 | 380 | messenger=_transport_object, |
386 | 381 | ) |
387 | 382 | if cluster_response is False: |
|
0 commit comments