Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch band pass unassigned #62

Merged
merged 6 commits into from
Nov 10, 2023

Conversation

McHaillet
Copy link
Collaborator

@McHaillet McHaillet commented Nov 9, 2023

This PR will be part of the bugfixes for version 0.3.2. It solves issue #61.

I updated the tomogram (tomogram_filter) and template weighting generation (template_wedge) in TMJob.start_job() to solve this issue. After the addition of the spectrum whitening there are now quite some weighting options: a band-pass, a whitening-filter, and a wedge filter. They are optional but should also work together.

To make it more logical both weighting are now initialized as 1, and are multiplied with all the optional filters in when the respective flags are set. If they remain 1 (no filter flags are set) they will not modify the tomogram/template.

I updated the tests to run the job with combinations of these weighting options.

Also removed some debug volume writing as it interfered with clean up of the test data now that I made the filter creation more logical.

I am a bit uncertain about the fact that in test_weights.py I have some variables that store general data (CTF, dose accumulation) and load this from this file into test_tmjob.py, is that okay to do?

@McHaillet McHaillet marked this pull request as ready for review November 9, 2023 14:54
@McHaillet McHaillet requested a review from sroet November 9, 2023 14:54
Copy link
Collaborator

@sroet sroet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one missed conversion LGTM otherwise

src/pytom_tm/tmjob.py Outdated Show resolved Hide resolved
tests/test_tmjob.py Show resolved Hide resolved
Copy link
Collaborator

@sroet sroet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, feel free to merge

@McHaillet McHaillet merged commit 16a71f1 into SBC-Utrecht:main Nov 10, 2023
@McHaillet McHaillet deleted the patch-band-pass-unassigned branch November 10, 2023 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants