Support for fixed-length vectors in SetInput functions of two-steps spectral filters #688
+427
−37
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
One-step and two-steps spectral filters currently use different image types internally. To increase their interoperability, they should also accept in input the type of image they don't use internally. This commit modifies SetInputDecomposedProjections and SetInputMeasuredProjections in rtkSpectralForwardModelImageFilter so that they accept itk::Image<itk::Vector> images (with a limited number of possible vector lengths). It also adds a test case in rtkdecomposespectralprojectionstest to test the modified SetInput functions
Modified the SetInput functions in rtkSimplexSpectralProjectionsDecompositionImageFilter, as was done in commit fc16320 for rtkSpectralForwardModelImageFilter. Updated test case 3 in rtkDecomposeSpectralProjectionsTest to test those new functions
SimonRit
reviewed
Feb 22, 2025
| @@ -83,16 +85,29 @@ class ITK_TEMPLATE_EXPORT SimplexSpectralProjectionsDecompositionImageFilter | |||
|
|
|||
| /** Set/Get the input material-decomposed stack of projections (only used for initialization) */ | |||
| void | |||
| SetInputDecomposedProjections(const DecomposedProjectionsType * DecomposedProjections); | |||
| SetInputDecomposedProjections( | |||
There was a problem hiding this comment.
Doesn't it work if you keep the original
void SetInputDecomposedProjections(const DecomposedProjectionsType * DecomposedProjections);separate for clarity?
There was a problem hiding this comment.
It should. I'll change it.
| void | ||
| SetInputFixedVectorLengthDecomposedProjections( | ||
| const itk::Image<itk::Vector<DecomposedProjectionsDataType, VNumberOfMaterials>, | ||
| DecomposedProjectionsType::ImageDimension> * DecomposedProjections); |
There was a problem hiding this comment.
Is it accessible from the wrapping? I'll check.
There was a problem hiding this comment.
It does not have to be: SetInputFixedVectorLengthDecomposedProjections is supposed to be accessed only by SetInputDecomposedProjections, once it has determined which vector length to use. The wrappings should only expose SetInputDecomposedProjections
| { | ||
| this->SetInputFixedVectorLengthDecomposedProjections<5>(ptr5); | ||
| } | ||
| } |
There was a problem hiding this comment.
Maybe a warning if we don't do anything?
SimonRit
force-pushed
the
FixedVectorLengthSpectralInputsOverload
branch
from
ef525c4 to
8a759ea
Compare
cyrilmory
added a commit
to cyrilmory/CyrilsRTK
that referenced
this pull request
Feb 27, 2025
Separate SetInputDecomposedProjections and SetInputMeasuredProjections into two parts, based on their input type (either itk::VectorImage, the default input type, or itk::Image<itk::Vector<>>, the newly supported type) as requested in RTKConsortium#688 (comment) Add a warning when SetInputDecomposedProjections or SetInputMeasuredProjections fails to cast the input to one of the supported types, as requested in RTKConsortium#688 (comment)
Separate SetInputDecomposedProjections and SetInputMeasuredProjections into two parts, based on their input type (either itk::VectorImage, the default input type, or itk::Image<itk::Vector<>>, the newly supported type) as requested in RTKConsortium#688 (comment) Add a warning when SetInputDecomposedProjections or SetInputMeasuredProjections fails to cast the input to one of the supported types, as requested in RTKConsortium#688 (comment)
cyrilmory
force-pushed
the
FixedVectorLengthSpectralInputsOverload
branch
from
8af69d8 to
47d6551
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support for fixed-length vectors in SetInputMeasuredProjections and SetInputDecomposedProjections functions of Simplex and Forward spectral filters, with a limited number of materials and bins
Adds a test case in rtkDecomposeSpectralProjectionsTest to test this feature