[SWIG] split stir.i and change order of declarations#1019
Merged
KrisThielemans merged 3 commits intoUCL:masterfrom Apr 19, 2022
Merged
[SWIG] split stir.i and change order of declarations#1019KrisThielemans merged 3 commits intoUCL:masterfrom
KrisThielemans merged 3 commits intoUCL:masterfrom
Conversation
The GeneralisedObjectiveFunction hierarchy was defined before normalisation and projectors, leading to problems setting/getting corresponding members. As this was very messy, I've split stir.i in several files. It still leads to one huge *wrap.cxx but at least reading stir.i is now a bit easier. (still work to do). This commit also fixes a line in SWIG for ProjData::get_subset, but that function is still ignored, so it doesn't change the actual Python interface.
Collaborator
Author
|
@markus-jehl can you please check this? Also, because of the reordering, the FBP problem tha tyou had might be resolved, so you could try to enable the "instantiations" (now in |
Contributor
|
Sure, I'll have a look if this still works with my reconstruction pipeline and if that solves the FBP problem! Will probably be next week, though. |
Contributor
|
I just checked it and it all works fine for me as well. Defining the FBP templates no longer crashes everything, so that's a plus in my view :-) I still can't define the FBP templates in a way that exposes their member functions, but this is not just about working out how this needs to be done in SWIG. |
Collaborator
Author
|
thanks. can you create a new issue for the FBP problem (maybe there's one already..) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The
GeneralisedObjectiveFunctionhierarchy was defined before normalisation and projectors, leading to problems setting/getting corresponding members.As this was very messy, I've split
stir.iin several files. It still leads to one huge*wrap.cxxbut at least readingstir.iis now a bit easier. (still work to do).This commit also fixes a line in SWIG for
ProjData::get_subset, but that function is still ignored, so it doesn't change the actual Python interface.Fixes #1018