Skip to content

Reworked 3d conformal and sequencing#885

Open
JenHardt wants to merge 3 commits intoe0404:devfrom
JenHardt:dev_3dconformal_and_sequencing
Open

Reworked 3d conformal and sequencing#885
JenHardt wants to merge 3 commits intoe0404:devfrom
JenHardt:dev_3dconformal_and_sequencing

Conversation

@JenHardt
Copy link
Contributor

@JenHardt JenHardt commented Feb 2, 2026

3d conformal now no longer errors out when used together with sequencing, the issue here was the inconsonant number of bixels in the stf, which is why the collapseStf function was added. Also changes to the sequencer were made to accomondate for example a beam with 0 weight vector.

this also reminded me that we should finish the work on the class based sequencers

3d conformal now no longer errors out when used together with sequencing, the issue here was the inconsonant number of bixels in the stf, which is why the collapseStf function was added. Also changes to the sequencer were made to accomondate for example a beam with 0 weight vector.
@codecov
Copy link

codecov bot commented Feb 2, 2026

Codecov Report

❌ Patch coverage is 52.77778% with 34 lines in your changes missing coverage. Please review.
✅ Project coverage is 53.76%. Comparing base (5a7d07b) to head (e9299e7).

Files with missing lines Patch % Lines
matRad/optimization/matRad_collapseDij.m 0.00% 11 Missing ⚠️
matRad/sequencing/matRad_siochiLeafSequencing.m 69.23% 8 Missing ⚠️
matRad/sequencing/matRad_engelLeafSequencing.m 66.66% 5 Missing ⚠️
matRad/sequencing/matRad_xiaLeafSequencing.m 66.66% 5 Missing ⚠️
matRad/optimization/matRad_collapseStf.m 0.00% 3 Missing ⚠️
matRad/gui/widgets/matRad_WorkflowWidget.m 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #885      +/-   ##
==========================================
- Coverage   53.85%   53.76%   -0.09%     
==========================================
  Files         308      309       +1     
  Lines       19938    19967      +29     
==========================================
- Hits        10737    10736       -1     
- Misses       9201     9231      +30     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions
Copy link

github-actions bot commented Feb 2, 2026

Test Results

    3 files  ±0      3 suites  ±0   43m 58s ⏱️ +11s
  319 tests ±0    319 ✅ ±0  0 💤 ±0  0 ❌ ±0 
1 053 runs  ±0  1 048 ✅ ±0  5 💤 ±0  0 ❌ ±0 

Results for commit e9299e7. ± Comparison against base commit 5a7d07b.

♻️ This comment has been updated with latest results.

@wahln wahln changed the title Overworked 3d conformal and sequencing Reworked 3d conformal and sequencing Feb 2, 2026
Copy link
Contributor

@wahln wahln left a comment

Choose a reason for hiding this comment

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

The tests are failing for some reason due to a missing "sum field".

sequencing.beam(i).shapesWeight = zeros(dimOfFluenceMxZ,dimOfFluenceMxX);
sequencing.beam(i).bixelIx = 1+offset:numOfRaysPerBeam+offset;
sequencing.beam(i).fluence = zeros(dimOfFluenceMxZ,dimOfFluenceMxX);
sequencing.beam(i).sum = zeros(dimOfFluenceMxZ,dimOfFluenceMxX);
Copy link
Contributor

Choose a reason for hiding this comment

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

In the tests, something is not working out with the "sum" field hier.

sequencing.beam(i).shapesWeight = shapesWeight(1:k)/numOfLevels*calFac;
sequencing.beam(i).bixelIx = 1+offset:numOfRaysPerBeam+offset;
sequencing.beam(i).fluence = D_0;
sequencing.beam(i).sum = zeros(dimOfFluenceMxZ,dimOfFluenceMxX);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think here the tests also have an issue with the sum field

sequencing.beam(i).shapesWeight = zeros(dimOfFluenceMxZ,dimOfFluenceMxX);
sequencing.beam(i).bixelIx = 1+offset:numOfRaysPerBeam+offset;
sequencing.beam(i).fluence = zeros(dimOfFluenceMxZ,dimOfFluenceMxX);
sequencing.beam(i).sum = zeros(dimOfFluenceMxZ,dimOfFluenceMxX);
Copy link
Contributor

Choose a reason for hiding this comment

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

see comments regarding sum

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i removed the field sum, it is apparently only used for the sochi sequencer

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