Skip to content

added missing filtration tag in settings #49

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.

Sign up for GitHub

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

Merged
MaxHellstrom merged 2 commits into from
Jun 7, 2023
Merged

added missing filtration tag in settings #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
761727d
MaxHellstrom Jun 5, 2023
7360750
MaxHellstrom Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/pyskindose/dev_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
estimate_k_tab=False,
# Numeric value of estimated table correction
k_tab_val=0.8,
# x-ray tube inherent filtration in mmAl
inherent_filtration=3.1,
# plot settings
plot={
# dark mode for plots
Expand Down
5 changes: 4 additions & 1 deletion src/pyskindose/settings/pyskindose_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from pyskindose.constants import (
KEY_PARAM_ESTIMATE_K_TAB,
KEY_PARAM_INHERENT_FILTRATION,
KEY_PARAM_K_TAB_VAL,
KEY_PARAM_MODE,
KEY_PARAM_RDSR_FILENAME,
Expand Down Expand Up @@ -47,6 +48,8 @@ class PyskindoseSettings:
conducted table attenatuion measurements.
k_tab_val : float
Value of k_tab, in range 0.0 -> 1.0.
inherent_filtration : float
X-ray tube inherent filtration, for backscatter and medium correction.
phantom : pyskindose.settings.phantom_settings.PhantomSettings
Instance of class PhantomSettings containing all phantom related
settings.
Expand Down Expand Up @@ -79,9 +82,9 @@ def __init__(
self.mode = tmp[KEY_PARAM_MODE]
self.file_result_output_path: Path = self._initialize_output_path(file_result_output_path)
self.k_tab_val = tmp[KEY_PARAM_K_TAB_VAL]
self.inherent_filtration = tmp[KEY_PARAM_INHERENT_FILTRATION]
self.rdsr_filename = tmp[KEY_PARAM_RDSR_FILENAME]
self.estimate_k_tab = tmp[KEY_PARAM_ESTIMATE_K_TAB]

self.phantom = PhantomSettings(ptm_dim=tmp["phantom"])
self.plot = Plotsettings(plt_dict=tmp["plot"])

Expand Down
3 changes: 2 additions & 1 deletion tests/integrationtests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
def example_settings() -> PyskindoseSettings:
settings_dict: Dict = {
"mode": c.MODE_PLOT_PROCEDURE,
"rdsr_filename": "S1.dcm",
"rdsr_filename": "siemens_axiom_example_procedure.dcm",
"plot_event_index": 12,
"estimate_k_tab": False,
"inherent_filtration" : 3.1,
"k_tab_val": 0.8,
"plot": {
"interactivity": True,
Expand Down