Commit 69e83782 authored by Pierre Paleo's avatar Pierre Paleo
Browse files

Plug unsharp_method to pipeline

parent fa6a56af
Pipeline #46985 passed with stage
in 5 minutes and 47 seconds
...@@ -559,7 +559,7 @@ class FullFieldPipeline: ...@@ -559,7 +559,7 @@ class FullFieldPipeline:
self.unsharp_mask = self.UnsharpMaskClass( self.unsharp_mask = self.UnsharpMaskClass(
self._get_shape("unsharp_mask"), self._get_shape("unsharp_mask"),
options["unsharp_sigma"], options["unsharp_coeff"], options["unsharp_sigma"], options["unsharp_coeff"],
mode="reflect", method="gaussian" mode="reflect", method=options["unsharp_method"]
) )
self.register_callback("unsharp_mask", FullFieldPipeline._reshape_radios_after_phase) self.register_callback("unsharp_mask", FullFieldPipeline._reshape_radios_after_phase)
......
...@@ -197,7 +197,7 @@ class ProcessConfig: ...@@ -197,7 +197,7 @@ class ProcessConfig:
phase_method = self.nabu_config["phase"]["method"] phase_method = self.nabu_config["phase"]["method"]
do_ctf = phase_method == "CTF" do_ctf = phase_method == "CTF"
do_pag = phase_method == "paganin" do_pag = phase_method == "paganin"
do_unsharp = self.nabu_config["phase"]["unsharp_coeff"] > 0 do_unsharp = self.nabu_config["phase"]["unsharp_method"] is not None and self.nabu_config["phase"]["unsharp_coeff"] > 0
if user_rotate_projections is None and tilt is None: if user_rotate_projections is None and tilt is None:
return None return None
if do_ctf: if do_ctf:
...@@ -301,10 +301,10 @@ class ProcessConfig: ...@@ -301,10 +301,10 @@ class ProcessConfig:
# #
# Unsharp # Unsharp
# #
if nabu_config["phase"]["unsharp_coeff"] > 0: if nabu_config["phase"]["unsharp_method"] is not None and nabu_config["phase"]["unsharp_coeff"] > 0:
tasks.append("unsharp_mask") tasks.append("unsharp_mask")
options["unsharp_mask"] = copy_dict_items( options["unsharp_mask"] = copy_dict_items(
nabu_config["phase"], ["unsharp_coeff", "unsharp_sigma"] nabu_config["phase"], ["unsharp_coeff", "unsharp_sigma", "unsharp_method"]
) )
# #
# -logarithm # -logarithm
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment