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

Adapt dose engine concept to dev_varRBErobOpt #684

Merged
merged 226 commits into from
May 10, 2024

Conversation

wahln
Copy link
Contributor

@wahln wahln commented Dec 4, 2023

This draft PR adapts the dose engine concept to the dev_varRBErobOpt branch. Since the dose engine concept is currently residing on the dev branch, this PR prepares the union of dev and dev_varRBErobOpt.

Some adaptations are still to be done (mostly with regards to biological model management and maybe scenario management - now would be the time to change it).

I will assign a few reviewers to do a first rough validation of this refactoring.

  • All dose calculation algorithms and MC interfaces are now engines. This means propMC should be dropped (as MonteCarlo engines now have their own properties).
  • Robustness for pencil-beam engines is mainly managed in the base classes.
  • There's probably some inconsistencies with biological models.

NathanKunz and others added 30 commits June 10, 2021 13:35
First (real) commit into the refactorDoseCalc branch. Includes all up till now created dose calc engines for the refactoring of the dose calculation in MatRad.

The goal of this refactoring is, to leave the full script-file based dose calculation (which is used right now) and use a modular class based  dose calculation. This should provide a modifiable and modular engine class for each major calculation method. Those engines can then be expanded and specified by inheritance. This solution should also add a factory like overview, over possible engines for a given treatment planning.
Merge new master changes into dev_refactorDoseCalc
matRad_calcDose funktion should supersede the funktion of the other matRad_... calc funktions by creating the fitting engine and call the dose calc method.
Removed the content of deprecated functions and replaced their content with the creation and call of a fitting doseCalcEngine. The functions can still be called exactly like before in order to assure downwards compatibility.
…on or are now implemented inside the engines
Merge e0404/master branch into dev_refactorDoseCalc
# Conflicts:
#	AUTHORS.txt
#	MatRad_Config.m
#	matRad_calcDoseInit.m
#	matRad_calcPhotonDose.m
Forgot to turn off the visualization for the lateral cut off inside the physical dose calculation, which resulted in an octave error
# Conflicts:
#	matRad_calcParticleDose.m
# Conflicts:
#	matRad_calcParticleDose.m
# Conflicts:
#	matRad_calcParticleDose.m
# Conflicts:
#	matRad_calcParticleDose.m
4D/matRad_calc4dDose.m Outdated Show resolved Hide resolved
Copy link

Test Results

 3 files  ±0   3 suites  ±0   25m 4s ⏱️ -32s
14 tests ±0  12 ✅ ±0  0 💤 ±0  2 ❌ ±0 
42 runs  ±0  40 ✅ ±0  0 💤 ±0  2 ❌ ±0 

For more details on these failures, see this check.

Results for commit 322f94a. ± Comparison against base commit 49c7411.

Copy link

github-actions bot commented Apr 24, 2024

Test Results

 3 files  ± 0   3 suites  ±0   26m 50s ⏱️ + 1m 14s
26 tests +12  26 ✅ +14  0 💤 ±0  0 ❌  - 2 
78 runs  +36  75 ✅ +35  3 💤 +3  0 ❌  - 2 

Results for commit d9514de. ± Comparison against base commit 49c7411.

♻️ This comment has been updated with latest results.

Copy link

Code Coverage

Package Line Rate Health
coverage Package 1 32%
Summary 32% (5608 / 17345)

@wahln wahln merged commit 345897c into dev_varRBErobOpt May 10, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

8 participants